Merge branch 'release/4.1.6'

Author: mikaelcom

.github/workflows/release.yml

@@ -21,6 +21,9 @@ jobs:
       matrix:
         php-version:
           - 7.4
+          - 8.0
+          - 8.1
+          - 8.2
 
     steps:
       - name: Get convenient env variables
@@ -41,7 +44,9 @@ jobs:
         run: echo $GITHUB_REF_NAME_SLUG
 
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Get convenient Docker Meta
         id: docker_meta

.github/workflows/sonars.yml

@@ -0,0 +1,48 @@
+name: Sonars
+on:
+    push:
+        branches:
+            - develop
+            - feature/*
+            - feat/*
+            - release/*
+    pull_request:
+        types: [ opened, synchronize, reopened ]
+jobs:
+    sonarcloud:
+        name: Sonars
+        runs-on: ubuntu-latest
+        steps:
+            -   name: Checkout code
+                uses: actions/checkout@v3
+                with:
+                    fetch-depth: 0
+
+            -   name: Setup PHP with Xdebug
+                uses: shivammathur/setup-php@v2
+                with:
+                    php-version: 7.4
+                    coverage: xdebug
+
+            -   name: Install dependencies with composer
+                run: composer update --no-ansi --no-interaction --no-progress
+
+            -   name: Generate coverage report with phpunit
+                run: vendor/bin/phpunit --coverage-clover coverage.xml --log-junit report.xml
+
+            -   name: Monitor coverage
+                uses: slavcodev/coverage-monitor-action@v1
+                with:
+                    github_token: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
+                    coverage_path: coverage.xml
+                    threshold_alert: 95
+                    threshold_warning: 90
+
+            -   name: Fix phpunit files paths
+                run: sed -i 's@'$GITHUB_WORKSPACE/'@''@g' coverage.xml report.xml
+
+            -   name: SonarCloud Scan
+                uses: SonarSource/sonarcloud-github-action@master
+                env:
+                    GITHUB_TOKEN: ${{ secrets.ACTIONS_GITHUB_TOKEN }}
+                    SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.php-cs-fixer.php

@@ -9,5 +9,6 @@
     ->setUsingCache(false)
     ->setRules(array(
         '@PhpCsFixer' => true,
+        'phpdoc_separation' => false,
     ))
     ->setFinder($finder);

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 4.1.6 - 2023-02-20
+- issue #266, pr #270 - Usage of an undefined constant within a generate EnumType class #266
+- pr #267 - Remove deprecated message
+- issue #268, pr #271 - sequence Tag min/maxOccurs attribute is ignored
+- pr #269 - In method Utils::getStreamContextOptions function array_merge_recursive works not as expected
+- issue #272, pr #273 - Getter for a nullable-array-typed property is invalid
+- issue #274 - Improper validation of array #274
+
 ## 4.1.5 - 2022-03-11
 - issue #262 - Different destination dir when generating using 3.2.7 VS 4.1.1 ??
 

README.md

@@ -102,6 +102,8 @@ First released on 03 April 2021, maintained until version 6.0 is released. Pleas
 ### 3.0
 First released on 04 May 2018, maintained until version 5.0 is released. Please read the [UPGRADE-3.0](UPGRADE-3.0.md) note in order to acknowledge the main changes.
 
+**NOT MAINTAINED ANYMORE**: even if version 5 is not published nor is expected soon, maintaining 2 versions, especially for an old PHP version, is time consuming, sorry for the people who would be still using it which would encounter issues fixed in the latest version.
+
 ### 2.0
 **Not maintained since 03 April 2021.**
 
@@ -159,6 +161,7 @@ Developers who helped on this project are listed in the [composer.json](composer
 - [Jacob Dreesen](https://github.com/jdreesen)
 - [Clifford Vickrey](https://github.com/cliffordvickrey)
 - [Arnaud POINTET](https://github.com/Oipnet)
+- [dypa](https://github.com/dypa)
 
 ## FAQ
 

composer.json

@@ -83,6 +83,10 @@
         {
             "name": "Arnaud POINTET",
             "role": "Contributor"
+        },
+        {
+            "name": "dypa",
+            "role": "Contributor"
         }
     ],
     "support" : {
@@ -103,10 +107,10 @@
         "wsdltophp/wsdlhandler": "^1.0"
     },
     "scripts": {
-        "test": "vendor/bin/phpunit",
-        "lint": "vendor/bin/php-cs-fixer fix --ansi --diff --verbose",
-        "build": "box build --verbose",
-        "phpstan": "vendor/bin/phpstan analyze src --level=2"
+        "test": "php-7.4 vendor/bin/phpunit",
+        "lint": "php-7.4 vendor/bin/php-cs-fixer fix --ansi --diff --verbose",
+        "build": "php-7.4 box build --verbose",
+        "phpstan": "php-7.4 vendor/bin/phpstan analyze src --level=2"
     },
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.0",

phpstan.neon.dist

@@ -0,0 +1,7 @@
+sonar.projectKey=WsdlToPhp_PackageGenerator
+sonar.organization=wsdltophp
+sonar.php.coverage.reportPaths=coverage.xml
+sonar.php.tests.reportPath=report.xml
+
+sonar.sources=src/
+sonar.tests=tests/

sonar-project.properties

@@ -17,7 +17,7 @@ abstract class AbstractCommand extends Command
 
     protected OutputInterface $output;
 
-    protected function configure()
+    protected function configure(): void
     {
         $this->addOption(
             'force',

src/Command/AbstractCommand.php

@@ -4,7 +4,6 @@
 
 namespace WsdlToPhp\PackageGenerator\Command;
 
-use DateTime;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -276,7 +275,7 @@ protected function configure(): void
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
         parent::execute($input, $output);
-        $start = new DateTime();
+        $start = new \DateTime();
         $this->writeLn(sprintf(' Start at %s', $start->format('Y-m-d H:i:s')));
         $this->initGeneratorOptions();
         if ($this->canExecute()) {
@@ -287,7 +286,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $this->writeLn("  Used generator's options:");
             $this->writeLn('    '.implode(PHP_EOL.'    ', $this->formatArrayForConsole($this->generatorOptions->toArray())));
         }
-        $end = new DateTime();
+        $end = new \DateTime();
         $this->writeLn(sprintf(' End at %s, duration: %s', $end->format('Y-m-d H:i:s'), $start->diff($end)->format('%H:%I:%S')));
 
         return self::EXIT_OK;