update dev dependencies, fix formatting

tedious · Dec 8, 2017 · 5e324b4 · 5e324b4
1 parent f20a99b
commit 5e324b4
Show file tree

Hide file tree

Showing 17 changed files with 104 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@
 /vendor
 /report
 /build
+
+.php_cs.cache
diff --git a/.php_cs b/.php_cs
diff --git a/composer.json b/composer.json
@@ -25,12 +25,12 @@
     }
   ],
   "require": {
-    "php": "^5.4|^7.0",
+    "php": "^7.0",
     "psr/cache": "~1.0"
   },
   "require-dev": {
-    "friendsofphp/php-cs-fixer": "^1.9",
-    "phpunit/phpunit": "4.8.*",
+    "friendsofphp/php-cs-fixer": "^2.8",
+    "phpunit/phpunit": "^6",
     "satooshi/php-coveralls": "1.0.*"
   },
   "autoload": {

diff --git a/src/Stash/Item.php b/src/Stash/Item.php
@@ -249,7 +249,8 @@ public function get()
                 $this->data = $this->executeGet(
                     $this->invalidationMethod,
                     $this->invalidationArg1,
-                    $this->invalidationArg2);
+                    $this->invalidationArg2
+                );
             }
 
             if (false === $this->isHit) {
@@ -569,9 +570,13 @@ protected function logException($message, $exception)
             return false;
         }
 
-        $this->logger->critical($message,
-                                array('exception' => $exception,
-                                      'key' => $this->keyString));
+        $this->logger->critical(
+            $message,
+            array(
+                'exception' => $exception,
+                 'key' => $this->keyString
+              )
+        );
 
         return true;
     }

diff --git a/src/Stash/Pool.php b/src/Stash/Pool.php
@@ -321,8 +321,10 @@ protected function logException($message, $exception)
             return false;
         }
 
-        $this->logger->critical($message,
-                                array('exception' => $exception));
+        $this->logger->critical(
+            $message,
+            array('exception' => $exception)
+        );
 
         return true;
     }

