Merge branch '4.0' into 4.1

Author: GrahamCampbell

.gitattributes

@@ -15,4 +15,3 @@
 /psalm.xml export-ignore
 /CHANGELOG.md export-ignore
 /README.md export-ignore
-/rector.php export-ignore

.github/CODE_OF_CONDUCT.md

@@ -55,7 +55,7 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at [email protected]. All
+reported by contacting the project team at [email protected]. All
 complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

.github/SECURITY.md

@@ -9,6 +9,6 @@ are multiple supported versions at any given time.
 ## Reporting a Vulnerability
 
 If you discover a security vulnerability within this package, please send an
-email to Graham Campbell at [email protected]. All security vulnerabilities
+email to Graham Campbell at [email protected]. All security vulnerabilities
 will be promptly addressed. Please do not disclose security-related issues
 publicly until a fix has been announced.

.github/workflows/static.yml

@@ -16,8 +16,8 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
-          tools: composer:v2
+          php-version: '8.0'
+          tools: composer:2.1
           coverage: none
 
       - name: Install Dependencies
@@ -48,8 +48,8 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: 7.4
-          tools: composer:v2
+          php-version: '8.0'
+          tools: composer:2.1
           coverage: none
 
       - name: Install Dependencies
@@ -68,42 +68,3 @@ jobs:
 
       - name: Execute Psalm
         run: vendor/bin/psalm.phar --no-progress --output-format=github
-
-  rector:
-    name: Rector
-    runs-on: ubuntu-20.04
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: 7.4
-          tools: composer:v2, cs2pr
-          coverage: none
-
-      - name: Install Dependencies
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --no-interaction --no-progress
-
-      - name: Install PHPUnit
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer bin phpunit update --no-interaction --no-progress
-
-      - name: Install Rector
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer bin rector update --no-interaction --no-progress
-
-      - name: Execute Rector
-        run: vendor/bin/rector process --dry-run --output-format=checkstyle | cs2pr

.github/workflows/tests.yml

@@ -21,7 +21,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          tools: composer:v2
+          tools: composer:2.1
           coverage: none
 
       - name: Setup Problem Matchers

CHANGELOG.md

@@ -7,6 +7,12 @@ CHANGE LOG
 * TODO
 
 
+## V4.0.2 (23/01/2022)
+
+* Added missing `PipelinesConfig::variables()` method
+* Fixed some incorrect endpoint URIs
+
+
 ## V4.0.1 (14/03/2021)
 
 * Fixed some incorrect endpoint URIs

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018-2021 Graham Campbell <[email protected]>
+Copyright (c) 2018-2022 Graham Campbell <[email protected]>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,32 +1,26 @@
 install:
-	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:7.4-base update
-	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:7.4-base bin all update
+	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.0-base update
+	@docker run -it -w /data -v ${PWD}:/data:delegated -v ~/.composer:/root/.composer:delegated --entrypoint composer --rm registry.gitlab.com/grahamcampbell/php:8.0-base bin all update
 
 phpunit:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit --rm registry.gitlab.com/grahamcampbell/php:8.0-cli
 
 phpstan-analyze:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:7.4-cli analyze
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.0-cli analyze
 
 phpstan-baseline:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:7.4-cli analyze --generate-baseline
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpstan --rm registry.gitlab.com/grahamcampbell/php:8.0-cli analyze --generate-baseline
 
 psalm-analyze:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli
 
 psalm-baseline:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --set-baseline=psalm-baseline.xml
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli --set-baseline=psalm-baseline.xml
 
 psalm-show-info:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:7.4-cli --show-info=true
+	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/psalm.phar --rm registry.gitlab.com/grahamcampbell/php:8.0-cli --show-info=true
 
-rector-dry-run:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/rector --rm registry.gitlab.com/grahamcampbell/php:7.4-cli process --dry-run
-
-rector-fix:
-	@docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/rector --rm registry.gitlab.com/grahamcampbell/php:7.4-cli process
-
-test: phpunit phpstan-analyze psalm-analyze rector-dry-run
+test: phpunit phpstan-analyze psalm-analyze
 
 clean:
 	@rm -rf .phpunit.result.cache composer.lock vendor vendor-bin/*/composer.lock vendor-bin/*/vendor

README.md

@@ -143,7 +143,7 @@ $ make test
 
 ## Security
 
-If you discover a security vulnerability within this package, please send an email to Graham Campbell at [email protected]. All security vulnerabilities will be promptly addressed. You may view our full security policy [here](https://github.com/BitbucketPHP/Client/security/policy).
+If you discover a security vulnerability within this package, please send an email to Graham Campbell at [email protected]. All security vulnerabilities will be promptly addressed. You may view our full security policy [here](https://github.com/BitbucketPHP/Client/security/policy).
 
 
 ## License

composer.json

@@ -6,7 +6,8 @@
     "authors": [
         {
             "name": "Graham Campbell",
-            "email": "[email protected]"
+            "email": "[email protected]",
+            "homepage": "https://github.com/GrahamCampbell"
         }
     ],
     "require": {

phpstan-baseline.neon

@@ -1,5 +1,10 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Property Bitbucket\\\\Api\\\\AbstractApi\\:\\:\\$perPage is never written, only read\\.$#"
+			count: 1
+			path: src/Api/AbstractApi.php
+
 		-
 			message: "#^Variable method call on Bitbucket\\\\Api\\\\AbstractApi\\.$#"
 			count: 1

psalm-baseline.xml

@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.3.1@2feba22a005a18bf31d4c7b9bdb9252c73897476">
-  <file src="src/HttpClient/Util/JsonArray.php">
-    <MixedArgument occurrences="1">
-      <code>\get_debug_type($data)</code>
-    </MixedArgument>
-    <UndefinedFunction occurrences="1">
-      <code>\get_debug_type($data)</code>
-    </UndefinedFunction>
-  </file>
+<files psalm-version="4.x-dev@">
   <file src="src/ResultPager.php">
     <InaccessibleProperty occurrences="1">
       <code>$clone-&gt;perPage</code>

rector.php

@@ -5,7 +5,7 @@
 /*
  * This file is part of the Bitbucket API Client.
  *
- * (c) Graham Campbell <[email protected]>
+ * (c) Graham Campbell <[email protected]>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,7 +21,7 @@
 
 /**
  * @author Joseph Bielawski <[email protected]>
- * @author Graham Campbell <[email protected]>
+ * @author Graham Campbell <[email protected]>
  */
 abstract class AbstractApi
 {