Remove deprecated dependency & bump coding standard package (#477)

Author: 50bhan

.phpcs.xml.dist

@@ -196,26 +196,4 @@
 
     <!-- Complexity -->
     <!-- -->
-
-    <!-- Object calisthenics -->
-    <rule ref="vendor/object-calisthenics/phpcs-calisthenics-rules/src/ObjectCalisthenics/ruleset.xml">
-        <exclude name="ObjectCalisthenics.ControlStructures.NoElse"/>
-        <exclude name="ObjectCalisthenics.CodeAnalysis.OneObjectOperatorPerLine"/>
-
-        <!-- Code > Classes -->
-        <exclude name="ObjectCalisthenics.Classes.ForbiddenPublicProperty"/>
-        <exclude name="ObjectCalisthenics.NamingConventions.NoSetter"/>
-
-        <!-- Code > Code -->
-        <exclude name="ObjectCalisthenics.Metrics.MaxNestingLevel"/>
-        <exclude name="ObjectCalisthenics.NamingConventions.ElementNameMinimalLength"/>
-
-        <!-- Architecture > Classes -->
-        <exclude name="ObjectCalisthenics.Files.ClassTraitAndInterfaceLength"/>
-        <exclude name="ObjectCalisthenics.Metrics.MethodPerClassLimit"/>
-        <exclude name="ObjectCalisthenics.Metrics.PropertyPerClassLimit"/>
-
-        <!-- Architecture > Functions -->
-        <exclude name="ObjectCalisthenics.Files.FunctionLength"/>
-    </rule>
 </ruleset>

composer.json

@@ -26,12 +26,11 @@
         "friendsofphp/php-cs-fixer": "^2.16.1",
         "justinrainbow/json-schema": "^5.1",
         "league/container": "^3.2",
-        "object-calisthenics/phpcs-calisthenics-rules": "^3.7",
         "php-parallel-lint/php-parallel-lint": "^1.1",
         "phploc/phploc": "^5.0|^6.0|^7.0",
         "psr/container": "^1.0",
         "psr/simple-cache": "^1.0",
-        "slevomat/coding-standard": "^6.0",
+        "slevomat/coding-standard": "^7.0",
         "squizlabs/php_codesniffer": "^3.5",
         "symfony/cache": "^4.4|^5.0",
         "symfony/console": "^4.2|^5.0",
@@ -45,7 +44,7 @@
         "mockery/mockery": "^1.0",
         "phpstan/phpstan-strict-rules": "^0.12",
         "phpunit/phpunit": "^8.0|^9.0",
-        "rector/rector-prefixed": "^0.9.19",
+        "rector/rector": "^0.10.6",
         "symfony/var-dumper": "^4.2|^5.0",
         "symplify/easy-coding-standard": "^9.1",
         "thecodingmachine/phpstan-strict-rules": "^0.12.0"

docs/insights/architecture.md

@@ -29,7 +29,7 @@ This sniff checks if the declaration of the class is correct
 
 **Insight Class**: `PHP_CodeSniffer\Standards\PSR1\Sniffs\Classes\ClassDeclarationSniff`
 
-## Class trait and interface length <Badge text="^1.0"/> <Badge text="Architecture\Classes" type="warn"/> <Badge text="configurable"/>
+## Class trait and interface length <Badge text=">=1.0 <2.0"/> <Badge text="Architecture\Classes" type="warn"/> <Badge text="configurable"/>
 
 This sniff checks the size of your classes/traits/interface
 
@@ -45,7 +45,7 @@ This sniff checks the size of your classes/traits/interface
 ```
 </details>
 
-## Method per class limit <Badge text="^1.0"/> <Badge text="Architecture\Classes" type="warn"/> <Badge text="configurable"/>
+## Method per class limit <Badge text=">=1.0 <2.0"/> <Badge text="Architecture\Classes" type="warn"/> <Badge text="configurable"/>
 
 This sniff checks if the number of methods per class is under a limit.
 
@@ -61,8 +61,7 @@ This sniff checks if the number of methods per class is under a limit.
 ```
 </details>
 
-
-## Property per class limit <Badge text="^1.0"/> <Badge text="Architecture\Classes" type="warn"/> <Badge text="configurable"/>
+## Property per class limit <Badge text=">=1.0 <2.0"/> <Badge text="Architecture\Classes" type="warn"/> <Badge text="configurable"/>
 
 This sniff checks if the number of properties per class is under a limit.
 
@@ -136,7 +135,7 @@ This sniff reports use of superfluous prefix or suffix "Exception" for exception
 
 This sniff checks the size of functions
 
-**Insight Class**: `ObjectCalisthenics\Sniffs\Files\FunctionLengthSniff`
+**Insight Class v1.0**: `ObjectCalisthenics\Sniffs\Files\FunctionLengthSniff`
 
 <details>
     <summary>Configuration</summary>
@@ -148,6 +147,18 @@ This sniff checks the size of functions
 ```
 </details>
 
+**Insight Class v2.0**: `SlevomatCodingStandard\Sniffs\Files\FunctionLengthSniff`
+
+<details>
+    <summary>Configuration</summary>
+
+```php
+\SlevomatCodingStandard\Sniffs\Files\FunctionLengthSniff::class => [
+    'maxLength' => 20,
+]
+```
+</details>
+
 ## One interface per file <Badge text="^1.0"/> <Badge text="Architecture\Interfaces" type="warn"/>
 
 This sniff checks that only one interface is declared per file.

docs/insights/code.md

@@ -13,7 +13,8 @@ The following insights are organised in different metrics :
 
 This sniff disallows public properties.
 
-**Insight Class**: `ObjectCalisthenics\Sniffs\Classes\ForbiddenPublicPropertySniff`
+**Insight Class v1.0**: `ObjectCalisthenics\Sniffs\Classes\ForbiddenPublicPropertySniff`
+**Insight Class v2.0**: `SlevomatCodingStandard\Sniffs\Classes\ForbiddenPublicPropertySniff`
 
 ## Unused private elements <Badge text="^1.0"/> <Badge text="Code\Classes" type="warn"/>
 
@@ -93,7 +94,7 @@ This sniff ensures all language constructs contain a single space between themse
 
 **Insight Class**: `PHP_CodeSniffer\Standards\Squiz\Sniffs\WhiteSpace\LanguageConstructSpacingSniff`
 
-## Element name minimal length <Badge text="^1.0"/> <Badge text="Code\Code" type="warn"/> <Badge text="configurable"/>
+## Element name minimal length <Badge text=">=1.0 <2.0"/> <Badge text="Code\Code" type="warn"/> <Badge text="configurable"/>
 
 **Insight Class**: `ObjectCalisthenics\Sniffs\NamingConventions\ElementNameMinimalLengthSniff`
 
@@ -108,7 +109,7 @@ This sniff ensures all language constructs contain a single space between themse
 ```
 </details>
 
-## Max nesting level <Badge text="^1.0"/> <Badge text="Code\Code" type="warn"/> <Badge text="configurable"/>
+## Max nesting level <Badge text=">=1.0 <2.0"/> <Badge text="Code\Code" type="warn"/> <Badge text="configurable"/>
 
 **Insight Class**: `ObjectCalisthenics\Sniffs\Metrics\MaxNestingLevelSniff`
 
@@ -783,7 +784,7 @@ There must be a comment when fall-through is intentional in a non-empty case bod
 
 ## Phpdoc scalar <Badge text="^1.10"/> <Badge text="Code\Comments" type="warn"/> <Badge text="configurable"/>
 
-Scalar types should always be written in the same form. 
+Scalar types should always be written in the same form.
 `int` not `integer`, `bool` not `boolean`, `float` not `real` or `double`.
 
 **Insight Class**: `PhpCsFixer\Fixer\Phpdoc\PhpdocScalarFixer`

src/Application/Adapters/Laravel/Commands/InsightsCommand.php

@@ -36,6 +36,9 @@ public function handle(): int
         }
 
         $configuration = require $configPath;
