chore(deps-dev): update nunomaduro/larastan requirement from ^0.7.12 to ^0.7.12 || ^1.0.0 (#6)

* fix(deps): update guzzlehttp/psr7 requirement from ^1.7 to ^1.7 || ^2.0

Updates the requirements on [guzzlehttp/psr7](https://github.com/guzzle/psr7) to permit the latest version.
- [Release notes](https://github.com/guzzle/psr7/releases)
- [Changelog](https://github.com/guzzle/psr7/blob/master/CHANGELOG.md)
- [Commits](guzzle/psr7@1.7.0...2.1.0)

---
updated-dependencies:
- dependency-name: guzzlehttp/psr7
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore(deps-dev): update nunomaduro/larastan requirement || ^1.0.0

Updates the requirements on [nunomaduro/larastan](https://github.com/nunomaduro/larastan) to permit the latest version.
- [Release notes](https://github.com/nunomaduro/larastan/releases)
- [Changelog](https://github.com/nunomaduro/larastan/blob/master/CHANGELOG.md)
- [Commits](larastan/larastan@v0.7.12...1.0.0)

---
updated-dependencies:
- dependency-name: nunomaduro/larastan
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>

* chore: updated deps

* chore: prepared CI pipeline to change default branch

* chore: updated comment in phpstan config file

* docs: updated README.md

* docs: updated CONTRIBUTING.md

* docs: updated CHANGELOG.md

* fix: removed non-used properties

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mateusz Gostański <mateusz.gostanski@gmail.com>

Author: dependabot[bot]

.github/workflows/php.yml

@@ -2,9 +2,13 @@ name: CI/CD
 
 on:
   push:
-    branches: [ master ]
+    branches:
+      - master
+      - main
   pull_request:
-    branches: [ master ]
+    branches:
+      - master
+      - main
 
 jobs:
   build:

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to `api-client` will be documented in this file
 
+## 3.4.1 - 2021-11-08
+
+- Updated Larastan to `1.0.1`
+- Prepared CI pipeline to change default branch
+
 ## 3.4.0 - 2021-10-28
 
 - Added code quality tools such as PHP_CS_Fixer, PHP Insights & PHPStan

CONTRIBUTING.md

@@ -10,17 +10,18 @@ This project is open source, and as such, the maintainers give their free time t
 held within. They make the code freely available in the hope that it will be of use to other developers. It would be
 extremely unfair for them to suffer abuse or anger for their hard work.
 
-Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the
-world that developers are civilized and selfless people.
+Please be considerate towards maintainers when raising issues or presenting pull requests. Let's show the world that
+developers are civilized and selfless people.
 
-It's the duty of the maintainer to ensure that all submissions to the project are of sufficient
-quality to benefit the project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do not be upset or abusive if your submission is not used.
+It's the duty of the maintainer to ensure that all submissions to the project are of sufficient quality to benefit the
+project. Many developers have different skillsets, strengths, and weaknesses. Respect the maintainer's decision, and do
+not be upset or abusive if your submission is not used.
 
 ## Viability
 
-When requesting or submitting new features, first consider whether it might be useful to others. Open
-source projects are used by many developers, who may have entirely different needs to your own. Think about
-whether or not your feature is likely to be used by other users of the project.
+When requesting or submitting new features, first consider whether it might be useful to others. Open source projects
+are used by many developers, who may have entirely different needs to your own. Think about whether or not your feature
+is likely to be used by other users of the project.
 
 ## Procedure
 
@@ -40,16 +41,22 @@ Before submitting a pull request:
 
 If the project maintainer has any additional requirements, you will find them listed here.
 
-- **[PSR-12 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-12-extended-coding-style-guide.md)** - The easiest way to apply the conventions is to install [PHP Code Sniffer](https://pear.php.net/package/PHP_CodeSniffer).
+- **[PSR-12 Coding Standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-12-extended-coding-style-guide.md)**
+  - The easiest way to apply the conventions is to run `composer cs`.
 
 - **Add tests!** - Your patch won't be accepted if it doesn't have tests.
 
-- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept up-to-date.
+- **Document any change in behaviour** - Make sure the `README.md` and any other relevant documentation are kept
+  up-to-date.
 
-- **Consider our release cycle** - We try to follow [SemVer v2.0.0](https://semver.org/). Randomly breaking public APIs is not an option.
+- **Consider our release cycle** - We try to follow [SemVer v2.0.0](https://semver.org/). Randomly breaking public APIs
+  is not an option.
 
 - **One pull request per feature** - If you want to do more than one thing, send multiple pull requests.
 
-- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
+- **Send coherent history** - Make sure each individual commit in your pull request is meaningful. If you had to make
+  multiple intermediate commits while developing,
+  please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages)
+  before submitting.
 
 **Happy coding**!

README.md

@@ -92,7 +92,7 @@ Please see [CONTRIBUTING](CONTRIBUTING.md) for details.
 
 ### Security
 
-If you discover any security related issues, please email mg@grixu.dev instead of using the issue tracker.
+If you discover any security related issues, please email mateusz.gostanski@gmail.com instead of using the issue tracker.
 
 ## Credits
 

composer.json

@@ -11,15 +11,15 @@
     "authors": [
         {
             "name": "Mateusz Gostański",
-            "email": "mg@grixu.dev",
+            "email": "mateusz.gostanski@gmail.com",
             "role": "Developer"
         }
     ],
     "require": {
         "php": "^8.0",
         "ext-json": "*",
         "guzzlehttp/guzzle": "^7.2",
-        "guzzlehttp/psr7": "^1.7",
+        "guzzlehttp/psr7": "^1.7 || ^2.0",
         "illuminate/http": "^8.0",
         "illuminate/support": "^8.0",
         "spatie/laravel-enum": "^2.2"
@@ -29,7 +29,7 @@
         "orchestra/testbench": "^6.0",
         "phpunit/phpunit": "^9.4",
         "friendsofphp/php-cs-fixer": "^3.1",
-        "nunomaduro/larastan": "^0.7.12",
+        "nunomaduro/larastan": "^0.7.12 || ^1.0.0",
         "nunomaduro/phpinsights": "^2.0"
     },
     "autoload": {

phpstan.neon.dist

@@ -6,7 +6,7 @@ parameters:
     paths:
         - src
 
-    # The level 8 is the highest level
+    # The level 9 is the highest level
     level: 5
 
     ignoreErrors:

src/AbstractApiFetcher.php

@@ -15,8 +15,7 @@ abstract class AbstractApiFetcher implements ApiFetcher
     protected Collection $dataCollection;
 
     public function __construct(
-        private Config $config,
-        private string $path
+        private Config $config
     ) {
         $tokenClassName = config('api-client.auth_types')[$config->getAuthType()->value];
         $this->token = new $tokenClassName($config);

src/JsonApiFetcher.php

@@ -12,11 +12,11 @@ class JsonApiFetcher extends AbstractApiFetcher
 
     public function __construct(
         private JsonApiConfig $config,
-        private string $path,
+        string $path,
         private bool $loadAll = true,
-        private int $page = 1
+        int $page = 1
     ) {
-        parent::__construct($config, $path);
+        parent::__construct($config);
 
         $this->urlComposer = new UrlCompose($config, $path);
         $this->urlComposer->setPage($config->getPaginationParam(), $page);