MINT-5942: Upgrade BeSimpleSoap bundle to use PHP 8.1

.github/workflows/github-actions.yml

@@ -0,0 +1,64 @@
+name: Workflow
+on: [push]
+jobs:
+  php_8_job:
+    runs-on: '${{ matrix.os }}'
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['8.0','8.1']
+        include:
+          - os: ubuntu-18.04
+            SYMFONY_VERSION: 6.0.*
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: intl #optional
+          ini-values: "post_max_size=256M" #optional
+      - name: Check PHP Version
+        run: php -v
+      - run: sudo composer self-update
+      - run: >-
+          composer require symfony/framework-bundle:${SYMFONY_VERSION}
+          --no-update
+        env:
+          SYMFONY_VERSION: '${{ matrix.SYMFONY_VERSION }}'
+      - run: composer install --prefer-dist --no-interaction
+      - run: ./src/BeSimple/SoapClient/Tests/bin/phpwebserver.sh
+      - run: ./src/BeSimple/SoapClient/Tests/bin/axis.sh
+      - run: bin/simple-phpunit --debug
+
+  php_7_2_and_7_3_and_7_4_job:
+    runs-on: '${{ matrix.os }}'
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+        php-versions: ['7.2','7.3','7.4']
+        include:
+          - os: ubuntu-18.04
+            SYMFONY_VERSION: 3.4.*
+          - os: ubuntu-18.04
+            SYMFONY_VERSION: 5.4.*
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: intl #optional
+          ini-values: "post_max_size=256M" #optional
+      - name: Check PHP Version
+        run: php -v
+      - run: sudo composer self-update
+      - run: >-
+          composer require symfony/framework-bundle:${SYMFONY_VERSION}
+          --no-update
+        env:
+          SYMFONY_VERSION: '${{ matrix.SYMFONY_VERSION }}'
+      - run: composer install --prefer-dist --no-interaction
+      - run: ./src/BeSimple/SoapClient/Tests/bin/phpwebserver.sh
+      - run: ./src/BeSimple/SoapClient/Tests/bin/axis.sh
+      - run: bin/simple-phpunit

Dockerfile

@@ -1,11 +1,26 @@
-FROM composer:1 AS composer
+FROM composer:2 AS composer
 
-FROM php:7.0-fpm
+FROM php:8.1.0-fpm
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 
 #Installing and enabling features and PHP extension needed
 RUN apt-get update -y \
   && apt-get install -y libxml2-dev git unzip \
   && apt-get clean -y \
-  && docker-php-ext-install soap
+  && docker-php-ext-install soap
+
+RUN apt-get update && \
+    apt-get install -y openjdk-11-jdk && \
+    apt-get install -y ant && \
+    apt-get clean;
+
+# Fix certificate issues
+RUN apt-get update && \
+    apt-get install ca-certificates-java && \
+    apt-get clean && \
+    update-ca-certificates -f;
+
+# Setup JAVA_HOME -- useful for docker commandline
+ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-amd64/
+RUN export JAVA_HOME

Makefile

@@ -9,6 +9,7 @@ QA        		= docker run -it --rm -v `pwd`:/project mykiwi/phaudit:7.2
 ## -------
 ##
 
+
 kill:
 	$(DOCKER_COMPOSE) kill
 	$(DOCKER_COMPOSE) down --volumes --remove-orphans
@@ -25,6 +26,8 @@ composer-install: ## Execute composer instalation
 	$(COMPOSER) install --prefer-dist
 
 test: composer-install ## Execute composer instalation
+	$(RUN) ./src/BeSimple/SoapClient/Tests/bin/phpwebserver.sh
+	$(RUN) ./src/BeSimple/SoapClient/Tests/bin/axislocal.sh
 	$(RUN) bin/simple-phpunit
 
 composer-update: ## Execute package update

composer.json

@@ -20,15 +20,15 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=7.0 || >=8.0",
         "ext-soap": "*",
         "ext-curl": "*",
         "ass/xmlsecurity": "~1.0",