diff --git a/tests/Stash/Test/AbstractItemTest.php b/tests/Stash/Test/AbstractItemTest.php
@@ -23,7 +23,7 @@
  *
  * @todo find out why this has to be abstract to work (see https://github.com/tedivm/Stash/pull/10)
  */
-abstract class AbstractItemTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractItemTest extends \PHPUnit\Framework\TestCase
 {
     protected $data = array('string' => 'Hello world!',
                             'complexString' => "\t\t\t\tHello\r\n\rWorld!",

diff --git a/tests/Stash/Test/AbstractPoolTest.php b/tests/Stash/Test/AbstractPoolTest.php
@@ -21,7 +21,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class AbstractPoolTest extends \PHPUnit_Framework_TestCase
+class AbstractPoolTest extends \PHPUnit\Framework\TestCase
 {
     protected $data = array(array('test', 'test'));
     protected $multiData = array('key' => 'value',
@@ -47,7 +47,7 @@ public function testSetItemDriver()
 
     public function testSetItemClass()
     {
-        $mockItem = $this->getMock('Stash\Interfaces\ItemInterface');
+        $mockItem = $this->createMock('Stash\Interfaces\ItemInterface');
         $mockClassName = get_class($mockItem);
         $pool = $this->getTestPool();
 
@@ -316,8 +316,11 @@ public function testLoggerClear()
         // triggerlogging
         $pool->clear();
 
-        $this->assertInstanceOf('Stash\Test\Exception\TestException',
-            $logger->lastContext['exception'], 'Logger was passed exception in event context.');
+        $this->assertInstanceOf(
+            'Stash\Test\Exception\TestException',
+            $logger->lastContext['exception'],
+            'Logger was passed exception in event context.'
+        );
 
         $this->assertTrue(strlen($logger->lastMessage) > 0, 'Logger message set after "get" exception.');
         $this->assertEquals('critical', $logger->lastLevel, 'Exceptions logged as critical.');
@@ -336,8 +339,11 @@ public function testLoggerPurge()
         // triggerlogging
         $pool->purge();
 
-        $this->assertInstanceOf('Stash\Test\Exception\TestException',
-            $logger->lastContext['exception'], 'Logger was passed exception in event context.');
+        $this->assertInstanceOf(
+            'Stash\Test\Exception\TestException',
+            $logger->lastContext['exception'],
+            'Logger was passed exception in event context.'
+        );
         $this->assertTrue(strlen($logger->lastMessage) > 0, 'Logger message set after "set" exception.');
         $this->assertEquals('critical', $logger->lastLevel, 'Exceptions logged as critical.');
     }

diff --git a/tests/Stash/Test/CacheExceptionTest.php b/tests/Stash/Test/CacheExceptionTest.php
@@ -20,7 +20,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class CacheExceptionTest extends \PHPUnit_Framework_TestCase
+class CacheExceptionTest extends \PHPUnit\Framework\TestCase
 {
     public function testSet()
     {

diff --git a/tests/Stash/Test/Driver/AbstractDriverTest.php b/tests/Stash/Test/Driver/AbstractDriverTest.php
@@ -17,7 +17,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-abstract class AbstractDriverTest extends \PHPUnit_Framework_TestCase
+abstract class AbstractDriverTest extends \PHPUnit\Framework\TestCase
 {
     protected $data = array('string' => 'Hello world!',
                             'complexString' => "\t\tHello\r\n\r\'\'World!\"\'\\",

diff --git a/tests/Stash/Test/Driver/BlackHoleTest.php b/tests/Stash/Test/Driver/BlackHoleTest.php
@@ -16,7 +16,7 @@
 /**
  * @author  Benjamin Zikarsky <benjamin.zikarsky@perbility.de>
  */
-class BlackHoleTest extends \PHPUnit_Framework_TestCase
+class BlackHoleTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @var Stash\Driver\BlackHole

diff --git a/tests/Stash/Test/Driver/MemcacheAnyTest.php b/tests/Stash/Test/Driver/MemcacheAnyTest.php
@@ -19,7 +19,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class MemcacheAnyTest extends \PHPUnit_Framework_TestCase
+class MemcacheAnyTest extends \PHPUnit\Framework\TestCase
 {
     protected $driverClass = 'Stash\Driver\Memcache';
 

diff --git a/tests/Stash/Test/Driver/SqliteAnyTest.php b/tests/Stash/Test/Driver/SqliteAnyTest.php
@@ -21,7 +21,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class SqliteAnyTest extends \PHPUnit_Framework_TestCase
+class SqliteAnyTest extends \PHPUnit\Framework\TestCase
 {
     protected $driverClass = 'Stash\Driver\Sqlite';
 

diff --git a/tests/Stash/Test/Driver/UnavailableDriverTest.php b/tests/Stash/Test/Driver/UnavailableDriverTest.php
@@ -17,7 +17,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class UnavailableDriverTest extends \PHPUnit_Framework_TestCase
+class UnavailableDriverTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @expectedException Stash\Exception\RuntimeException

diff --git a/tests/Stash/Test/DriverListTest.php b/tests/Stash/Test/DriverListTest.php
@@ -17,7 +17,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class DriverListTest extends \PHPUnit_Framework_TestCase
+class DriverListTest extends \PHPUnit\Framework\TestCase
 {
     public function testGetAvailableDrivers()
     {

diff --git a/tests/Stash/Test/ItemLoggerTest.php b/tests/Stash/Test/ItemLoggerTest.php
@@ -21,7 +21,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class ItemLoggerTest extends \PHPUnit_Framework_TestCase
+class ItemLoggerTest extends \PHPUnit\Framework\TestCase
 {
     protected function getItem($key, $exceptionDriver = false)
     {
@@ -60,8 +60,11 @@ public function testGet()
         // triggerlogging
         $item->get('test_key');
 
-        $this->assertInstanceOf('Stash\Test\Exception\TestException',
-                                $logger->lastContext['exception'], 'Logger was passed exception in event context.');
+        $this->assertInstanceOf(
+            'Stash\Test\Exception\TestException',
+                                $logger->lastContext['exception'],
+            'Logger was passed exception in event context.'
+        );
 
         $this->assertTrue(strlen($logger->lastMessage) > 0, 'Logger message set after "get" exception.');
         $this->assertEquals('critical', $logger->lastLevel, 'Exceptions logged as critical.');
@@ -77,8 +80,11 @@ public function testSet()
         // triggerlogging
         $item->set('test_key')->save();
 
-        $this->assertInstanceOf('Stash\Test\Exception\TestException',
-                                $logger->lastContext['exception'], 'Logger was passed exception in event context.');
+        $this->assertInstanceOf(
+            'Stash\Test\Exception\TestException',
+                                $logger->lastContext['exception'],
+            'Logger was passed exception in event context.'
+        );
         $this->assertTrue(strlen($logger->lastMessage) > 0, 'Logger message set after "set" exception.');
         $this->assertEquals('critical', $logger->lastLevel, 'Exceptions logged as critical.');
     }
@@ -93,8 +99,11 @@ public function testClear()
         // triggerlogging
         $item->clear();
 
-        $this->assertInstanceOf('Stash\Test\Exception\TestException',
-                                $logger->lastContext['exception'], 'Logger was passed exception in event context.');
+        $this->assertInstanceOf(
+            'Stash\Test\Exception\TestException',
+                                $logger->lastContext['exception'],
+            'Logger was passed exception in event context.'
+        );
         $this->assertTrue(strlen($logger->lastMessage) > 0, 'Logger message set after "clear" exception.');
         $this->assertEquals('critical', $logger->lastLevel, 'Exceptions logged as critical.');
     }

diff --git a/tests/Stash/Test/SessionTest.php b/tests/Stash/Test/SessionTest.php
@@ -18,7 +18,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class SessionTest extends \PHPUnit_Framework_TestCase
+class SessionTest extends \PHPUnit\Framework\TestCase
 {
     protected $testClass = '\Stash\Session';
     protected $poolClass = '\Stash\Pool';
@@ -38,13 +38,21 @@ public function testReadAndWrite()
     {
         $session = $this->getSession();
 
-        $this->assertSame('', $session->read('session_id'),
-                          'Empty session returns empty string.');
-
-        $this->assertTrue($session->write('session_id', 'session_data'),
-                          'Data was written to the session.');
-        $this->assertSame('session_data', $session->read('session_id'),
-                          'Active session returns session data.');
+        $this->assertSame(
+            '',
+            $session->read('session_id'),
+                          'Empty session returns empty string.'
+        );
+
+        $this->assertTrue(
+            $session->write('session_id', 'session_data'),
+                          'Data was written to the session.'
+        );
+        $this->assertSame(
+            'session_data',
+            $session->read('session_id'),
+                          'Active session returns session data.'
+        );
     }
 
     public function testOpen()
@@ -62,8 +70,10 @@ public function testOpen()
         $DataA = $sessionA->read('shared_id');
         $DataB = $sessionB->read('shared_id');
 
-        $this->assertTrue($DataA != $DataB,
-                          'Sessions with different paths do not share data.');
+        $this->assertTrue(
+            $DataA != $DataB,
+                          'Sessions with different paths do not share data.'
+        );
 
         $pool = $this->getPool();
 
@@ -78,15 +88,19 @@ public function testOpen()
         $DataA = $sessionA->read('shared_id');
         $DataB = $sessionB->read('shared_id');
 
-        $this->assertTrue($DataA != $DataB,
-                          'Sessions with different names do not share data.');
+        $this->assertTrue(
+            $DataA != $DataB,
+                          'Sessions with different names do not share data.'
+        );
     }
 
     public function testClose()
     {
         $session = $this->getSession();
-        $this->assertTrue($session->close(),
-                          'Session was closed');
+        $this->assertTrue(
+            $session->close(),
+                          'Session was closed'
+        );
     }
 
     public function testDestroy()
@@ -95,14 +109,22 @@ public function testDestroy()
 
         $session->write('session_id', 'session_data');
         $session->write('session_id', 'session_data');
-        $this->assertSame('session_data', $session->read('session_id'),
-                          'Active session returns session data.');
-
-        $this->assertTrue($session->destroy('session_id'),
-                          'Data was removed from the session.');
-
-        $this->assertSame('', $session->read('session_id'),
-                          'Destroyed session returns empty string.');
+        $this->assertSame(
+            'session_data',
+            $session->read('session_id'),
+                          'Active session returns session data.'
+        );
+
+        $this->assertTrue(
+            $session->destroy('session_id'),
+                          'Data was removed from the session.'
+        );
+
+        $this->assertSame(
+            '',
+            $session->read('session_id'),
+                          'Destroyed session returns empty string.'
+        );
     }
 
     public function testGarbageCollect()
@@ -117,8 +139,11 @@ public function testGarbageCollect()
         $sessionB->gc(null);
 
         $sessionC = $this->getSession($pool);
-        $this->assertSame('', $sessionC->read('session_id'),
-                          'Purged session returns empty string.');
+        $this->assertSame(
+            '',
+            $sessionC->read('session_id'),
+                          'Purged session returns empty string.'
+        );
     }
 
     protected function getSession($pool = null)

diff --git a/tests/Stash/Test/UtilitiesTest.php b/tests/Stash/Test/UtilitiesTest.php
@@ -18,7 +18,7 @@
  * @package Stash
  * @author  Robert Hafner <tedivm@tedivm.com>
  */
-class UtilitiesTest extends \PHPUnit_Framework_TestCase
+class UtilitiesTest extends \PHPUnit\Framework\TestCase
 {
     public function testEncoding()
     {