Fix up migration to php-collective

Author: dereuromark

.editorconfig

@@ -10,18 +10,14 @@ trim_trailing_whitespace = true
 charset = utf-8
 
 [*.bat]
-indent_style = space
 indent_size = 4
 end_of_line = crlf
 
 [*.yml]
-indent_style = space
 indent_size = 4
 
 [*.json]
-indent_style = space
 indent_size = 4
 
-[*.yaml]
-indent_style = space
-indent_size = 4
+[*.neon]
+indent_style = tab

.github/workflows/ci.yml

@@ -9,17 +9,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.4', '8.0', '8.1']
+        php-version: ['8.1', '8.3']
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.1'
         extensions: mbstring, json, fileinfo
         tools: pecl
         coverage: pcov
@@ -37,29 +35,27 @@ jobs:
 
     - name: Run PHPUnit
       run: |
-        if [[ ${{ matrix.php-version }} == '7.4' ]]; then
+        if [[ ${{ matrix.php-version }} == '8.1' ]]; then
           bin/phpunit --coverage-clover=coverage.xml
         else
           bin/phpunit
         fi
 
     - name: Code Coverage Report
-      if: success() && matrix.php-version == '7.4'
+      if: success() && matrix.php-version == '8.1'
       uses: codecov/codecov-action@v1
 
   cs-stan:
     name: Coding Standard & Static Analysis
     runs-on: ubuntu-20.04
 
     steps:
-    - uses: actions/checkout@v1
-      with:
-        fetch-depth: 1
+    - uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
-        php-version: '7.4'
+        php-version: '8.1'
         extensions: mbstring, json, fileinfo
         coverage: none
         tools: pecl
@@ -71,7 +67,7 @@ jobs:
       run: php config/composer_phive.php
 
     - name: Run phpcs
-      run: bin/phpcs --version && bin/phpcs --report=checkstyle --standard=phpcs.xml src/ tests/
+      run: bin/phpcs --version && bin/phpcs --report=checkstyle
 
     - name: Run phpstan
-      run: bin/phpstan -V && bin/phpstan analyse src -l 5 --error-format=github
+      run: bin/phpstan -V && bin/phpstan analyse --error-format=github

.gitignore

@@ -4,6 +4,7 @@
 /logs
 /vendor/
 /bin
-coverage.xml
-phive*.phar
+/coverage.xml
+/composer.phar
+/phpstan.phar
 /composer.lock

.scrutinizer.yml

@@ -1,5 +1,5 @@
 {
-    "name": "phauthentic/file-storage",
+    "name": "php-collective/file-storage",
     "description": "File Storage",
     "keywords": ["storage", "files", "file storage", "file system", "persistence", "media", "image processing", "agnostic"],
     "type": "library",
@@ -8,40 +8,47 @@
         {
             "name": "Florian Krämer",
             "role": "Maintainer"
+        },
+        {
+            "name": "Mark Scherer",
+            "role": "Maintainer"
         }
     ],
     "require": {
         "php": ">=7.4",
         "ext-fileinfo": "*",
         "ext-json": "*",
         "ext-mbstring": "*",
-        "phauthentic/file-storage-factories": "^1.0",
+        "php-collective/file-storage-factories": "^1.0",
         "psr/http-message": "^1.0"
     },
     "require-dev": {
-        "phauthentic/file-storage-image-processor": "^1.0"
+        "phpunit/phpunit": "^10.3",
+        "php-collective/code-sniffer": "^0.2.1",
+        "php-collective/file-storage-image-processor": "^1.0"
     },
     "suggest": {
-        "phauthentic/file-storage-image-processor": "For image processing"
+        "php-collective/file-storage-image-processor": "For image processing"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "bin-dir": "bin",
-        "process-timeout": 0,
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "autoload": {
         "psr-4": {
-            "Phauthentic\\Infrastructure\\Storage\\": "src/"
+            "PhpCollective\\Infrastructure\\Storage\\": "src/"
         },
         "files": [
             "src/functions.php"
         ]
     },
     "autoload-dev": {
         "psr-4": {
-            "Phauthentic\\Test\\": "tests/"
+            "PhpCollective\\Test\\": "tests/"
         }
     },
     "scripts": {
@@ -57,17 +64,14 @@
         "test-coverage-html": [
             "phpunit --coverage-html tmp/coverage/"
         ],
-        "cscheck": [
-            "phpcs src/ tests/ --standard=phpcs.xml -s"
-        ],
-        "csfix": [
-            "phpcbf src/ tests/ --standard=phpcs.xml"
+        "cs-check": [
+            "phpcs -s"
         ],
-        "analyze": [
-            "phpstan analyse src/"
+        "cs-fix": [
+            "phpcbf"
         ],
-        "phive": [
-            "php config/composer_phive.php"
+        "stan": [
+            "phpstan analyze src/"
         ]
     }
 }

composer.json

@@ -42,6 +42,6 @@ We think there is a need to explain why we have picked the dependencies we have,
 
 The dependencies have been selected based on the code quality and amount of further dependencies they would introduce.
 
-There are two dependencies, one of them `phauthentic/file-storage-factories` is just to abstract the real dependency `flysystem\flysystem`.
+There are two dependencies, one of them `php-collective/file-storage-factories` is just to abstract the real dependency `flysystem\flysystem`.
 
 Flysystem is the underlying storage abstraction library that provides the functionality to write to different storage backends.

contributing.md

@@ -5,14 +5,14 @@ declare(strict_types=1);
 
 require 'vendor/autoload.php';
 
-use Phauthentic\Infrastructure\Storage\Factories\LocalFactory;
-use Phauthentic\Infrastructure\Storage\FileFactory;
-use Phauthentic\Infrastructure\Storage\PathBuilder\PathBuilder;
-use Phauthentic\Infrastructure\Storage\Processor\Image\ImageProcessor;
-use Phauthentic\Infrastructure\Storage\Processor\Image\ImageVariant;
-use Phauthentic\Infrastructure\Storage\FileStorage;
-use Phauthentic\Infrastructure\Storage\StorageAdapterFactory;
-use Phauthentic\Infrastructure\Storage\StorageService;
+use PhpCollective\Infrastructure\Storage\Factories\LocalFactory;
+use PhpCollective\Infrastructure\Storage\FileFactory;
+use PhpCollective\Infrastructure\Storage\PathBuilder\PathBuilder;
+use PhpCollective\Infrastructure\Storage\Processor\Image\ImageProcessor;
+use PhpCollective\Infrastructure\Storage\Processor\Image\ImageVariant;
+use PhpCollective\Infrastructure\Storage\FileStorage;
+use PhpCollective\Infrastructure\Storage\StorageAdapterFactory;
+use PhpCollective\Infrastructure\Storage\StorageService;
 use Intervention\Image\ImageManager;
 
 /*******************************************************************************

docs/Architecture.md

@@ -5,7 +5,7 @@
 Install it via [Composer](https://getcomposer.org/)
 
 ```sh
-composer require phauthentic/file-storage
+composer require php-collective/file-storage
 ```
 
 If you want to manually install it we assume you know what you're doing by not using Composer.
@@ -15,7 +15,7 @@ If you want to manually install it we assume you know what you're doing by not u
 To use the image processing feature you'll need to add this repository as well:
 
 ```sh
-composer require phauthentic/file-storage-image-processor
+composer require php-collective/file-storage-image-processor
 ```
 
 ## Development Tools