Drop thecodingmachine/safe (#783)

Author: staabm

composer.json

@@ -14,8 +14,6 @@
         "staabm/phpstan-dba": "0.2.85",
         "staabm/phpstan-todo-by": "0.2",
         "symplify/phpstan-rules": "12.7.0",
-        "thecodingmachine/phpstan-safe-rule": "1.2",
-        "thecodingmachine/safe": "1.3.3",
         "tomasvotruba/cognitive-complexity": "0.2.3",
         "tomasvotruba/type-coverage": "1.0.0",
         "tomasvotruba/unused-public": "1.1.0"

composer.lock

@@ -27,6 +27,6 @@ public function processNode(Node $node, Scope $scope)
             return null;
         }
 
-        return RexModuleVarsReflection::matchInputVars(\Safe\file_get_contents($scope->getFile()));
+        return RexModuleVarsReflection::matchInputVars(\rex_file::get($scope->getFile(), ''));
     }
 }

lib/collector/RexModuleInputVarsCollector.php

@@ -27,6 +27,6 @@ public function processNode(Node $node, Scope $scope)
             return null;
         }
 
-        return RexModuleVarsReflection::matchOutputVars(\Safe\file_get_contents($scope->getFile()));
+        return RexModuleVarsReflection::matchOutputVars(\rex_file::get($scope->getFile(), ''));
     }
 }

lib/collector/RexModuleOutputVarsCollector.php

@@ -27,6 +27,6 @@ public function processNode(Node $node, Scope $scope)
             return null;
         }
 
-        return RexTemplateVarsReflection::matchVars(\Safe\file_get_contents($scope->getFile()));
+        return RexTemplateVarsReflection::matchVars(\rex_file::get($scope->getFile(), ''));
     }
 }

lib/collector/RexTemplateVarsCollector.php

@@ -44,5 +44,5 @@ function doQux()
     assertType('int', rex_get('HTTP_REFERER', 'int', 1));
     assertType('int|null', rex_get('HTTP_REFERER', 'int', null));
     assertType("'foo'|int", rex_get('HTTP_REFERER', 'int', 'foo'));
-    assertType("'foo'|int", rex_get('HTTP_REFERER', 'int', rand(0,1) ? 'foo' : ''));
+    assertType("''|'foo'|int", rex_get('HTTP_REFERER', 'int', rand(0,1) === 1 ? 'foo' : ''));
 }

tests/data/rex-sapi.php

@@ -384,8 +384,8 @@
     'Doctrine\\DBAL\\Types\\VarDateTimeImmutableType' => $vendorDir . '/doctrine/dbal/src/Types/VarDateTimeImmutableType.php',
     'Doctrine\\DBAL\\Types\\VarDateTimeType' => $vendorDir . '/doctrine/dbal/src/Types/VarDateTimeType.php',
     'Doctrine\\DBAL\\VersionAwarePlatformDriver' => $vendorDir . '/doctrine/dbal/src/VersionAwarePlatformDriver.php',
-    'Doctrine\\Deprecations\\Deprecation' => $vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations/Deprecation.php',
-    'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => $vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations/PHPUnit/VerifyDeprecations.php',
+    'Doctrine\\Deprecations\\Deprecation' => $vendorDir . '/doctrine/deprecations/src/Deprecation.php',
+    'Doctrine\\Deprecations\\PHPUnit\\VerifyDeprecations' => $vendorDir . '/doctrine/deprecations/src/PHPUnit/VerifyDeprecations.php',
     'Dogma\\Application\\Colors' => $vendorDir . '/dogma/dogma/src/Application/Colors.php',
     'Dogma\\Application\\ConfigurationProfile' => $vendorDir . '/dogma/dogma/src/Application/ConfigurationProfile.php',
     'Dogma\\Application\\Configurator' => $vendorDir . '/dogma/dogma/src/Application/Configurator.php',
@@ -2023,11 +2023,6 @@
     'Symplify\\PHPStanRules\\ValueObject\\ClassNamespaceAndDirectory' => $vendorDir . '/symplify/phpstan-rules/src/ValueObject/ClassNamespaceAndDirectory.php',
     'Symplify\\PHPStanRules\\ValueObject\\Configuration\\RequiredWithMessage' => $vendorDir . '/symplify/phpstan-rules/src/ValueObject/Configuration/RequiredWithMessage.php',
     'Symplify\\PHPStanRules\\ValueObject\\MethodCallReference' => $vendorDir . '/symplify/phpstan-rules/src/ValueObject/MethodCallReference.php',
-    'TheCodingMachine\\Safe\\PHPStan\\Rules\\UseSafeClassesRule' => $vendorDir . '/thecodingmachine/phpstan-safe-rule/src/Rules/UseSafeClassesRule.php',
-    'TheCodingMachine\\Safe\\PHPStan\\Rules\\UseSafeFunctionsRule' => $vendorDir . '/thecodingmachine/phpstan-safe-rule/src/Rules/UseSafeFunctionsRule.php',
-    'TheCodingMachine\\Safe\\PHPStan\\Type\\Php\\ReplaceSafeFunctionsDynamicReturnTypeExtension' => $vendorDir . '/thecodingmachine/phpstan-safe-rule/src/Type/Php/ReplaceSafeFunctionsDynamicReturnTypeExtension.php',
-    'TheCodingMachine\\Safe\\PHPStan\\Utils\\ClassListLoader' => $vendorDir . '/thecodingmachine/phpstan-safe-rule/src/Utils/ClassListLoader.php',
-    'TheCodingMachine\\Safe\\PHPStan\\Utils\\FunctionListLoader' => $vendorDir . '/thecodingmachine/phpstan-safe-rule/src/Utils/FunctionListLoader.php',
     'TomasVotruba\\CognitiveComplexity\\AstCognitiveComplexityAnalyzer' => $vendorDir . '/tomasvotruba/cognitive-complexity/src/AstCognitiveComplexityAnalyzer.php',
     'TomasVotruba\\CognitiveComplexity\\ClassReflectionParser' => $vendorDir . '/tomasvotruba/cognitive-complexity/src/ClassReflectionParser.php',
     'TomasVotruba\\CognitiveComplexity\\Configuration' => $vendorDir . '/tomasvotruba/cognitive-complexity/src/Configuration.php',
