Merge branch 'master' into chore/update-license

.github/CODEOWNERS

@@ -1,3 +1,2 @@
-*         @seba-aln @MikeDobrzan @marcin-cebo @mohitpubnub
-.github/* @parfeon @seba-aln @MikeDobrzan @marcin-cebo @mohitpubnub
-README.md @techwritermat @kazydek
+*         @seba-aln @xavrax @marcin-cebo
+README.md @techwritermat @kazydek @seba-aln @xavrax

.github/workflows/commands-handler.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - name: Check referred user
         id: user-check
-        env: 
+        env:
           CLEN_BOT: ${{ secrets.CLEN_BOT }}
         run: echo "expected-user=${{ startsWith(github.event.comment.body, format('@{0} ', env.CLEN_BOT)) }}" >> $GITHUB_OUTPUT
       - name: Regular comment
@@ -25,7 +25,7 @@ jobs:
         if: steps.user-check.outputs.expected-user == 'true'
         uses: actions/checkout@v3
         with:
-           token: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GH_TOKEN }}
       - name: Checkout release actions
         if: steps.user-check.outputs.expected-user == 'true'
         uses: actions/checkout@v3
@@ -40,4 +40,4 @@ jobs:
         with:
           token: ${{ secrets.GH_TOKEN }}
           listener: ${{ secrets.CLEN_BOT }}
-          jira-api-key: ${{ secrets.JIRA_API_KEY }}
+          jira-api-key: ${{ secrets.JIRA_API_KEY }}

.github/workflows/release.yml

@@ -2,9 +2,8 @@ name: Automated product release
 
 on:
   pull_request:
-    branches: [ master ]
-    types: [ closed ]
-
+    branches: [master]
+    types: [closed]
 
 jobs:
   check-release:
@@ -56,4 +55,3 @@ jobs:
           token: ${{ secrets.GH_TOKEN }}
           jira-api-key: ${{ secrets.JIRA_API_KEY }}
           last-service: true
-

.github/workflows/run-tests.yml

@@ -48,7 +48,7 @@ jobs:
             ${{ github.workspace }}/vendor
           key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-              ${{ runner.os }}-composer-
+            ${{ runner.os }}-composer-
       - name: Setup PHP ${{ matrix.php }}
         uses: shivammathur/setup-php@v2
         with:
@@ -70,4 +70,4 @@ jobs:
     needs: [tests]
     steps:
       - name: Tests summary
-        run: echo -e "\033[38;2;95;215;0m\033[1mAll tests successfully passed"
+        run: echo -e "\033[38;2;95;215;0m\033[1mAll tests successfully passed"

.github/workflows/run-validations.yml

@@ -37,4 +37,4 @@ jobs:
     needs: [pubnub-yml]
     steps:
       - name: Validations summary
-        run: echo -e "\033[38;2;95;215;0m\033[1mAll validations passed"
+        run: echo -e "\033[38;2;95;215;0m\033[1mAll validations passed"

.pubnub.yml

@@ -1,8 +1,13 @@
 name: php
-version: 6.1.0
+version: 6.1.1
 schema: 1
 scm: github.com/pubnub/php
 changelog:
+  - date: 2023-10-30
+    version: v6.1.1
+    changes:
+      - type: bug
+        text: "Changed license type from MIT to PubNub Software Development Kit License."
   - date: 2023-10-16
     version: v6.1.0
     changes:
@@ -392,8 +397,8 @@ sdks:
                     - x86-64
           - distribution-type: library
             distribution-repository: GitHub release
-            package-name: php-6.1.0.zip
-            location: https://github.com/pubnub/php/releases/tag/v6.1.0
+            package-name: php-6.1.1.zip
+            location: https://github.com/pubnub/php/releases/tag/v6.1.1
             requires:
               - name: rmccue/requests
                 min-version: 1.0.0

CHANGELOG.md

@@ -1,3 +1,9 @@
+## v6.1.1
+October 30 2023
+
+#### Fixed
+- Changed license type from MIT to PubNub Software Development Kit License.
+
 ## v6.1.0
 October 16 2023
 

README.md

@@ -41,7 +41,7 @@ You will need the publish and subscribe keys to authenticate your app. Get your
          {
              "require": {
                  <!-- include the latest version from the badge at the top -->
-                 "pubnub/pubnub": "6.1.0"
+                 "pubnub/pubnub": "6.1.1"
              }
          }
          ```

src/PubNub/PubNub.php

@@ -53,7 +53,7 @@
 
 class PubNub implements LoggerAwareInterface
 {
-    protected const SDK_VERSION = "6.1.0";
+    protected const SDK_VERSION = "6.1.1";
     protected const SDK_NAME = "PubNub-PHP";
 
     public static $MAX_SEQUENCE = 65535;
@@ -79,6 +79,8 @@ class PubNub implements LoggerAwareInterface
     /** @var  int $nextSequence */
     protected $nextSequence = 0;
 
+    protected ?CryptoModule $cryptoModule = null;
+
     /**
      * PNConfiguration constructor.
      *
@@ -557,4 +559,18 @@ public function setToken($token)
     {
         return $this->tokenManager->setToken($token);
     }
+
+    public function getCrypto(): CryptoModule
+    {
+        if ($this->cryptoModule) {
+            return $this->cryptoModule;
+        } else {
+            return $this->configuration->getCrypto();
+        }
+    }
+
+    public function setCrypto(CryptoModule $cryptoModule)
+    {
+        $this->cryptoModule = $cryptoModule;
+    }
 }