Merge pull request #71 from WarriorXK/hotfix/3.1.3

Hotfix/3.1.3
WarriorXK · Jun 29, 2023 · 30c4f62 · 30c4f62
2 parents 11ac852 + 6a6bca4
commit 30c4f62
Show file tree

Hide file tree

Showing 16 changed files with 469 additions and 692 deletions.
diff --git a/.github/workflows/Main.yaml b/.github/workflows/Main.yaml
@@ -0,0 +1,60 @@
+name: PHPUnit
+on: [push]
+jobs:
+  PHPUnit-Autobahn:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        php_version: [ 7.4, 8.0, 8.1, 8.2 ]
+        buffer_type: [ memory, tmpfile ]
+        test: [ tests/ClientTest.php, tests/ServerTest.php ]
+    steps:
+      # Install PHP
+      - name: Setup PHP with PECL extension
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: pcntl
+      # Clone code
+      - uses: actions/checkout@v3
+      # Composer install
+      - uses: php-actions/composer@v6
+        with:
+          args: --ignore-platform-reqs
+      # Prepare the environment
+      - name: Disable xdebug
+        run: phpenv config-rm xdebug.ini || true
+      - name: Add docker GPG key to apt
+        run: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+      - name: Add docker apt repo
+        run: echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+      - name: Apt update
+        run: sudo apt-get update
+      - name: Install docker
+        run: sudo apt install docker-ce
+      # Run PHPUnit
+      - name: PHPUnit
+        run: ./vendor/bin/phpunit ${{ matrix.test }}
+        env:
+          BUFFERTYPE: ${{ matrix.buffer_type }}
+  PHPUnit-Other:
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        php_version: [ 7.4, 8.0, 8.1, 8.2 ]
+    steps:
+      # Install PHP
+      - name: Setup PHP with PECL extension
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+          extensions: pcntl
+      # Clone code
+      - uses: actions/checkout@v3
+      # Composer install
+      - uses: php-actions/composer@v6
+        with:
+          args: --ignore-platform-reqs
+      # Run PHPUnit
+      - name: PHPUnit
+        run: ./vendor/bin/phpunit ${{ matrix.test }}
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-# Created by https://www.toptal.com/developers/gitignore/api/phpstorm,composer,macos,windows
-# Edit at https://www.toptal.com/developers/gitignore?templates=phpstorm,composer,macos,windows
+# Created by https://www.toptal.com/developers/gitignore/api/macos,windows,composer,phpstorm,phpunit
+# Edit at https://www.toptal.com/developers/gitignore?templates=macos,windows,composer,phpstorm,phpunit
 
 ### Composer ###
 composer.phar
@@ -18,6 +18,7 @@ composer.phar
 # Icon must end with two \r
 Icon
 
+
 # Thumbnails
 ._*
 
@@ -37,6 +38,10 @@ Network Trash Folder
 Temporary Items
 .apdisk
 
+### macOS Patch ###
+# iCloud generated files
+*.icloud
+
 ### PhpStorm ###
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
@@ -48,6 +53,9 @@ Temporary Items
 .idea/**/dictionaries
 .idea/**/shelf
 
+# AWS User-specific
+.idea/**/aws.xml
+
 # Generated files
 .idea/**/contentModel.xml
 
@@ -98,6 +106,9 @@ atlassian-ide-plugin.xml
 # Cursive Clojure plugin
 .idea/replstate.xml
 
+# SonarLint plugin
+.idea/sonarlint/
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
@@ -140,6 +151,25 @@ fabric.properties
 # https://plugins.jetbrains.com/plugin/12206-codestream
 .idea/codestream.xml
 
+# Azure Toolkit for IntelliJ plugin
+# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
+.idea/**/azureSettings.xml
+
+### PHPUnit ###
+# Covers PHPUnit
+# Reference: https://phpunit.de/
+
+# Generated files
+.phpunit.result.cache
+.phpunit.cache
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Build data
+/build/
+
 ### Windows ###
 # Windows thumbnail cache files
 Thumbs.db
@@ -166,4 +196,4 @@ $RECYCLE.BIN/
 # Windows shortcuts
 *.lnk
 
-# End of https://www.toptal.com/developers/gitignore/api/phpstorm,composer,macos,windows
+# End of https://www.toptal.com/developers/gitignore/api/macos,windows,composer,phpstorm,phpunit
diff --git a/.styleci.yml b/.styleci.yml
diff --git a/.travis.yml b/.travis.yml
diff --git a/Resources/Autobahn/fuzzingclient.json b/Resources/Autobahn/fuzzingclient.json
@@ -1,8 +1,8 @@
 {
-    "outdir": "/tmp/reports/",
+    "outdir": "/reports/",
     "servers": [
         {
-            "url": "ws://127.0.0.1:9001"
+            "url": "ws://host.docker.internal:9001"
         }
     ],
     "cases": ["*"],

diff --git a/Resources/Autobahn/fuzzingserver.json b/Resources/Autobahn/fuzzingserver.json
@@ -1,6 +1,6 @@
 {
    "url": "ws://127.0.0.1:9001",
-   "outdir": "/tmp/reports/",
+   "outdir": "/reports/",
    "cases": ["*"],
    "exclude-cases": [],
    "exclude-agent-cases": {}

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.2
+3.1.3
diff --git a/composer.json b/composer.json
@@ -14,12 +14,12 @@
         }
     ],
     "require-dev": {
-        "phpunit/phpunit": "^9.3",
+        "phpunit/phpunit": "^9.6",
         "ext-pcntl": "*",
         "ext-json": "*"
     },
     "require": {
-        "php": "^7.3.0 || ^8.0.0",
+        "php": "^7.4.0 || ^8.0.0",
         "ext-sockets": "*",
         "psr/log": "^1.0"
     },
@@ -45,5 +45,10 @@
     "non-feature-branches": [
         "develop",
         "master"
-    ]
+    ],
+    "config": {
+        "platform": {
+            "php": "7.4"
+        }
+    }
 }