Merge pull request #104 from basz/test-latest-php-versions

Run tests for php 7.2 and 7.3

Author: svycka

.travis.yml

@@ -22,11 +22,25 @@ matrix:
     - php: 7.1
       env:
         - DEPENDENCIES="--prefer-stable"
-        - TEST_COVERAGE=true
     - php: 7.1
       env:
         - DEPENDENCIES="--prefer-lowest --prefer-stable"
 
+    - php: 7.2
+      env:
+        - DEPENDENCIES="--prefer-stable"
+    - php: 7.2
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+
+    - php: 7.3
+      env:
+        - DEPENDENCIES="--prefer-stable"
+        - TEST_COVERAGE=true
+    - php: 7.3
+      env:
+        - DEPENDENCIES="--prefer-lowest --prefer-stable"
+
 
 before_script:
   - phpenv config-rm xdebug.ini

composer.json

@@ -25,12 +25,12 @@
         "zendframework/zend-modulemanager": "^2.8.2",
         "zendframework/zend-router": "^3.0",
         "zendframework/zend-servicemanager": "^3.2",
-        "zendframework/zend-stdlib": "^3.1",
+        "zendframework/zend-stdlib": "^3.2.1",
         "zendframework/zend-view": "^2.9.0"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^2.8.1",
-        "phpunit/phpunit": "^4.8.36",
+        "phpunit/phpunit": "^5.7.27",
         "satooshi/php-coveralls": "^1.0.2",
         "zendframework/zend-console": "^2.6",
         "zendframework/zend-mvc": "^3.1",

phpunit.xml.dist

@@ -4,4 +4,10 @@
     <testsuite name="SlmLocale">
         <directory>./tests</directory>
     </testsuite>
+
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
 </phpunit>

tests/SlmLocaleTest/Locale/DetectorTest.php

@@ -202,8 +202,8 @@ public function testEmptyMappingsListIndicatesNoMappingsList()
     public function testStrategyAttachesToEventManager()
     {
         $detector = new Detector();
-        $events   = $this->getMock(EventManager::class);
-        $strategy = $this->getMock(StrategyInterface::class);
+        $events   = $this->createMock(EventManager::class);
+        $strategy = $this->createMock(StrategyInterface::class);
         $strategy->expects($this->once())
             ->method('attach')
             ->with($events);
@@ -217,12 +217,18 @@ public function testStrategyWithHighestPriorityWins()
         $detector  = new Detector();
         $this->setEventManager($detector);
 
-        $strategy1 = $this->getMock(AbstractStrategy::class, ['detect']);
+        $strategy1 = $this
+            ->getMockBuilder(AbstractStrategy::class)
+            ->setMethods(['detect'])
+            ->getMock();
         $strategy1->expects($this->once())
                   ->method('detect')
                   ->will($this->returnValue('Foo'));
 
-        $strategy2 = $this->getMock(AbstractStrategy::class, ['detect']);
+        $strategy2 = $this
+            ->getMockBuilder(AbstractStrategy::class)
+            ->setMethods(['detect'])
+            ->getMock();
         $strategy2->expects($this->never())
                   ->method('detect');
 

tests/SlmLocaleTest/Service/DetectFactoryTest.php

@@ -125,7 +125,7 @@ public function testUseServiceLocatorToInstantiateStrategy()
         $plugins->setFactory('TestStrategy', function () use ($self, &$called) {
             $called = true;
 
-            return $self->getMock(StrategyInterface::class);
+            return $self->createMock(StrategyInterface::class);
         });
 
         $detector = $sl->get(Detector::class);
@@ -144,14 +144,14 @@ public function testConfigurationCanHoldMultipleStrategies()
         $plugins->setFactory('TestStrategy1', function () use ($self, &$called1) {
             $called1 = true;
 
-            return $self->getMock(StrategyInterface::class);
+            return $self->createMock(StrategyInterface::class);
         });
 
         $called2 = false;
         $plugins->setFactory('TestStrategy2', function () use ($self, &$called2) {
             $called2 = true;
 
-            return $self->getMock(StrategyInterface::class);
+            return $self->createMock(StrategyInterface::class);
         });
 
         $detector = $sl->get(Detector::class);
@@ -173,7 +173,7 @@ public function testStrategyConfigurationCanBeAnArray()
         $plugins->setFactory('TestStrategy', function () use ($self, &$called) {
             $called = true;
 
-            return $self->getMock(StrategyInterface::class);
+            return $self->createMock(StrategyInterface::class);
         });
 
         $detector = $sl->get(Detector::class);
@@ -189,7 +189,7 @@ public function testStrategyCanBeAttachedWithPriorities()
         ]);
         $em = $sl->get('EventManager');
 
-        $strategy = $this->getMock(StrategyInterface::class, ['attach', 'detach']);
+        $strategy = $this->createMock(StrategyInterface::class, ['attach', 'detach']);
         $strategy->expects($this->once())
                  ->method('attach')
                  ->with($em, 100);
@@ -206,7 +206,10 @@ public function testStrategyCanBeInstantiatedWithOptions()
                 ['name' => 'TestStrategy', 'options' => 'Foo'],
             ],
         ]);
-        $strategy = $this->getMock(StrategyInterface::class, ['attach', 'detach', 'setOptions']);
+
+        $strategy = $this->getMockBuilder(StrategyInterface::class)
+            ->setMethods(['attach', 'detach', 'setOptions'])
+            ->getMock();
         $strategy->expects($this->once())
                  ->method('setOptions')
                  ->with('Foo');