+        /**
+         * @noRector Rector\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector
+         */
         $configuration['fix'] = $this->hasOption('fix') && (bool) $this->option('fix') === true;
         $configuration = ConfigResolver::resolve($configuration, $this->input);
 

src/Application/Adapters/Laravel/InsightsServiceProvider.php

@@ -23,6 +23,9 @@ public function register(): void
 
     public function boot(): void
     {
+        /**
+         * @noRector Rector\DeadCode\Rector\If_\RemoveDeadInstanceOfRector
+         */
         if ($this->app instanceof Application) {
             $this->publishes([
                 __DIR__ . '/../../../../stubs/laravel.php' => $this->app->configPath('insights.php'),

src/Application/Injectors/Configuration.php

@@ -45,6 +45,9 @@ public function __invoke(): array
                     $config = require $configPath;
                 }
 
+                /**
+                 * @noRector Rector\CodeQuality\Rector\Identical\SimplifyBoolIdenticalTrueRector
+                 */
                 $fixOption = $input->hasOption('fix') && (bool) $input->getOption('fix') === true;
 
                 $config['fix'] = $fixOption || $input->getFirstArgument() === 'fix';

src/Domain/Metrics/Architecture/Classes.php

@@ -8,9 +8,6 @@
 use NunoMaduro\PhpInsights\Domain\Contracts\HasInsights;
 use NunoMaduro\PhpInsights\Domain\Contracts\HasValue;
 use NunoMaduro\PhpInsights\Domain\Insights\ForbiddenNormalClasses;
-use ObjectCalisthenics\Sniffs\Files\ClassTraitAndInterfaceLengthSniff;
-use ObjectCalisthenics\Sniffs\Metrics\MethodPerClassLimitSniff;
-use ObjectCalisthenics\Sniffs\Metrics\PropertyPerClassLimitSniff;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\OneClassPerFileSniff;
 use PHP_CodeSniffer\Standards\PSR1\Sniffs\Classes\ClassDeclarationSniff;
 use PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\ValidClassNameSniff;
@@ -36,9 +33,6 @@ public function getInsights(): array
             ForbiddenNormalClasses::class,
             ValidClassNameSniff::class,
             ClassDeclarationSniff::class,
-            ClassTraitAndInterfaceLengthSniff::class,
-            MethodPerClassLimitSniff::class,
-            PropertyPerClassLimitSniff::class,
             OneClassPerFileSniff::class,
             SuperfluousInterfaceNamingSniff::class,
             SuperfluousAbstractClassNamingSniff::class,

src/Domain/Metrics/Architecture/Functions.php

@@ -7,8 +7,8 @@
 use NunoMaduro\PhpInsights\Domain\Collector;
 use NunoMaduro\PhpInsights\Domain\Contracts\HasInsights;
 use NunoMaduro\PhpInsights\Domain\Contracts\HasValue;
-use ObjectCalisthenics\Sniffs\Files\FunctionLengthSniff;
 use PhpCsFixer\Fixer\FunctionNotation\MethodArgumentSpaceFixer;
+use SlevomatCodingStandard\Sniffs\Files\FunctionLengthSniff;
 
 final class Functions implements HasValue, HasInsights
 {

src/Domain/Metrics/Code/Classes.php

@@ -11,15 +11,14 @@
 use NunoMaduro\PhpInsights\Domain\Contracts\HasPercentage;
 use NunoMaduro\PhpInsights\Domain\Contracts\HasValue;
 use NunoMaduro\PhpInsights\Domain\Sniffs\ForbiddenSetterSniff;
-use ObjectCalisthenics\Sniffs\Classes\ForbiddenPublicPropertySniff;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\UnnecessaryFinalModifierSniff;
 use PHP_CodeSniffer\Standards\PSR2\Sniffs\Classes\PropertyDeclarationSniff;
 use PhpCsFixer\Fixer\ClassNotation\ProtectedToPrivateFixer;
 use PhpCsFixer\Fixer\ClassNotation\VisibilityRequiredFixer;
 use SlevomatCodingStandard\Sniffs\Classes\ClassConstantVisibilitySniff;
 use SlevomatCodingStandard\Sniffs\Classes\DisallowLateStaticBindingForConstantsSniff;
+use SlevomatCodingStandard\Sniffs\Classes\ForbiddenPublicPropertySniff;
 use SlevomatCodingStandard\Sniffs\Classes\ModernClassNameReferenceSniff;
-use SlevomatCodingStandard\Sniffs\Classes\UnusedPrivateElementsSniff;
 use SlevomatCodingStandard\Sniffs\Classes\UselessLateStaticBindingSniff;
 
 /**
@@ -55,7 +54,6 @@ public function getInsights(): array
         return [
             //FullyQualifiedClassNameAfterKeywordSniff::class,
             ForbiddenPublicPropertySniff::class,
-            UnusedPrivateElementsSniff::class,
             ForbiddenSetterSniff::class,
             UnnecessaryFinalModifierSniff::class,
             PropertyDeclarationSniff::class,

src/Domain/Metrics/Code/Code.php

@@ -7,8 +7,6 @@
 use NunoMaduro\PhpInsights\Domain\Collector;
 use NunoMaduro\PhpInsights\Domain\Contracts\HasInsights;
 use NunoMaduro\PhpInsights\Domain\Contracts\HasValue;
-use ObjectCalisthenics\Sniffs\Metrics\MaxNestingLevelSniff;
-use ObjectCalisthenics\Sniffs\NamingConventions\ElementNameMinimalLengthSniff;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\Arrays\ArrayIndentSniff;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyPHPStatementSniff;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyStatementSniff;
@@ -85,8 +83,6 @@ public function getInsights(): array
             CodeAnalyzerSniff::class,
             SwitchDeclarationSniff::class,
             LanguageConstructSpacingSniff::class,
-            ElementNameMinimalLengthSniff::class,
-            MaxNestingLevelSniff::class,
             UselessVariableSniff::class,
             EvalSniff::class,
             ArrayIndentSniff::class,

tests/Application/ConfigResolverTest.php

@@ -13,7 +13,6 @@
 use NunoMaduro\PhpInsights\Domain\Metrics\Architecture\Classes;
 use PHPUnit\Framework\TestCase;
 use SlevomatCodingStandard\Sniffs\Commenting\DocCommentSpacingSniff;
-use SlevomatCodingStandard\Sniffs\Functions\StaticClosureSniff;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputDefinition;

tests/Domain/Insights/InsightFactoryTest.php

@@ -10,14 +10,14 @@
 use NunoMaduro\PhpInsights\Domain\Insights\InsightFactory;
 use NunoMaduro\PhpInsights\Domain\Insights\SniffDecorator;
 use NunoMaduro\PhpInsights\Domain\Reflection;
-use ObjectCalisthenics\Sniffs\Classes\ForbiddenPublicPropertySniff;
 use PHP_CodeSniffer\Sniffs\Sniff as SniffContract;
 use PHP_CodeSniffer\Standards\Generic\Sniffs\Files\LineLengthSniff;
 use PhpCsFixer\Fixer\Alias\BacktickToShellExecFixer;
 use PhpCsFixer\Fixer\ControlStructure\YodaStyleFixer;
 use PhpCsFixer\Fixer\FixerInterface;
 use PHPUnit\Framework\TestCase;
 use RuntimeException;
+use SlevomatCodingStandard\Sniffs\Classes\ForbiddenPublicPropertySniff;
 use Symfony\Component\Console\Output\NullOutput;
 use Tests\Fakes\FakeFileRepository;
 use Tests\Fakes\FakeInput;