@@ -2061,7 +2056,7 @@
     'TomasVotruba\\UnusedPublic\\ClassTypeDetector' => $vendorDir . '/tomasvotruba/unused-public/src/ClassTypeDetector.php',
     'TomasVotruba\\UnusedPublic\\CollectorMapper\\MethodCallCollectorMapper' => $vendorDir . '/tomasvotruba/unused-public/src/CollectorMapper/MethodCallCollectorMapper.php',
     'TomasVotruba\\UnusedPublic\\Collectors\\Callable_\\AttributeCallableCollector' => $vendorDir . '/tomasvotruba/unused-public/src/Collectors/Callable_/AttributeCallableCollector.php',
-    'TomasVotruba\\UnusedPublic\\Collectors\\Callable_\\CallUserFuncCollector' => $vendorDir . '/tomasvotruba/unused-public/src/Collectors/Callable_/CallUserFuncCollector.php',
+    'TomasVotruba\\UnusedPublic\\Collectors\\Callable_\\CallableTypeCollector' => $vendorDir . '/tomasvotruba/unused-public/src/Collectors/Callable_/CallableTypeCollector.php',
     'TomasVotruba\\UnusedPublic\\Collectors\\ClassConstFetchCollector' => $vendorDir . '/tomasvotruba/unused-public/src/Collectors/ClassConstFetchCollector.php',
     'TomasVotruba\\UnusedPublic\\Collectors\\FormTypeClassCollector' => $vendorDir . '/tomasvotruba/unused-public/src/Collectors/FormTypeClassCollector.php',
     'TomasVotruba\\UnusedPublic\\Collectors\\MethodCall\\MethodCallCollector' => $vendorDir . '/tomasvotruba/unused-public/src/Collectors/MethodCall/MethodCallCollector.php',

vendor/composer/autoload_classmap.php

@@ -8,6 +8,7 @@
 return array(
     '9b38cf48e83f5d8f60375221cd213eee' => $vendorDir . '/phpstan/phpstan/bootstrap.php',
     'a4ecaeafb8cfb009ad0e052c90355e98' => $vendorDir . '/beberlei/assert/lib/Assert/functions.php',
+    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
     '51fcf4e06c07cc00c920b44bcd900e7a' => $vendorDir . '/thecodingmachine/safe/deprecated/apc.php',
     '47f619d9197b36cf5ab70738d7743fe2' => $vendorDir . '/thecodingmachine/safe/deprecated/libevent.php',
     'ea6bb8a12ef9b68f6ada99058e530760' => $vendorDir . '/thecodingmachine/safe/deprecated/mssql.php',
@@ -97,5 +98,4 @@
     '4af1dca6db8c527c6eed27bff85ff0e5' => $vendorDir . '/thecodingmachine/safe/generated/yaz.php',
     'fe43ca06499ac37bc2dedd823af71eb5' => $vendorDir . '/thecodingmachine/safe/generated/zip.php',
     '356736db98a6834f0a886b8d509b0ecd' => $vendorDir . '/thecodingmachine/safe/generated/zlib.php',
-    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
 );

vendor/composer/autoload_files.php

@@ -13,7 +13,6 @@
     'TomasVotruba\\UnusedPublic\\' => array($vendorDir . '/tomasvotruba/unused-public/src'),
     'TomasVotruba\\TypeCoverage\\' => array($vendorDir . '/tomasvotruba/type-coverage/src'),
     'TomasVotruba\\CognitiveComplexity\\' => array($vendorDir . '/tomasvotruba/cognitive-complexity/src'),
-    'TheCodingMachine\\Safe\\PHPStan\\' => array($vendorDir . '/thecodingmachine/phpstan-safe-rule/src'),
     'Symplify\\PHPStanRules\\' => array($vendorDir . '/symplify/phpstan-rules/src'),
     'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
     'Spaze\\PHPStan\\Rules\\Disallowed\\' => array($vendorDir . '/spaze/phpstan-disallowed-calls/src'),
@@ -22,7 +21,7 @@
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'PHPStan\\' => array($vendorDir . '/phpstan/phpstan-deprecation-rules/src', $vendorDir . '/phpstan/phpstan-phpunit/src', $vendorDir . '/phpstan/phpstan-strict-rules/src', $vendorDir . '/phpstan/phpstan-symfony/src'),
     'JsonSchema\\' => array($vendorDir . '/justinrainbow/json-schema/src/JsonSchema'),
-    'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/lib/Doctrine/Deprecations'),
+    'Doctrine\\Deprecations\\' => array($vendorDir . '/doctrine/deprecations/src'),
     'Doctrine\\DBAL\\' => array($vendorDir . '/doctrine/dbal/src'),
     'Doctrine\\Common\\Cache\\' => array($vendorDir . '/doctrine/cache/lib/Doctrine/Common/Cache'),
     'Doctrine\\Common\\' => array($vendorDir . '/doctrine/event-manager/src'),