Merge pull request #3495 from soyuka/2.5

Fix cs, use static::class instead of get_class($this)
api-platform · Apr 16, 2020 · 3716126 · 3716126
2 parents bc52cac + c0e5a37
commit 3716126
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -108,16 +108,6 @@ return PhpCsFixer\Config::create()
                 'property',
             ],
         ],
-        'void_return' => false, // BC breaks; to be done in API Platform 3.0,
-        // removed get_class_this see https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues/4921
-        'function_to_constant' => [
-            'functions' => [
-                'get_called_class',
-                'get_class',
-                'php_sapi_name',
-                'phpversion',
-                'pi'
-            ]
-        ]
+        'void_return' => false, // BC breaks; to be done in API Platform 3.0
     ])
     ->setFinder($finder);
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -28,6 +28,10 @@ parameters:
 			path: src/Identifier/Normalizer/IntegerDenormalizer.php
 
 		# False positives
+		-
+			message: '#Strict comparison using !== between .+ and .+ will always evaluate to false\.#'
+			paths:
+				- src/Bridge/Doctrine/Common/PropertyHelperTrait.php
 		-
 			message: '#Variable \$iri might not be defined\.#'
 			path: src/JsonApi/Serializer/ItemNormalizer.php

diff --git a/src/Bridge/Doctrine/Common/PropertyHelperTrait.php b/src/Bridge/Doctrine/Common/PropertyHelperTrait.php
@@ -52,7 +52,7 @@ protected function isPropertyNested(string $property/*, string $resourceClass*/)
         if (\func_num_args() > 1) {
             $resourceClass = (string) func_get_arg(1);
         } else {
-            if (__CLASS__ !== \get_class($this)) {
+            if (__CLASS__ !== static::class) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
                     @trigger_error(sprintf('Method %s() will have a second `$resourceClass` argument in version API Platform 3.0. Not defining it is deprecated since API Platform 2.1.', __FUNCTION__), E_USER_DEPRECATED);
@@ -91,7 +91,7 @@ protected function splitPropertyParts(string $property/*, string $resourceClass*
 
         if (\func_num_args() > 1) {
             $resourceClass = func_get_arg(1);
-        } elseif (__CLASS__ !== \get_class($this)) {
+        } elseif (__CLASS__ !== static::class) {
             $r = new \ReflectionMethod($this, __FUNCTION__);
             if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
                 @trigger_error(sprintf('Method %s() will have a second `$resourceClass` argument in version API Platform 3.0. Not defining it is deprecated since API Platform 2.1.', __FUNCTION__), E_USER_DEPRECATED);

diff --git a/src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php b/src/Bridge/Doctrine/Orm/Filter/AbstractFilter.php
@@ -101,7 +101,7 @@ protected function isPropertyEnabled(string $property/*, string $resourceClass*/
         if (\func_num_args() > 1) {
             $resourceClass = func_get_arg(1);
         } else {
-            if (__CLASS__ !== \get_class($this)) {
+            if (__CLASS__ !== static::class) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
                     @trigger_error(sprintf('Method %s() will have a second `$resourceClass` argument in version API Platform 3.0. Not defining it is deprecated since API Platform 2.1.', __FUNCTION__), E_USER_DEPRECATED);

diff --git a/src/Bridge/Doctrine/Orm/Filter/ExistsFilter.php b/src/Bridge/Doctrine/Orm/Filter/ExistsFilter.php
@@ -74,7 +74,7 @@ protected function filterProperty(string $property, $value, QueryBuilder $queryB
         if (\func_num_args() > 6) {
             $context = func_get_arg(6);
         } else {
-            if (__CLASS__ !== \get_class($this)) {
+            if (__CLASS__ !== static::class) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
                     @trigger_error(sprintf('Method %s() will have a seventh `$context` argument in version API Platform 3.0. Not defining it is deprecated since API Platform 2.5.', __FUNCTION__), E_USER_DEPRECATED);

diff --git a/src/Bridge/Doctrine/Orm/PropertyHelperTrait.php b/src/Bridge/Doctrine/Orm/PropertyHelperTrait.php
@@ -45,7 +45,7 @@ protected function addJoinsForNestedProperty(string $property, string $rootAlias
         if (\func_num_args() > 4) {
             $resourceClass = func_get_arg(4);
         } else {
-            if (__CLASS__ !== \get_class($this)) {
+            if (__CLASS__ !== static::class) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
                     @trigger_error(sprintf('Method %s() will have a fifth `$resourceClass` argument in version API Platform 3.0. Not defining it is deprecated since API Platform 2.1.', __FUNCTION__), E_USER_DEPRECATED);
@@ -57,7 +57,7 @@ protected function addJoinsForNestedProperty(string $property, string $rootAlias
         if (\func_num_args() > 5) {
             $joinType = func_get_arg(5);
         } else {
-            if (__CLASS__ !== \get_class($this)) {
+            if (__CLASS__ !== static::class) {
                 $r = new \ReflectionMethod($this, __FUNCTION__);
                 if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
                     @trigger_error(sprintf('Method %s() will have a sixth `$joinType` argument in version API Platform 3.0. Not defining it is deprecated since API Platform 2.3.', __FUNCTION__), E_USER_DEPRECATED);