-        "symfony/framework-bundle": "~2.6 || ~3.4",
-        "symfony/twig-bundle": "~2.6 || ~3.4",
-        "zendframework/zend-mime": "2.*",
-        "zendframework/zend-serializer": "^2.9",
-        "zendframework/zend-servicemanager": "^3.3"
+        "symfony/framework-bundle": "^3.4 || ~5.4 || ~6.0",
+        "symfony/twig-bundle": "^3.4 || ~5.4 || ~6.0",
+        "laminas/laminas-servicemanager": "^3.4",
+        "jms/serializer": "^2.0 || ^3.0",
+        "laminas/laminas-mime": "^2.7"
     },
     "replace": {
         "besimple/soap-bundle": "self.version",
@@ -39,8 +39,8 @@
     },
     "require-dev": {
         "mikey179/vfsstream": "~1.0",
-        "symfony/filesystem": "~2.3",
-        "symfony/process": "~2.3",
+        "symfony/filesystem": "^3.4 || ~5.4 || ~6.0",
+        "symfony/process": "^3.4 || ~5.4 || ~6.0",
         "symfony/phpunit-bridge": "*"
     },
     "autoload": {

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     image: smartbox/besimplesoap
     container_name: sbx_besimplesoap
     environment:
-      SYMFONY_PHPUNIT_VERSION: '6.5'
+      SYMFONY_PHPUNIT_VERSION: '9.5'
       COMPOSER_ALLOW_SUPERUSER: 1
     working_dir: /var/www/html
     volumes:

src/BeSimple/SoapClient/SoapClient.php

@@ -238,7 +238,7 @@ protected function __doHttpRequest(SoapRequest $soapRequest)
      *
      * @return string
      */
-    public function __doRequest($request, $location, $action, $version, $oneWay = 0)
+    public function __doRequest($request, $location, $action, $version, $oneWay = 0): ?string
     {
         // wrap request data in SoapRequest object
         $soapRequest = SoapRequest::create($request, $location, $action, $version);
@@ -307,7 +307,7 @@ protected function filterRequestOptions(SoapRequest $soapRequest)
      *
      * @return string
      */
-    public function __getLastRequestHeaders()
+    public function __getLastRequestHeaders(): ?string
     {
         return $this->lastRequestHeaders;
     }
@@ -327,7 +327,7 @@ public function __getRequestHeaders()
      *
      * @return string
      */
-    public function __getLastRequest()
+    public function __getLastRequest(): ?string
     {
         return $this->lastRequest;
     }
@@ -347,7 +347,7 @@ public function __getLastRequestUri()
      *
      * @return string
      */
-    public function __getLastResponseHeaders()
+    public function __getLastResponseHeaders(): ?string
     {
         return $this->lastResponseHeaders;
     }
@@ -357,7 +357,7 @@ public function __getLastResponseHeaders()
      *
      * @return string
      */
-    public function __getLastResponse()
+    public function __getLastResponse(): ?string
     {
         return $this->lastResponse;
     }

src/BeSimple/SoapClient/Tests/AbstractWebserverTest.php → src/BeSimple/SoapClient/Tests/AbstractWebServerTest.php

@@ -20,9 +20,6 @@
  */
 abstract class AbstractWebServerTest extends \PHPUnit\Framework\TestCase
 {
-    // when using the SetUpTearDownTrait, methods like doSetup() can
-    // be defined with and without the 'void' return type, as you wish
-    use \Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
     /**
      * @var ProcessBuilder
@@ -32,10 +29,6 @@ abstract class AbstractWebServerTest extends \PHPUnit\Framework\TestCase
 
     public static function doSetUpBeforeClass()
     {
-        if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-            self::markTestSkipped('PHP Webserver is available from PHP 5.4');
-        }
-
         $phpFinder = new PhpExecutableFinder();
         self::$webserver = ProcessBuilder::create(array(
             'exec', // used exec binary (https://github.com/symfony/symfony/issues/5759)

src/BeSimple/SoapClient/Tests/AxisInterop/TestCase.php

@@ -4,11 +4,8 @@
 
 class TestCase extends \PHPUnit\Framework\TestCase
 {
-    // when using the SetUpTearDownTrait, methods like doSetup() can
-    // be defined with and without the 'void' return type, as you wish
-    use \Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
-    protected function doSetUp()
+    protected function setUp(): void
     {
         $ch = curl_init('http://localhost:8080/');
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);

src/BeSimple/SoapClient/Tests/CurlTest.php

@@ -17,7 +17,7 @@
 /**
  * @author Andreas Schamberger <mail@andreass.net>
  */
-class CurlTest extends AbstractWebserverTest
+class CurlTest extends AbstractWebServerTest
 {
     public function testExec()
     {
@@ -37,13 +37,13 @@ public function testGetErrorMessage()
         ));
 
         $curl->exec('http://unknown/curl.txt');
-        $this->assertRegExp('/^Could not connect to host.*$/', $curl->getErrorMessage());
+        $this->assertMatchesRegularExpression('/^Could not connect to host.*$/', $curl->getErrorMessage());
 
         $curl->exec(sprintf('xyz://localhost:%d/@404.txt', WEBSERVER_PORT));
-        $this->assertRegExp('/^Unknown protocol. Only http and https are allowed.*$/', $curl->getErrorMessage());
+        $this->assertMatchesRegularExpression('/^Unknown protocol. Only http and https are allowed.*$/', $curl->getErrorMessage());
 
         $curl->exec('');
-        $this->assertRegExp('/^Unable to parse URL.*$/', $curl->getErrorMessage());
+        $this->assertMatchesRegularExpression('/^Unable to parse URL.*$/', $curl->getErrorMessage());
     }
 
     public function testGetRequestHeaders()
@@ -65,7 +65,8 @@ public function testGetResponse()
             'proxy_host' => false,
         ));
 
