lizard 1.17.28__py2.py3-none-any.whl → 1.17.29__py2.py3-none-any.whl

{lizard-1.17.28.dist-info → lizard-1.17.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lizard
-Version: 1.17.28
+Version: 1.17.29
 Summary: A code analyzer without caring the C/C++ header files. It works with Java, C/C++, JavaScript, Python, Ruby, Swift, Objective C. Metrics includes cyclomatic complexity number etc.
 Home-page: http://www.lizard.ws
 Download-URL: https://pypi.python.org/lizard/

{lizard-1.17.28.dist-info → lizard-1.17.29.dist-info}/RECORD

@@ -25,7 +25,7 @@ lizard_ext/lizardns.py,sha256=8pztUoRS_UWN24MawwxeHEJgYh49id5PWODUBb6O72U,4184
 lizard_ext/lizardoutside.py,sha256=FGm2tbBZ17-2OCgmQlD-vobUCfQKb0FAygf86eM3xuM,336
 lizard_ext/lizardstatementcount.py,sha256=xYk6ixSIItSE1BWQXzrWmduFgGhA3VR817SNKLffyVQ,1182
 lizard_ext/lizardwordcount.py,sha256=2QYXD7-AtkkgAbi9VSidunMbSsGQ7MKYb6IT-bS-cok,7575
-lizard_ext/version.py,sha256=MvEnDbdl2cyQNZKMkfgQ5II9EbD6v9D0HTDqEiwL7T0,182
+lizard_ext/version.py,sha256=QVDZyG9GV7lwS_Xtimsh3RbooOAR53x-mhgHy51HIjk,182
 lizard_ext/xmloutput.py,sha256=-cbh0he4O_X-wX56gkv9AnSPNN0qvR7FACqlBeezUS4,5609
 lizard_languages/__init__.py,sha256=ArNmUrVSU6HFxhDka1-vWMZpVIM39P-gqv6BoOLNMV8,1522
 lizard_languages/clike.py,sha256=INd5tkvwEVZm7dx2yHG2OIFHZn7JzQGmnT9WQNFZ2XU,11110
@@ -45,7 +45,7 @@ lizard_languages/kotlin.py,sha256=v_o2orEzA5gB9vM_0h-E4QXjrc5Yum-0K6W6_laOThc,28
 lizard_languages/lua.py,sha256=3nqBcunBzJrhv4Iqaf8xvbyqxZy3aSxJ-IiHimHFlac,1573
 lizard_languages/objc.py,sha256=2a1teLdaXZBtCeFiIZer1j_sVx9LZ1CbF2XfnqlvLmk,2319
 lizard_languages/perl.py,sha256=WUHuO9lIBRpL0fJKpAtEVsEatGMqzY2WymF8kSdPGRs,12143
-lizard_languages/php.py,sha256=8OufyR2TIWyf3bXuTmp37Vwf_tEPF4YV5M3i5_jnguA,1377
+lizard_languages/php.py,sha256=gAI-UZckwjOKJ7HbINWS5w5iYsNRVyONb092dAsRLhs,10096
 lizard_languages/python.py,sha256=1e0dKbl82z-i_5dswkKaFIV5WuQDKztPHh9UNmSTLyE,3848
 lizard_languages/ruby.py,sha256=HL1ZckeuUUJU3QSVAOPsG_Zsl0C6X2PX5_VaWqclzkM,2277
 lizard_languages/rubylike.py,sha256=dAGZ2wqW8nqaESMU8HkeR9gwQ-q9fmZqE6AANvVZD1Q,3426
@@ -60,9 +60,9 @@ lizard_languages/ttcn.py,sha256=ygjw_raBmPF-4mgoM8m6CAdyEMpTI-n1kZJK1RL4Vxo,2131
 lizard_languages/typescript.py,sha256=P_rphg5AXJAk9QetmvVKc2911ilPmiRa0Qa5fHWleJg,3829
 lizard_languages/vue.py,sha256=KXUBUo2R1zNF8Pffrz_KsQEN44m5XFRMoGXylxKUeT0,1038
 lizard_languages/zig.py,sha256=NX1iyBstBuJFeAGBOAIaRfrmeBREne2HX6Pt4fXZZTQ,586
-lizard-1.17.28.dist-info/LICENSE.txt,sha256=05ZjgQ8Cl1dD9p0BhW-Txzkc5rhCogGJVEuf1GT2Y_M,1303
-lizard-1.17.28.dist-info/METADATA,sha256=gKFStxGqZyN-fZHhqraSEt6NPytI7bCgb4JnKf_Ix4Q,16130
-lizard-1.17.28.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-lizard-1.17.28.dist-info/entry_points.txt,sha256=ZBqPhu-J3NoGGW5vn2Gfyoo0vdVlgBgM-wlNm0SGYUQ,39
-lizard-1.17.28.dist-info/top_level.txt,sha256=5NTrTaOLhHuTzXaGcZPKfuaOgUv7WafNGe0Zl5aycpg,35
-lizard-1.17.28.dist-info/RECORD,,
+lizard-1.17.29.dist-info/LICENSE.txt,sha256=05ZjgQ8Cl1dD9p0BhW-Txzkc5rhCogGJVEuf1GT2Y_M,1303
+lizard-1.17.29.dist-info/METADATA,sha256=ZhoBV3shfqxrAcPAQgNRdyMHnTrkQdON2PEY5owuMGo,16130
+lizard-1.17.29.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+lizard-1.17.29.dist-info/entry_points.txt,sha256=ZBqPhu-J3NoGGW5vn2Gfyoo0vdVlgBgM-wlNm0SGYUQ,39
+lizard-1.17.29.dist-info/top_level.txt,sha256=5NTrTaOLhHuTzXaGcZPKfuaOgUv7WafNGe0Zl5aycpg,35
+lizard-1.17.29.dist-info/RECORD,,

lizard_ext/version.py

@@ -3,4 +3,4 @@
 #
 # pylint: disable=missing-docstring,invalid-name
 
-version = "1.17.28"
+version = "1.17.29"

lizard_languages/php.py

@@ -1,11 +1,229 @@
 '''
-Language parser for JavaScript
+Language parser for PHP
 '''
 
 import re
-from .code_reader import CodeReader
+from .code_reader import CodeReader, CodeStateMachine
 from .clike import CCppCommentsMixin
-from .js_style_language_states import JavaScriptStyleLanguageStates
+
+
+class PHPLanguageStates(CodeStateMachine):
+    """
+    PHP-specific state machine that properly handles modern PHP syntax
+    including classes, visibility modifiers and return types.
+    """
+    
+    def __init__(self, context):
+        super(PHPLanguageStates, self).__init__(context)
+        self.function_name = ''
+        self.class_name = None
+        self.trait_name = None
+        self.in_class = False
+        self.in_trait = False
+        self.bracket_level = 0
+        self.brace_level = 0
+        self.started_function = False
+        self.last_token = ''
+        self.last_tokens = ''
+        self.is_function_declaration = False
+        self.assignments = []
+        self.in_match = False
+        self.match_case_count = 0
+        
+    def _state_global(self, token):
+        if token == 'class':
+            self._state = self._class_declaration
+        elif token == 'trait':
+            self._state = self._trait_declaration
+        elif token == 'function':
+            self.is_function_declaration = True
+            self._state = self._function_name
+        elif token == 'fn':
+            # Skip arrow functions (PHP 7.4+), don't treat them as full functions
+            pass
+        elif token == 'match':
+            self.in_match = True
+            self.match_case_count = 0
+            self.next(self._match_expression)
+        elif token in ('if', 'switch', 'for', 'foreach', 'while', 'catch'):
+            self.next(self._condition_expected)
+        elif token in ('public', 'private', 'protected', 'static'):
+            # Skip visibility modifiers
+            pass
+        elif token == '=>' and self.in_match:
+            # Count each case in a match expression
+            self.match_case_count += 1
+        elif token == '}' and self.in_match:
+            # End of match expression
+            self.in_match = False
+            # Add the match cases to complexity (subtract 1 because the 'match' keyword is already counted)
+            if self.match_case_count > 0:
+                for _ in range(self.match_case_count - 1):
+                    self.context.add_condition()
+            self.match_case_count = 0
+        elif token == '=':
+            # Handle function assignment
+            self.function_name = self.last_tokens.strip()
+            self.assignments.append(self.function_name)
+        elif token == '{':
+            self.brace_level += 1
+        elif token == '}':
+            self.brace_level -= 1
+            if self.brace_level == 0:
+                if self.in_class:
+                    self.in_class = False
+                    self.class_name = None
+                if self.in_trait:
+                    self.in_trait = False
+                    self.trait_name = None
+                
+        # Update tokens
+        self.last_token = token
+        if token not in [' ', '\t', '\n']:
+            if token not in ['=', ';', '{', '}', '(', ')', ',']:
+                self.last_tokens = token
+            elif token == '=' and self.last_tokens:
+                # Keep the last tokens for assignment
+                pass
+            else:
+                self.last_tokens = ''
+    
+    def _trait_declaration(self, token):
+        if token and not token.isspace() and token not in ['{', '(']:
+            self.trait_name = token
+            self.in_trait = True
+            self._state = self._state_global
+        elif token == '{':
+            self.brace_level += 1
+            self._state = self._state_global
+        
+    def _class_declaration(self, token):
+        if token and not token.isspace() and token not in ['{', '(', 'extends', 'implements']:
+            self.class_name = token
+            self.in_class = True
+            self._state = self._state_global
+        elif token == '{':
+            self.brace_level += 1
+            self._state = self._state_global
+            
+    def _function_name(self, token):
+        if token and not token.isspace() and token != '(':
+            method_name = token
+            if self.in_class and self.class_name:
+                # In class, use ClassName::methodName format
+                long_name = f"{self.class_name}::{method_name}"
+                short_name = method_name  # Store original name for compatibility with old tests
+            elif self.in_trait and self.trait_name:
+                # In trait, use TraitName::methodName format
+                long_name = f"{self.trait_name}::{method_name}"
+                short_name = method_name
+            else:
+                long_name = method_name
+                short_name = method_name
+            self.function_name = long_name
+            self._state = self._function_args
+            # Store original name for backward compatibility
+            self.short_function_name = short_name
+        elif token == '(':
+            # Anonymous function
+            if self.in_class:
+                self.function_name = f"{self.class_name}::(anonymous)"
+            elif self.in_trait:
+                self.function_name = f"{self.trait_name}::(anonymous)"
+            else:
+                if self.assignments and self.assignments[-1]:
+                    self.function_name = self.assignments[-1]
+                    self.assignments.pop()
+                else:
+                    self.function_name = "(anonymous)"
+            self.bracket_level = 1
+            self._state = self._function_args_continue
+            self.context.push_new_function(self.function_name)
+            self.started_function = True
+            
+    def _function_args(self, token):
+        if token == '(':
+            self.bracket_level = 1
+            # Compatibility handling for old tests
+            if self.in_class and self.class_name and not self.is_function_declaration:
+                self.context.push_new_function(self.short_function_name)
+            else:
+                self.context.push_new_function(self.function_name)
+            self.started_function = True
+            self._state = self._function_args_continue
+            
+    def _function_args_continue(self, token):
+        if token == '(':
+            self.bracket_level += 1
+        elif token == ')':
+            self.bracket_level -= 1
+            if self.bracket_level == 0:
+                self._state = self._function_return_type_or_body
+        elif token.startswith('$'):
+            # Found a parameter (PHP parameters start with $)
+            if self.started_function:
+                # Make sure we count each parameter uniquely
+                self.context.add_to_long_function_name(" " + token)
+                self.context.parameter(token)
+                
+    def _function_return_type_or_body(self, token):
+        if token == ':':
+            # Skip return type declaration
+            self._state = self._function_body_or_return_type
+        elif token == '{':
+            # Function body starts
+            self.brace_level += 1
+            self._state = self._function_body
+        elif token == ';':
+            # Handle forward declarations in interface
+            if self.started_function:
+                self.context.end_of_function()
+                self.started_function = False
+            self._state = self._state_global
+            
+    def _function_body_or_return_type(self, token):
+        if token == '{':
+            # Found the function body opening after return type
+            self.brace_level += 1
+            self._state = self._function_body
+            
+    def _function_body(self, token):
+        if token == '{':
+            self.brace_level += 1
+        elif token == '}':
+            self.brace_level -= 1
+            if self.brace_level == self.in_class:  # Using in_class as boolean (0/1)
+                # End of function
+                if self.started_function:
+                    self.context.end_of_function()
+                    self.started_function = False
+                self._state = self._state_global
+                
+    def _condition_expected(self, token):
+        if token == '(':
+            self.bracket_level = 1
+            self._state = self._condition_continue
+            
+    def _condition_continue(self, token):
+        if token == '(':
+            self.bracket_level += 1
+        elif token == ')':
+            self.bracket_level -= 1
+            if self.bracket_level == 0:
+                self._state = self._state_global
+
+    def _match_expression(self, token):
+        if token == '(':
+            self.bracket_level = 1
+            self._state = self._match_expression_continue
+            
+    def _match_expression_continue(self, token):
+        if token == '(':
+            self.bracket_level += 1
+        elif token == ')':
+            self.bracket_level -= 1
+            if self.bracket_level == 0:
+                self._state = self._state_global
 
 
 class PHPReader(CodeReader, CCppCommentsMixin):
@@ -13,8 +231,8 @@ class PHPReader(CodeReader, CCppCommentsMixin):
 
     ext = ['php']
     language_names = ['php']
-    _conditions = set(['if', 'elseif', 'for', 'while', '&&', '||', '?',
-                       'catch', 'case'])
+    _conditions = set(['if', 'elseif', 'for', 'foreach', 'while', '&&', '||', '?',
+                       'catch', 'case', 'match'])
 
     @staticmethod
     def generate_tokens(source_code, addition='', token_class=None):
@@ -36,4 +254,4 @@ class PHPReader(CodeReader, CCppCommentsMixin):
 
     def __init__(self, context):
         super(PHPReader, self).__init__(context)
-        self.parallel_states = [JavaScriptStyleLanguageStates(context)]
+        self.parallel_states = [PHPLanguageStates(context)]