Merge remote-tracking branch 'origin/master' into sync-upstream

Author: FelixJacobi

.gitattributes

@@ -6,3 +6,4 @@ codeception.yml export-ignore
 phpunit.xml.dist export-ignore
 psalm.xml export-ignore
 /tests export-ignore
+/tools export-ignore

.github/workflows/ci.yml

@@ -23,14 +23,13 @@ jobs:
         php-version: ${{ matrix.php-versions }}
         extensions: bcmath, ctype, fileinfo, json, mbstring, dom, ldap, pdo, tokenizer, xml, mysql, sqlite
         coverage: xdebug
-    - name: Downgrade phpunit for php7.2
-      run: composer update phpunit/phpunit -W
+
     - name: Update to lowest php dependencies
       run: composer update --prefer-lowest
     - name: Install php dependencies
       run: composer install --dev --no-interaction
     - name: Execute tests without coverage
-      run: vendor/bin/phpunit --testsuite="BigBlueButton unit test suite,BigBlueButton integration test suite"
+      run: tools/phpunit --testsuite="BigBlueButton unit test suite,BigBlueButton integration test suite"
 
   PHP:
     name: PHP ${{ matrix.php-versions }}
@@ -53,26 +52,23 @@ jobs:
         php-version: ${{ matrix.php-versions }}
         extensions: bcmath, ctype, fileinfo, json, mbstring, dom, ldap, pdo, tokenizer, xml, mysql, sqlite
         coverage: xdebug
-    - name: Downgrade phpunit for php7.2
-      if: ${{ matrix.php-versions == '7.2' }}
-      run: composer update phpunit/phpunit -W
     - name: Install php dependencies
       run: composer install --dev --no-interaction
       continue-on-error: ${{ matrix.experimental }}
     - name: Execute code style check via php-cs-fixer
-      run: vendor/bin/php-cs-fixer fix --dry-run
+      run: tools/php-cs-fixer fix --dry-run
       continue-on-error: ${{ matrix.experimental }}
     - name: Execute tests with coverage
       if: ${{ !matrix.experimental }}
       run: |
         mkdir -p build/logs
-        vendor/bin/phpunit --coverage-clover=build/logs/coverage.xml --testsuite="BigBlueButton unit test suite,BigBlueButton integration test suite"
+        tools/phpunit --coverage-clover=build/logs/coverage.xml --testsuite="BigBlueButton unit test suite,BigBlueButton integration test suite"
     - name: Execute tests without coverage
       if: ${{ matrix.experimental }}
-      run: vendor/bin/phpunit --testsuite="BigBlueButton test suite"
+      run: tools/phpunit --testsuite="BigBlueButton test suite"
       continue-on-error: true
     - name: Coveralls
       env:
         COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       if: ${{ matrix.php-versions == '7.2' && env.COVERALLS_REPO_TOKEN != null }}
-      run: vendor/bin/php-coveralls --coverage_clover=build/logs/coverage.xml -v
+      run: tools/php-coveralls --coverage_clover=build/logs/coverage.xml -v

.gitignore

@@ -19,3 +19,14 @@ reports
 # Local environment variables
 /.env.local
 /.env.*.local
+
+# Composer lock file
+#
+# The library does not locks down the dependencies for several reasons:
+#
+# * In the outer world, the lock is not effective. Only the lock of the requiring application is accounted.
+# * It makes it hard, to run the library with its deps in the CI as when running `composer require` under PHP 8.1,
+#   an incompatible lock file is created which is unsuable unter PHP 7.x.
+#
+# See https://github.com/littleredbutton/bigbluebutton-api-php/pull/115 for the discussion.
+/composer.lock

composer.json

@@ -36,7 +36,7 @@
       "role": "Developer"
     },
     {
-      "name": "Alfonso Rodríguez",
+      "name": "Alfonso Rodr\u00edguez",
       "email": "[email protected]",
       "role": "Developer"
     },
