Merge pull request #273 from opentok/php-7.4-updates-and-cleanup

PHP 7.4 updates and cleanup

Author: dragonmantank

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,31 @@
+<!--- Provide a general summary of the issue in the Title above -->
+
+## Expected Behavior
+<!--- If you're describing a bug, tell us what should happen -->
+<!--- If you're suggesting a change/improvement, tell us how it should work -->
+
+## Current Behavior
+<!--- If describing a bug, tell us what happens instead of the expected behavior -->
+<!--- If suggesting a change/improvement, explain the difference from current behavior -->
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- or ideas how to implement the addition or change -->
+
+## Steps to Reproduce (for bugs)
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+1.
+2.
+3.
+4.
+
+## Context
+<!--- How has this issue affected you? What are you trying to accomplish? -->
+<!--- Providing context helps us come up with a solution that is most useful in the real world -->
+
+## Your Environment
+<!--- Include as many relevant details about the environment you experienced the bug in -->
+* Version used:
+* Environment name and version (e.g. PHP 5.4 on nginx 1.9.1):
+* Operating System and version:

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,31 @@
+<!--- Provide a general summary of your changes in the Title above -->
+
+## Description
+<!--- Describe your changes in detail -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+<!--- Include details of your testing environment, and the tests you ran to -->
+<!--- see how your change affects other areas of the code, etc. -->
+
+## Example Output or Screenshots (if appropriate):
+
+## Types of changes
+<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
+- [ ] Bug fix (non-breaking change which fixes an issue)
+- [ ] New feature (non-breaking change which adds functionality)
+- [ ] Breaking change (fix or feature that would cause existing functionality to change)
+
+## Checklist:
+<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
+<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
+- [ ] My code follows the code style of this project.
+- [ ] My change requires a change to the documentation.
+- [ ] I have updated the documentation accordingly.
+- [ ] I have read the **CONTRIBUTING** document.
+- [ ] I have added tests to cover my changes.
+- [ ] All new and existing tests passed.

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: build
+on: [push, pull_request]
+jobs:
+    build:
+        runs-on: 
+            - ubuntu-latest
+        strategy:
+            matrix:
+                php: ['7.2', '7.3', '7.4']
+        steps:
+            - name: Configure Git
+              if: ${{ matrix.os == 'windows-latest' }}
+              run: |
+                  git config --system core.autocrlf false
+                  git config --ystem core.eol lf
+
+            - name: Checkout
+              uses: actions/checkout@v2
+
+            - name: Setup PHP
+              uses: shivammathur/setup-php@v2
+              with:
+                php-version: ${{ matrix.php }}
+                extensions: json
+                tools: composer
+                coverage: xdebug
+
+            - name: Get Composer cache directory
+              id: composercache
+              run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+
+            - name: Cache Composer dependencies
+              uses: actions/cache@v2
+              with:
+                path: ${{ steps.composercache.outputs.dir }}
+                key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+                restore-keys: ${{ runner.os }}-composer-
+
+            - name: Install dependencies
+              run: composer install --no-interaction --prefer-dist --no-progress --no-suggest ${{ matrix.composer-options }}
+
+            - name: Analyze & test
+              run: |
+                  vendor/bin/phpunit -v --configuration ./phpunit.xml.dist --coverage-clover=coverage.xml
+
+            - name: Run codecov
+              uses: codecov/codecov-action@v1

.travis.yml

@@ -25,14 +25,6 @@ command line:
 $ ./composer.phar require opentok/opentok 4.4.x
 ```
 
-### Manually:
-
-Download the `opentok.phar` file for the latest release from the [Releases](https://github.com/opentok/opentok-php-sdk/releases)
-page.
-
-Place `opentok.phar` in the [include_path](http://www.php.net/manual/en/ini.core.php#ini.include-path) OR
-require it in any script which uses the `OpenTok\*` classes.
-
 ## Usage
 
 ### Initializing
@@ -239,9 +231,9 @@ $archive->delete();
 ```
 
 You can also get a list of all the Archives you've created (up to 1000) with your API Key. This is
-done using the `listArchives($offset, $count)` method of the `OpenTok/OpenTok` class. The parameters
-`$offset` and `$count` are optional and can help you paginate through the results. This will return
-an instance of the `OpenTok\ArchiveList` class.
+done using the `listArchives($offset, $count, $sessionId)` method of the `OpenTok/OpenTok` class. The parameters
+`$offset`, `$count`, and `$sessionId` are optional and can help you paginate through the results, and subset the
+data by a specific session. This will return an instance of the `OpenTok\ArchiveList` class.
 
 ```php
 $archiveList = $opentok->listArchives();
@@ -514,9 +506,7 @@ Reference documentation is available at
 You need an OpenTok API key and API secret, which you can obtain by logging into your
 [TokBox account](https://tokbox.com/account).
 
-The OpenTok PHP SDK requires PHP 5.6+ or PHP 7+
-
-For PHP 5.5 and lower please use PHP SDK v2.5
+The OpenTok PHP SDK requires PHP 7.2 or higher.
 
 ## Release Notes
 

README.md

@@ -28,18 +28,26 @@
         "issues": "https://github.com/opentok/Opentok-PHP-SDK/issues"
     },
     "require": {
-        "php": ">=5.6.0",
+        "php": "^7.2",
+        "ext-xml": "*",
         "johnstevenson/json-works": "~1.1",
         "firebase/php-jwt": "^5.0",
-        "guzzlehttp/guzzle": "~6.0"
+        "guzzlehttp/guzzle": "~6.0|~7.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~5.7",
+        "phpunit/phpunit": "^7.4",
+        "php-http/mock-client": "^0.3.0",
+        "estahn/phpunit-json-assertions": "^3.0.0",
+        "squizlabs/php_codesniffer": "^3.1",
+        "php-http/guzzle6-adapter": "^1.0",
+        "phpstan/phpstan": "^0.11",
+        "rector/rector": "^0.5.23",
         "phing/phing": "~2.16.0"
     },
     "autoload": {
         "psr-4": {
-            "OpenTok\\": "src/OpenTok"
+            "OpenTok\\": "src/OpenTok",
+            "OpenTokTest\\": "tests/OpenTokTest"
         }
     }
 }

composer.json

@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<ruleset name="PSR12">
+    <rule ref="PSR12"/>
+    <file>./src</file>
+</ruleset>

phpcs.xml

@@ -0,0 +1,4 @@
+parameters:
+    level: 6
+    paths:
+        - src

phpstan.neon

@@ -3,13 +3,13 @@
 <phpunit bootstrap="tests/bootstrap.php" colors="true">
     <testsuites>
         <testsuite name="OpenTok Test Suite">
-            <directory>tests/OpenTok/</directory>
+            <directory>tests/</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
-            <directory suffix=".php">src/OpenTok/</directory>
+            <directory suffix=".php">src/</directory>
         </whitelist>
     </filter>
 

phpunit.xml.dist

@@ -0,0 +1,5 @@
+parameters:
+    php_version_features: '7.1'
+    import_short_classes: false
+    sets:
+        - dead-code