Merge branch '3.4' into 4.4

* 3.4:
  Enable "native_constant_invocation" CS rule
  Make AbstractPhpFileCacheWarmer public

Author: nicolas-grekas

Store/CombinedStore.php

@@ -99,7 +99,7 @@ public function save(Key $key)
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), \E_USER_DEPRECATED);
         throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', static::class));
     }
 

Store/FlockStore.php

@@ -96,7 +96,7 @@ private function lock(Key $key, bool $blocking)
 
         // On Windows, even if PHP doc says the contrary, LOCK_NB works, see
         // https://bugs.php.net/54129
-        if (!flock($handle, LOCK_EX | ($blocking ? 0 : LOCK_NB))) {
+        if (!flock($handle, \LOCK_EX | ($blocking ? 0 : \LOCK_NB))) {
             fclose($handle);
             throw new LockConflictedException();
         }
@@ -124,7 +124,7 @@ public function delete(Key $key)
 
         $handle = $key->getState(__CLASS__);
 
-        flock($handle, LOCK_UN | LOCK_NB);
+        flock($handle, \LOCK_UN | \LOCK_NB);
         fclose($handle);
 
         $key->removeState(__CLASS__);

Store/MemcachedStore.php

@@ -76,7 +76,7 @@ public function save(Key $key)
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), \E_USER_DEPRECATED);
         throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', static::class));
     }
 

Store/PdoStore.php

@@ -135,7 +135,7 @@ public function save(Key $key)
             $this->putOffExpiration($key, $this->initialTtl);
         }
 
-        if ($this->gcProbability > 0 && (1.0 === $this->gcProbability || (random_int(0, PHP_INT_MAX) / PHP_INT_MAX) <= $this->gcProbability)) {
+        if ($this->gcProbability > 0 && (1.0 === $this->gcProbability || (random_int(0, \PHP_INT_MAX) / \PHP_INT_MAX) <= $this->gcProbability)) {
             $this->prune();
         }
 
@@ -147,7 +147,7 @@ public function save(Key $key)
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), \E_USER_DEPRECATED);
         throw new NotSupportedException(sprintf('The store "%s" does not supports blocking locks.', __METHOD__));
     }
 

Store/RedisStore.php

@@ -80,7 +80,7 @@ public function save(Key $key)
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), \E_USER_DEPRECATED);
         throw new NotSupportedException(sprintf('The store "%s" does not support blocking locks.', static::class));
     }
 

Store/RetryTillSaveStore.php

@@ -38,7 +38,7 @@ class RetryTillSaveStore implements BlockingStoreInterface, StoreInterface, Logg
      * @param int $retrySleep Duration in ms between 2 retry
      * @param int $retryCount Maximum amount of retry
      */
-    public function __construct(PersistingStoreInterface $decorated, int $retrySleep = 100, int $retryCount = PHP_INT_MAX)
+    public function __construct(PersistingStoreInterface $decorated, int $retrySleep = 100, int $retryCount = \PHP_INT_MAX)
     {
         $this->decorated = $decorated;
         $this->retrySleep = $retrySleep;

Store/ZookeeperStore.php

@@ -108,7 +108,7 @@ public function exists(Key $key): bool
      */
     public function waitAndSave(Key $key)
     {
-        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), E_USER_DEPRECATED);
+        @trigger_error(sprintf('%s() is deprecated since Symfony 4.4 and will be removed in Symfony 5.0.', __METHOD__), \E_USER_DEPRECATED);
         throw new NotSupportedException();
     }
 

Tests/Store/BlockingStoreTestTrait.php

@@ -50,11 +50,11 @@ public function testBlockingLocks()
         $parentPID = posix_getpid();
 
         // Block SIGHUP signal
-        pcntl_sigprocmask(SIG_BLOCK, [SIGHUP]);
+        pcntl_sigprocmask(\SIG_BLOCK, [\SIGHUP]);
 
         if ($childPID = pcntl_fork()) {
             // Wait the start of the child
-            pcntl_sigwaitinfo([SIGHUP], $info);
+            pcntl_sigwaitinfo([\SIGHUP], $info);
 
             $store = $this->getStore();
             try {
@@ -66,7 +66,7 @@ public function testBlockingLocks()
             }
 
             // send the ready signal to the child
-            posix_kill($childPID, SIGHUP);
+            posix_kill($childPID, \SIGHUP);
 
             // This call should be blocked by the child #1
             try {
@@ -82,23 +82,23 @@ public function testBlockingLocks()
             }
         } else {
             // Block SIGHUP signal
-            pcntl_sigprocmask(SIG_BLOCK, [SIGHUP]);
+            pcntl_sigprocmask(\SIG_BLOCK, [\SIGHUP]);
 
             try {
                 $store = $this->getStore();
                 $store->save($key);
                 // send the ready signal to the parent
-                posix_kill($parentPID, SIGHUP);
+                posix_kill($parentPID, \SIGHUP);
 
                 // Wait for the parent to be ready
-                pcntl_sigwaitinfo([SIGHUP], $info);
+                pcntl_sigwaitinfo([\SIGHUP], $info);
 
                 // Wait ClockDelay to let parent assert to finish
                 usleep($clockDelay);
                 $store->delete($key);
                 exit(0);
             } catch (\Throwable $e) {
-                posix_kill($parentPID, SIGHUP);
+                posix_kill($parentPID, \SIGHUP);
                 exit(1);
             }
         }

Tests/Store/SemaphoreStoreTest.php

@@ -47,22 +47,22 @@ public function testResourceRemoval()
 
     private function getOpenedSemaphores()
     {
-        if ('Darwin' === PHP_OS) {
-            $lines = explode(PHP_EOL, trim(shell_exec('ipcs -s')));
+        if ('Darwin' === \PHP_OS) {
+            $lines = explode(\PHP_EOL, trim(shell_exec('ipcs -s')));
             if (-1 === $start = array_search('Semaphores:', $lines)) {
-                throw new \Exception('Failed to extract list of opened semaphores. Expected a Semaphore list, got '.implode(PHP_EOL, $lines));
+                throw new \Exception('Failed to extract list of opened semaphores. Expected a Semaphore list, got '.implode(\PHP_EOL, $lines));
             }
 
             return \count(\array_slice($lines, ++$start));
         }
 
-        $lines = explode(PHP_EOL, trim(shell_exec('LC_ALL=C ipcs -su')));
+        $lines = explode(\PHP_EOL, trim(shell_exec('LC_ALL=C ipcs -su')));
         if ('------ Semaphore Status --------' !== $lines[0]) {
-            throw new \Exception('Failed to extract list of opened semaphores. Expected a Semaphore status, got '.implode(PHP_EOL, $lines));
+            throw new \Exception('Failed to extract list of opened semaphores. Expected a Semaphore status, got '.implode(\PHP_EOL, $lines));
         }
         list($key, $value) = explode(' = ', $lines[1]);
         if ('used arrays' !== $key) {
-            throw new \Exception('Failed to extract list of opened semaphores. Expected a "used arrays" key, got '.implode(PHP_EOL, $lines));
+            throw new \Exception('Failed to extract list of opened semaphores. Expected a "used arrays" key, got '.implode(\PHP_EOL, $lines));
         }
 
         return (int) $value;