bumping travis php versions, composer deps

diablomedia · Mar 1, 2019 · 6f43d9f · 6f43d9f
1 parent 25f345a
commit 6f43d9f
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 59 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,21 +2,17 @@ language: php
 
 sudo: false
 
-php:
-  - 7
-  - 7.1
-  - 7.2
-  - nightly
-
-env: TMPDIR=/tmp USE_XDEBUG=false
+env:
+  global:
+    - COMPOSER_ARGS="" TMPDIR=/tmp USE_XDEBUG=false
 
 branches:
   only:
     master
 
 install:
   - phpenv rehash
-  - travis_retry composer install --no-interaction --prefer-source
+  - travis_retry composer update --no-interaction --prefer-source $COMPOSER_ARGS
 
 stages:
   - test
@@ -33,20 +29,39 @@ script:
 jobs:
   fast_finish: true
   allow_failures:
+    - php: 7.4snapshot
     - php: nightly
   include:
+    - php: 7.1
+      env: COMPOSER_ARGS="--prefer-lowest"
+    - php: 7.1
+    - php: 7.2
+      env: COMPOSER_ARGS="--prefer-lowest"
+    - php: 7.2
+    - php: 7.3
+      env: COMPOSER_ARGS="--prefer-lowest"
+    - php: 7.3
+    - php: 7.4snapshot
+      env: COMPOSER_ARGS="--ignore-platform-reqs --prefer-lowest"
+    - php: 7.4snapshot
+      env: COMPOSER_ARGS="--ignore-platform-reqs"
+    - php: nightly
+      env: COMPOSER_ARGS="--ignore-platform-reqs --prefer-lowest"
+    - php: nightly
+      env: COMPOSER_ARGS="--ignore-platform-reqs"
+
     - stage: style check
-      php: 7.1
+      php: 7.2
       env: TMPDIR=/tmp USE_XDEBUG=false
       script:
         - composer style-check
     - stage: phpstan analysis
-      php: 7.1
+      php: 7.2
       env: TMPDIR=/tmp USE_XDEBUG=false
       script:
         - composer phpstan
     - stage: test with coverage
-      php: 7.1
+      php: 7.2
       env: TMPDIR=/tmp USE_XDEBUG=true CC_TEST_REPORTER_ID=40595993c5ec636e3100589a57536b40c7ef67c279ce5150472f92b4020b5284
       before_script:
         - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter

diff --git a/composer.json b/composer.json
@@ -32,10 +32,10 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0",
-        "phpstan/phpstan": "^0.9.2",
+        "phpunit/phpunit": "^7.0",
+        "phpstan/phpstan": "^0.11.2",
         "friendsofphp/php-cs-fixer": "^2.11",
-        "maglnet/composer-require-checker": "^0.1.6 | ^0.2.1",
+        "maglnet/composer-require-checker": "^1.1.0",
         "phpro/grumphp": "^0.14.0"
     },
     "archive": {
@@ -44,7 +44,7 @@
     "scripts": {
         "test": "phpunit",
         "test-with-coverage": "phpunit --coverage-clover=clover.xml",
-        "phpstan": "phpstan analyze -l1 -c phpstan.neon --no-progress ./ --ansi",
+        "phpstan": "phpstan analyze -c phpstan.neon --no-progress --ansi",
         "style-check": "php-cs-fixer fix --dry-run -vv"
     }
 }
diff --git a/grumphp.yml.dist b/grumphp.yml.dist
@@ -8,7 +8,6 @@ parameters:
             allow_risky: true
             config: .php_cs
         phpstan:
-            level: 1
             configuration: phpstan.neon
         phpunit:
             metadata:

diff --git a/phpstan.neon b/phpstan.neon
@@ -1,4 +1,7 @@
 parameters:
+    level: 1
+    paths:
+        - ./
     excludes_analyse:
         - %rootDir%/../../../vendor/*
         - %rootDir%/../../../tests/*

diff --git a/src/Zend/Soap/Client.php b/src/Zend/Soap/Client.php
@@ -1121,10 +1121,10 @@ public function __call($name, $arguments)
         $soapHeaders = array_merge($this->_permanentSoapInputHeaders, $this->_soapInputHeaders);
         $result      = $soapClient->__soapCall(
             $name,
-                                                 $this->_preProcessArguments($arguments),
-                                                 null, /* Options are already set to the SOAP client object */
+            $this->_preProcessArguments($arguments),
+            null, /* Options are already set to the SOAP client object */
                                                  (count($soapHeaders) > 0)? $soapHeaders : null,
-                                                 $this->_soapOutputHeaders
+            $this->_soapOutputHeaders
         );
 
         // Reset non-permanent input headers

diff --git a/tests/Zend/Soap/AutoDiscover/OnlineTest.php b/tests/Zend/Soap/AutoDiscover/OnlineTest.php
@@ -54,9 +54,9 @@ public function testNestedObjectArrayResponse()
         $ret    = $client->request($b);
 
         $this->assertInternalType('array', $ret);
