Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 25bd7d52ca39 · 2018-07-26T10:45:46.000+02:00
* 2.8:
  Fix Clidumper tests
  Enable the fixer enforcing fully-qualified calls for compiler-optimized functions
  Apply fixers
  Disable the native_constant_invocation fixer until it can be scoped
  Update the list of excluded files for the CS fixer
diff --git a/Store/CombinedStore.php b/Store/CombinedStore.php
@@ -46,7 +46,7 @@ public function __construct(array $stores, StrategyInterface $strategy)
     {
         foreach ($stores as $store) {
             if (!$store instanceof StoreInterface) {
-                throw new InvalidArgumentException(sprintf('The store must implement "%s". Got "%s".', StoreInterface::class, get_class($store)));
+                throw new InvalidArgumentException(sprintf('The store must implement "%s". Got "%s".', StoreInterface::class, \get_class($store)));
             }
         }
 
@@ -62,7 +62,7 @@ public function save(Key $key)
     {
         $successCount = 0;
         $failureCount = 0;
-        $storesCount = count($this->stores);
+        $storesCount = \count($this->stores);
 
         foreach ($this->stores as $store) {
             try {
@@ -92,7 +92,7 @@ public function save(Key $key)
 
     public function waitAndSave(Key $key)
     {
-        throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', get_class($this)));
+        throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
     }
 
     /**
@@ -102,7 +102,7 @@ public function putOffExpiration(Key $key, $ttl)
     {
         $successCount = 0;
         $failureCount = 0;
-        $storesCount = count($this->stores);
+        $storesCount = \count($this->stores);
         $expireAt = microtime(true) + $ttl;
 
         foreach ($this->stores as $store) {
@@ -164,7 +164,7 @@ public function exists(Key $key)
     {
         $successCount = 0;
         $failureCount = 0;
-        $storesCount = count($this->stores);
+        $storesCount = \count($this->stores);
 
         foreach ($this->stores as $store) {
             if ($store->exists($key)) {
diff --git a/Store/MemcachedStore.php b/Store/MemcachedStore.php
@@ -31,7 +31,7 @@ class MemcachedStore implements StoreInterface
 
     public static function isSupported()
     {
-        return extension_loaded('memcached');
+        return \extension_loaded('memcached');
     }
 
     /**
@@ -71,7 +71,7 @@ public function save(Key $key)
 
     public function waitAndSave(Key $key)
     {
-        throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', get_class($this)));
+        throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
     }
 
     /**
diff --git a/Store/RedisStore.php b/Store/RedisStore.php
@@ -35,7 +35,7 @@ class RedisStore implements StoreInterface
     public function __construct($redisClient, $initialTtl = 300.0)
     {
         if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) {
-            throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, is_object($redisClient) ? get_class($redisClient) : gettype($redisClient)));
+            throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient)));
         }
 
         if ($initialTtl <= 0) {
@@ -71,7 +71,7 @@ public function save(Key $key)
 
     public function waitAndSave(Key $key)
     {
-        throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', get_class($this)));
+        throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));
     }
 
     /**
@@ -141,10 +141,10 @@ private function evaluate($script, $resource, array $args)
         }
 
         if ($this->redis instanceof \Predis\Client) {
-            return call_user_func_array(array($this->redis, 'eval'), array_merge(array($script, 1, $resource), $args));
+            return \call_user_func_array(array($this->redis, 'eval'), array_merge(array($script, 1, $resource), $args));
         }
 
-        throw new InvalidArgumentException(sprintf('%s() expects been initialized with a Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, is_object($this->redis) ? get_class($this->redis) : gettype($this->redis)));
+        throw new InvalidArgumentException(sprintf('%s() expects been initialized with a Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis)));
     }
 
     /**
diff --git a/Store/SemaphoreStore.php b/Store/SemaphoreStore.php
@@ -35,7 +35,7 @@ class SemaphoreStore implements StoreInterface
      */
     public static function isSupported($blocking = null)
     {
-        if (!extension_loaded('sysvsem')) {
+        if (!\extension_loaded('sysvsem')) {
             return false;
         }
 
@@ -81,7 +81,7 @@ private function lock(Key $key, $blocking)
         if (\PHP_VERSION_ID >= 50601) {
             $acquired = @sem_acquire($resource, !$blocking);
         } elseif (!$blocking) {
-            throw new NotSupportedException(sprintf('The store "%s" does not supports non blocking locks.', get_class($this)));
+            throw new NotSupportedException(sprintf('The store "%s" does not supports non blocking locks.', \get_class($this)));
         } else {
             $acquired = @sem_acquire($resource);
         }
diff --git a/Store/StoreFactory.php b/Store/StoreFactory.php
@@ -35,6 +35,6 @@ public static function createStore($connection)
             return new MemcachedStore($connection);
         }
 
-        throw new InvalidArgumentException(sprintf('Unsupported Connection: %s.', get_class($connection)));
+        throw new InvalidArgumentException(sprintf('Unsupported Connection: %s.', \get_class($connection)));
     }
 }
diff --git a/Tests/Store/BlockingStoreTestTrait.php b/Tests/Store/BlockingStoreTestTrait.php
@@ -39,7 +39,7 @@ public function testBlockingLocks()
         // Amount a microsecond used to order async actions
         $clockDelay = 50000;
 
-        if (\PHP_VERSION_ID < 50600 || defined('HHVM_VERSION_ID')) {
+        if (\PHP_VERSION_ID < 50600 || \defined('HHVM_VERSION_ID')) {
             $this->markTestSkipped('The PHP engine does not keep resource in child forks');
 
             return;

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public function __construct(array $stores, StrategyInterface $strategy)`
`46`	`46`	`{`
`47`	`47`	`foreach ($stores as $store) {`
`48`	`48`	`if (!$store instanceof StoreInterface) {`
`49`		`- throw new InvalidArgumentException(sprintf('The store must implement "%s". Got "%s".', StoreInterface::class, get_class($store)));`
	`49`	`+ throw new InvalidArgumentException(sprintf('The store must implement "%s". Got "%s".', StoreInterface::class, \get_class($store)));`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`@@ -62,7 +62,7 @@ public function save(Key $key)`
`62`	`62`	`{`
`63`	`63`	`$successCount = 0;`
`64`	`64`	`$failureCount = 0;`
`65`		`- $storesCount = count($this->stores);`
	`65`	`+ $storesCount = \count($this->stores);`
`66`	`66`
`67`	`67`	`foreach ($this->stores as $store) {`
`68`	`68`	`try {`
`@@ -92,7 +92,7 @@ public function save(Key $key)`
`92`	`92`
`93`	`93`	`public function waitAndSave(Key $key)`
`94`	`94`	`{`
`95`		`- throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', get_class($this)));`
	`95`	`+ throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`/**`
`@@ -102,7 +102,7 @@ public function putOffExpiration(Key $key, $ttl)`
`102`	`102`	`{`
`103`	`103`	`$successCount = 0;`
`104`	`104`	`$failureCount = 0;`
`105`		`- $storesCount = count($this->stores);`
	`105`	`+ $storesCount = \count($this->stores);`
`106`	`106`	`$expireAt = microtime(true) + $ttl;`
`107`	`107`
`108`	`108`	`foreach ($this->stores as $store) {`
`@@ -164,7 +164,7 @@ public function exists(Key $key)`
`164`	`164`	`{`
`165`	`165`	`$successCount = 0;`
`166`	`166`	`$failureCount = 0;`
`167`		`- $storesCount = count($this->stores);`
	`167`	`+ $storesCount = \count($this->stores);`
`168`	`168`
`169`	`169`	`foreach ($this->stores as $store) {`
`170`	`170`	`if ($store->exists($key)) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ class MemcachedStore implements StoreInterface`
`31`	`31`
`32`	`32`	`public static function isSupported()`
`33`	`33`	`{`
`34`		`- return extension_loaded('memcached');`
	`34`	`+ return \extension_loaded('memcached');`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`/**`
`@@ -71,7 +71,7 @@ public function save(Key $key)`
`71`	`71`
`72`	`72`	`public function waitAndSave(Key $key)`
`73`	`73`	`{`
`74`		`- throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', get_class($this)));`
	`74`	`+ throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class RedisStore implements StoreInterface`
`35`	`35`	`public function __construct($redisClient, $initialTtl = 300.0)`
`36`	`36`	`{`
`37`	`37`	`if (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \RedisCluster && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) {`
`38`		`- throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, is_object($redisClient) ? get_class($redisClient) : gettype($redisClient)));`
	`38`	`+ throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($redisClient) ? \get_class($redisClient) : \gettype($redisClient)));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if ($initialTtl <= 0) {`
`@@ -71,7 +71,7 @@ public function save(Key $key)`
`71`	`71`
`72`	`72`	`public function waitAndSave(Key $key)`
`73`	`73`	`{`
`74`		`- throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', get_class($this)));`
	`74`	`+ throw new InvalidArgumentException(sprintf('The store "%s" does not supports blocking locks.', \get_class($this)));`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/**`
`@@ -141,10 +141,10 @@ private function evaluate($script, $resource, array $args)`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`if ($this->redis instanceof \Predis\Client) {`
`144`		`- return call_user_func_array(array($this->redis, 'eval'), array_merge(array($script, 1, $resource), $args));`
	`144`	`+ return \call_user_func_array(array($this->redis, 'eval'), array_merge(array($script, 1, $resource), $args));`
`145`	`145`	`}`
`146`	`146`
`147`		`- throw new InvalidArgumentException(sprintf('%s() expects been initialized with a Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, is_object($this->redis) ? get_class($this->redis) : gettype($this->redis)));`
	`147`	`+ throw new InvalidArgumentException(sprintf('%s() expects been initialized with a Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, \is_object($this->redis) ? \get_class($this->redis) : \gettype($this->redis)));`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class SemaphoreStore implements StoreInterface`
`35`	`35`	`*/`
`36`	`36`	`public static function isSupported($blocking = null)`
`37`	`37`	`{`
`38`		`- if (!extension_loaded('sysvsem')) {`
	`38`	`+ if (!\extension_loaded('sysvsem')) {`
`39`	`39`	`return false;`
`40`	`40`	`}`
`41`	`41`
`@@ -81,7 +81,7 @@ private function lock(Key $key, $blocking)`
`81`	`81`	`if (\PHP_VERSION_ID >= 50601) {`
`82`	`82`	`$acquired = @sem_acquire($resource, !$blocking);`
`83`	`83`	`} elseif (!$blocking) {`
`84`		`- throw new NotSupportedException(sprintf('The store "%s" does not supports non blocking locks.', get_class($this)));`
	`84`	`+ throw new NotSupportedException(sprintf('The store "%s" does not supports non blocking locks.', \get_class($this)));`
`85`	`85`	`} else {`
`86`	`86`	`$acquired = @sem_acquire($resource);`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,6 @@ public static function createStore($connection)`
`35`	`35`	`return new MemcachedStore($connection);`
`36`	`36`	`}`
`37`	`37`
`38`		`- throw new InvalidArgumentException(sprintf('Unsupported Connection: %s.', get_class($connection)));`
	`38`	`+ throw new InvalidArgumentException(sprintf('Unsupported Connection: %s.', \get_class($connection)));`
`39`	`39`	`}`
`40`	`40`	`}`