@@ -72,56 +72,65 @@
     "symfony/http-client": "To use the SymfonyHttpClientTransport."
   },
   "require-dev": {
-    "composer/composer": "^1.10.0",
-    "phpunit/phpunit": "^8",
-    "friendsofphp/php-cs-fixer": "2.*",
-    "squizlabs/php_codesniffer": "3.*",
-    "php-coveralls/php-coveralls": "^2.4.0",
-    "brainmaestro/composer-git-hooks": "^2.8",
-    "vimeo/psalm": "^4.5",
     "psr/http-client": "^1.0",
     "psr/http-factory": "^1.0",
     "psr/http-message": "^1.0",
     "symfony/dotenv": "^3.4|^4.0|^5.0",
     "symfony/http-client-contracts": "^1.1|^2.0",
     "symfony/http-client": "^4.4|^5.0",
     "symfony/process": "^3.4|^4.0|^5.0",
-    "nyholm/psr7": "^1.4",
-    "fakerphp/faker": "^1.14"
+    "nyholm/psr7": "^1.4"
   },
   "autoload": {
     "psr-4": {
-      "BigBlueButton\\": ["src", "tests/integration"]
+      "BigBlueButton\\": [
+        "src",
+        "tests/integration"
+      ]
     }
   },
   "autoload-dev": {
     "psr-4": {
-      "BigBlueButton\\Tests\\Functional\\": ["tests/functional"]
+      "BigBlueButton\\Tests\\Functional\\": [
+        "tests/functional"
+      ]
     }
   },
   "scripts": {
-    "test": "vendor/bin/phpunit  --testsuite=\"BigBlueButton unit test suite\"",
-    "test-integration": "vendor/bin/phpunit  --testsuite=\"BigBlueButton integration test suite\"",
-    "test-functional": "vendor/bin/phpunit --testsuite=\"BigBlueButton functional test suite\" --exclude-group=functional-legacy",
-    "cs-fix": "vendor/bin/php-cs-fixer fix --allow-risky=yes",
-    "cs-test": "vendor/bin/php-cs-fixer fix --dry-run --allow-risky=yes",
+    "test": "tools/phpunit  --testsuite=\"BigBlueButton unit test suite\"",
+    "test-integration": "tools/phpunit  --testsuite=\"BigBlueButton integration test suite\"",
+    "test-functional": "tools/phpunit --testsuite=\"BigBlueButton functional test suite\" --exclude-group=functional-legacy",
+    "cs-fix": "tools/php-cs-fixer fix --allow-risky=yes",
+    "cs-test": "tools/php-cs-fixer fix --dry-run --allow-risky=yes",
     "psalm": "psalm --threads=1",
     "psalm-clear": "psalm --clear-cache && psalm --clear-global-cache",
     "psalm-fix": "psalm --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
-    "post-install-cmd": "vendor/bin/cghooks add --ignore-lock",
-    "post-update-cmd": "vendor/bin/cghooks update"
+    "post-install-cmd": "tools/composer-git-hooks add --ignore-lock",
+    "post-update-cmd": "tools/composer-git-hooks update"
   },
   "extra": {
     "hooks": {
       "pre-commit": [
-        "vendor/bin/php-cs-fixer fix --dry-run --allow-risky=yes"
+        "tools/php-cs-fixer fix --dry-run --allow-risky=yes"
       ],
       "pre-push": [
-        "vendor/bin/phpunit --testsuite=\"BigBlueButton unit test suite,BigBlueButton integration test suite\"",
-        "vendor/bin/psalm --threads=1"
+        "tools/phpunit --testsuite=\"BigBlueButton unit test suite,BigBlueButton integration test suite\"",
+        "tools/psalm --threads=1"
       ],
       "post-merge": "composer install",
       "post-checkout": "composer install"
+    },
+    "cotor": {
+      "brainmaestro/composer-git-hooks": "^2.8",
+      "extensions": {
+        "phpunit/phpunit": {
+          "fakerphp/faker": "^1.14"
+        }
+      },
+      "friendsofphp/php-cs-fixer": "^3.7",
+      "php-coveralls/php-coveralls": "^2.4",
+      "phpunit/phpunit": "^8",
+      "vimeo/psalm": "^4.22"
     }
   }
 }