-        $this->assertEquals(1, count($ret));
+        $this->assertCount(1, $ret);
         $this->assertInternalType('array', $ret[0]->baz);
-        $this->assertEquals(3, count($ret[0]->baz));
+        $this->assertCount(3, $ret[0]->baz);
 
         $baz = $ret[0]->baz;
         $this->assertEquals('bar', $baz[0]->bar);

diff --git a/tests/Zend/Soap/ClientTest.php b/tests/Zend/Soap/ClientTest.php
@@ -294,7 +294,7 @@ public function testGetTypes()
     {
         // Remove the following line when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 

diff --git a/tests/Zend/Soap/ServerTest.php b/tests/Zend/Soap/ServerTest.php
@@ -697,8 +697,8 @@ public function testHandle()
 
         $localClient = new Zend_Soap_Server_TestLocalSoapClient(
             $server,
-                                                                null,
-                                                                array('location' => 'test://',
+            null,
+            array('location'                                                     => 'test://',
                                                                       'uri'      => 'http://framework.zend.com')
         );
 
@@ -851,7 +851,7 @@ public function testHandlePhpErrors()
 
         // Remove the following line when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 

diff --git a/tests/Zend/Soap/WsdlTest.php b/tests/Zend/Soap/WsdlTest.php
@@ -47,7 +47,7 @@ public function testConstructor()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                  . 'xmlns:tns="http://localhost/MyService.php" '
                                  . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -65,7 +65,7 @@ public function testSetUriChangesDomDocumentWsdlStructureTnsAndTargetNamespaceAt
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                  . 'xmlns:tns="http://localhost/MyNewService.php" '
                                  . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -89,7 +89,7 @@ public function testAddMessage()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -114,7 +114,7 @@ public function testAddPortType()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -139,7 +139,7 @@ public function testAddPortOperation()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -172,7 +172,7 @@ public function testAddBinding()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -196,21 +196,21 @@ public function testAddBindingOperation()
         $wsdl->addBindingOperation($binding, 'operation1');
         $wsdl->addBindingOperation(
             $binding,
-                                   'operation2',
-                                   array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
-                                   array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
+            'operation2',
+            array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
+            array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
                                   );
         $wsdl->addBindingOperation(
             $binding,
-                                   'operation3',
-                                   array('use'  => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
-                                   array('use'  => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
-                                   array('name' => 'MyFault', 'use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
+            'operation3',
+            array('use'  => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
+            array('use'  => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
+            array('name' => 'MyFault', 'use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
                                    );
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -257,14 +257,14 @@ public function testAddSoapBinding()
         $wsdl->addBindingOperation($binding, 'operation1');
         $wsdl->addBindingOperation(
             $binding,
-                                   'operation2',
-                                   array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
-                                   array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
+            'operation2',
+            array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
+            array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
                                   );
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -298,14 +298,14 @@ public function testAddSoapBinding()
         $wsdl1->addBindingOperation($binding, 'operation1');
         $wsdl1->addBindingOperation(
             $binding,
-                                   'operation2',
-                                   array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
-                                   array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
+            'operation2',
+            array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
+            array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
                                   );
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl1->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -343,14 +343,14 @@ public function testAddSoapOperation()
         $wsdl->addBindingOperation($binding, 'operation1');
         $wsdl->addBindingOperation(
             $binding,
-                                   'operation2',
-                                   array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
-                                   array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
+            'operation2',
+            array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/'),
+            array('use' => 'encoded', 'encodingStyle' => 'http://schemas.xmlsoap.org/soap/encoding/')
                                   );
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -386,7 +386,7 @@ public function testAddService()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -415,7 +415,7 @@ public function testAddDocumentation()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -468,7 +468,7 @@ public function testToXml()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -488,7 +488,7 @@ public function testToDomDocument()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($dom->saveXML()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -509,7 +509,7 @@ public function testDump()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdlDump),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -524,7 +524,7 @@ public function testDump()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($dumpedContent),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '
@@ -597,7 +597,7 @@ public function testAddingSameComplexTypeMoreThanOnceIsIgnored()
             $wsdl->addType('Zend_Soap_Wsdl_Test');
             $wsdl->addType('Zend_Soap_Wsdl_Test');
             $types = $wsdl->getTypes();
-            $this->assertEquals(1, count($types));
+            $this->assertCount(1, $types);
             $this->assertEquals(array('Zend_Soap_Wsdl_Test'), $types);
         } catch (Zend_Soap_Wsdl_Exception $e) {
             $this->fail();
@@ -622,7 +622,7 @@ public function testAddComplexType()
 
         $this->assertEquals(
             $this->sanitizeWsdlXmlOutputForOsCompability($wsdl->toXml()),
-                            '<?xml version="1.0"?>' .
+            '<?xml version="1.0"?>' .
                             '<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" '
                                . 'xmlns:tns="http://localhost/MyService.php" '
                                . 'xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" '