-        $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT));
+        $responseSuccess = $curl->exec(sprintf('http://localhost:%d/curl.txt', WEBSERVER_PORT));
+        $this->assertTrue($responseSuccess);
         $this->assertSame('OK', $curl->getResponseStatusMessage());
         // Adjust for PHP >= 7.2 sending a Date header
         $response = $curl->getResponse();

src/BeSimple/SoapClient/Tests/ServerInterop/TestCase.php

@@ -4,18 +4,9 @@
 
 class TestCase extends \PHPUnit\Framework\TestCase
 {
-    // when using the SetUpTearDownTrait, methods like doSetup() can
-    // be defined with and without the 'void' return type, as you wish
-    use \Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
-    protected function doSetUp()
+    protected function setUp(): void
     {
-        if (version_compare(PHP_VERSION, '5.3.0', '=')) {
-            $this->markTestSkipped(
-                'The PHP cli webserver is not available with PHP 5.3.'
-            );
-        }
-
         $ch = curl_init('http://localhost:8081/');
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
         curl_setopt($ch, CURLOPT_HEADER, true);

src/BeSimple/SoapClient/Tests/SoapClientTest.php

@@ -50,7 +50,7 @@ public function testSoapFaultWhenPassingInvalidWSDLs($wsdl)
         }
 
         $this->assertInstanceOf('SoapFault', $soapFault, 'Invalid type of exception');
-        $this->assertRegExp('/SOAP-ERROR: Parsing WSDL: .*/', $soapFault->getMessage(), 'Invalid or incorrect exception message');
+        $this->assertMatchesRegularExpression('/SOAP-ERROR: Parsing WSDL: .*/', $soapFault->getMessage(), 'Invalid or incorrect exception message');
         $this->assertStringContainsString('WSDL', $soapFault->faultcode, 'Invalid type of faultcode');
     }
 

src/BeSimple/SoapClient/Tests/WsdlDownloaderTest.php

@@ -23,11 +23,8 @@
  * @author Andreas Schamberger <mail@andreass.net>
  * @author Francis Besset <francis.bessset@gmail.com>
  */
-class WsdlDownloaderTest extends AbstractWebserverTest
+class WsdlDownloaderTest extends AbstractWebServerTest
 {
-    // when using the SetUpTearDownTrait, methods like doSetup() can
-    // be defined with and without the 'void' return type, as you wish
-    use \Symfony\Bridge\PhpUnit\SetUpTearDownTrait;
 
     protected static $filesystem;
 
@@ -57,7 +54,7 @@ public function testDownloadDownloadsToVfs($source, $regexp, $nbDownloads)
 
         //Test that the Cache filename is valid
         $regexp = '#'.sprintf($regexp, $cacheDirForRegExp).'#';
-        $this->assertRegExp($regexp, $cacheFileName);
+        $this->assertMatchesRegularExpression($regexp, $cacheFileName);
 
     }
 
@@ -137,7 +134,7 @@ public function testResolveWsdlIncludes($source, $cacheFile, $remoteParentUrl, $
         $m->invoke($wsdlDownloader, file_get_contents($source), $cacheFile, $remoteParentUrl);
         $this->assertCount($nbDownloads, $wsdlCacheDir->getChildren());
 
-        $this->assertRegExp('#'.sprintf($regexp, $cacheDirForRegExp).'#', file_get_contents($cacheFile));
+        $this->assertMatchesRegularExpression('#'.sprintf($regexp, $cacheDirForRegExp).'#', file_get_contents($cacheFile));
     }
 
     public function provideResolveWsdlIncludes()
@@ -204,7 +201,7 @@ public function testResolveXsdIncludes($source, $cacheFile, $remoteParentUrl, $r
         $m->invoke($wsdlDownloader, file_get_contents($source), $cacheFile, $remoteParentUrl);
         $this->assertCount($nbDownloads, $wsdlCacheDir->getChildren());
 
-        $this->assertRegExp('#'.sprintf($regexp, $cacheDirForRegExp).'#', file_get_contents($cacheFile));
+        $this->assertMatchesRegularExpression('#'.sprintf($regexp, $cacheDirForRegExp).'#', file_get_contents($cacheFile));
     }
 
     public function provideResolveXsdIncludes()
@@ -330,7 +327,7 @@ public function testValidResponseCode()
 
         $result = $wsdlDownloader->download('http://somefake.url/wsdl');
 
-        $this->assertRegExp('/.*wsdl_[a-f0-9]{32}\.cache/', $result);
+        $this->assertMatchesRegularExpression('/.*wsdl_[a-f0-9]{32}\.cache/', $result);
     }
 
     public static function doSetUpBeforeClass()