Merge pull request #49 from vpg/php7

Making cachetool compatible w/ php7
gordalina · Oct 1, 2017 · 42ae3c3 · 42ae3c3
2 parents 22d5c7b + c405f12
commit 42ae3c3
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 6 deletions.
diff --git a/src/CacheTool/Adapter/FastCGI.php b/src/CacheTool/Adapter/FastCGI.php
@@ -21,6 +21,14 @@ class FastCGI extends AbstractAdapter
      */
     protected $client;
 
+    /**
+     * @var Array of patterns matching php socket files
+     */
+    protected $possibleSocketFilePatterns = [
+        '/var/run/php*.sock',
+        '/var/run/php/*.sock'
+    ];
+
     /**
      * @var string
      */
@@ -34,9 +42,14 @@ public function __construct($host = null, $tempDir = null)
     {
         // try to guess where it is
         if ($host === null) {
-            if (file_exists('/var/run/php5-fpm.sock')) {
-                $host = '/var/run/php5-fpm.sock';
-            } else {
+            foreach ($this->possibleSocketFilePatterns as $possibleSocketFilePattern) {
+                $possibleSocketFile = current(glob($possibleSocketFilePattern));
+                if (file_exists($possibleSocketFile)) {
+                    $host = $possibleSocketFile;
+                    break;
+                }
+            }
+            if ($host === null) {
                 $host = '127.0.0.1:9000';
             }
         }

diff --git a/src/CacheTool/Command/ApcCacheInfoCommand.php b/src/CacheTool/Command/ApcCacheInfoCommand.php
@@ -54,8 +54,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->ensureExtensionLoaded('apc');
 
-        $user = $this->getCacheTool()->apc_cache_info('user');
-        $system = $this->getCacheTool()->apc_cache_info('system');
+        $user = $this->getCacheTool()->apc_cache_info('user') ?: [];
+        $system = $this->getCacheTool()->apc_cache_info('system') ?: [];
 
         $this->normalize($user);
         $this->normalize($system);

diff --git a/src/CacheTool/Command/ApcCacheInfoFileCommand.php b/src/CacheTool/Command/ApcCacheInfoFileCommand.php
@@ -36,7 +36,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->ensureExtensionLoaded('apc');
 
-        $info = $this->getCacheTool()->apc_cache_info('system');
+        $info = $this->getCacheTool()->apc_cache_info('system') ?: [];
         $this->normalize($info);
 
         if (!$info) {

diff --git a/tests/CacheTool/Command/ApcBinDumpCommandTest.php b/tests/CacheTool/Command/ApcBinDumpCommandTest.php
@@ -6,6 +6,9 @@ class ApcBinDumpCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
         $this->assertNoHHVM();
 
@@ -18,6 +21,9 @@ public function testCommand()
 
     public function testCommandWithFile()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
         $this->assertNoHHVM();
 

diff --git a/tests/CacheTool/Command/ApcBinLoadCommandTest.php b/tests/CacheTool/Command/ApcBinLoadCommandTest.php
@@ -6,6 +6,9 @@ class ApcBinLoadCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
         $this->assertNoHHVM();
 

diff --git a/tests/CacheTool/Command/ApcCacheClearCommandTest.php b/tests/CacheTool/Command/ApcCacheClearCommandTest.php
@@ -6,6 +6,9 @@ class ApcCacheClearCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:cache:clear all -v');
@@ -16,6 +19,9 @@ public function testCommand()
 
     public function testCommandUser()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:cache:clear user -v');
@@ -25,6 +31,9 @@ public function testCommandUser()
 
     public function testException()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:cache:clear err -v');

diff --git a/tests/CacheTool/Command/ApcCacheInfoCommandTest.php b/tests/CacheTool/Command/ApcCacheInfoCommandTest.php
@@ -6,6 +6,9 @@ class ApcCacheInfoCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:cache:info');

diff --git a/tests/CacheTool/Command/ApcCacheInfoFileCommandTest.php b/tests/CacheTool/Command/ApcCacheInfoFileCommandTest.php
@@ -6,6 +6,9 @@ class ApcCacheInfoFileCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:cache:info:file -v');

diff --git a/tests/CacheTool/Command/ApcKeyDeleteCommandTest.php b/tests/CacheTool/Command/ApcKeyDeleteCommandTest.php
@@ -6,6 +6,9 @@ class ApcKeyDeleteCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:key:delete key -v');

diff --git a/tests/CacheTool/Command/ApcKeyExistsCommandTest.php b/tests/CacheTool/Command/ApcKeyExistsCommandTest.php
@@ -6,6 +6,9 @@ class ApcKeyExistsCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:key:exists key -v');

diff --git a/tests/CacheTool/Command/ApcKeyFetchCommandTest.php b/tests/CacheTool/Command/ApcKeyFetchCommandTest.php
@@ -6,6 +6,9 @@ class ApcKeyFetchCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:key:fetch key -v');

diff --git a/tests/CacheTool/Command/ApcKeyStoreCommandTest.php b/tests/CacheTool/Command/ApcKeyStoreCommandTest.php
@@ -6,6 +6,9 @@ class ApcKeyStoreCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:key:store key value 3600 -v');

diff --git a/tests/CacheTool/Command/ApcSmaInfoCommandTest.php b/tests/CacheTool/Command/ApcSmaInfoCommandTest.php
@@ -6,6 +6,9 @@ class ApcSmaInfoCommandTest extends CommandTest
 {
     public function testCommand()
     {
+        if (PHP_VERSION_ID >= 70000) {
+            $this->markTestSkipped('Skip APC test w/ php7');
+        }
         $this->assertHasApc();
 
         $result = $this->runCommand('apc:sma:info -v');