Merge pull request #155 from getyoti/release-3.1.0

Release 3.1.0

.dependabot/config.yml

@@ -8,5 +8,6 @@ update_configs:
     default_reviewers:
       - "echarrod"
       - "davidgrayston"
-      - "emmas-yoti"
       - "MrBurtyyy"
+
+    default_assignees: ["davidgrayston"]

.gitattributes

@@ -1,5 +1,4 @@
 /examples export-ignore
-/sandbox export-ignore
 /tests export-ignore
 /phpunit.xml export-ignore
 /.gitattributes export-ignore

.php_cs.dist

@@ -3,7 +3,6 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude('Protobuf')
     ->in(__DIR__ . '/src')
     ->in(__DIR__ . '/tests')
-    ->in(__DIR__ . '/sandbox')
 ;
 
 return PhpCsFixer\Config::create()

.phpcs.xml.dist

@@ -13,6 +13,5 @@
   </rule>
   <file>src</file>
   <file>tests</file>
-  <file>sandbox</file>
   <exclude-pattern>src/Protobuf/*</exclude-pattern>
 </ruleset>

.travis.yml

@@ -23,12 +23,6 @@ jobs:
       php: "7.2"
     - <<: *compatibility
       php: "7.3"
-    - <<: *test
-      stage: Coverage
-      name: Coveralls
-      if: type = pull_request OR branch = master
-      script:
-        - composer coveralls
     - <<: *test
       stage: Analyze
       name: Sonarcloud
@@ -38,6 +32,5 @@ jobs:
           organization: "getyoti"
       if: type == pull_request OR branch = master
       script:
-        - composer coveralls
+        - composer coverage-clover
         - sonar-scanner
-

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "yoti/yoti-php-sdk",
   "description": "Yoti SDK for quickly integrating your PHP backend with Yoti",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "keywords": [
     "yoti",
     "sdk"
@@ -10,6 +10,7 @@
   "license": "MIT",
   "require": {
     "php": "^7.1",
+    "ext-json": "*",
     "google/protobuf": "^3.10",
     "phpseclib/phpseclib": "^2.0",
     "guzzlehttp/guzzle": "^6.4",
@@ -18,34 +19,30 @@
   },
   "autoload": {
     "psr-4": {
-      "Yoti\\": "src",
-      "Yoti\\Sandbox\\": "sandbox/src"
+      "Yoti\\": "src"
     }
   },
   "require-dev": {
-    "ext-json": "*",
     "phpunit/phpunit": "^7.5 || ^8.5",
     "squizlabs/php_codesniffer": "^3.4",
     "friendsofphp/php-cs-fixer": "^2.15",
     "brainmaestro/composer-git-hooks": "^2.8",
-    "php-coveralls/php-coveralls": "^2.1",
     "phpstan/phpstan-strict-rules": "^0.12.1",
     "phpstan/extension-installer": "^1.0"
   },
   "autoload-dev": {
     "psr-4": {
-      "Yoti\\Test\\": "tests/",
-      "Yoti\\Sandbox\\Test\\": "sandbox/tests/"
+      "Yoti\\Test\\": "tests/"
     }
   },
   "scripts": {
     "cghooks": "cghooks",
     "test": "phpunit",
     "coverage-clover": "phpunit --coverage-clover ./coverage/coverage.xml",
     "coverage-html": "phpunit --coverage-html ./coverage/report",
-    "coveralls": [
-      "@coverage-clover",
-      "php-coveralls --coverage_clover ./coverage/coverage.xml --json_path ./coverage/coveralls-upload.json"
+    "fix": [
+      "php-cs-fixer fix --config=.php_cs.dist -v --using-cache=no --diff-format=udiff --ansi",
+      "phpcbf"
     ],
     "lint": [
       "phpcs",

phpstan.neon.dist

@@ -2,7 +2,6 @@ parameters:
     level: max
     paths:
         - src
-        - sandbox/src
     excludes_analyse:
         - src/Protobuf/*
 

phpunit.xml

@@ -8,16 +8,11 @@
     <testsuites>
         <testsuite name="Yoti Test Suite">
             <directory>tests/</directory>
-            <directory>sandbox/</directory>
-        </testsuite>
-        <testsuite name="Yoti Sandbox Test Suite">
-            <directory>sandbox/tests/</directory>
         </testsuite>
     </testsuites>
     <filter>
         <whitelist processUncoveredFilesFromWhitelist="true">
             <directory suffix=".php">src</directory>
-            <directory suffix=".php">sandbox/src</directory>
             <exclude>
                 <directory>src/Protobuf</directory>
             </exclude>