Merge pull request #16 from avto-dev/update-deps

Update deps

Author: eldario

.github/workflows/tests.yml

@@ -13,37 +13,32 @@ on:
 jobs: # Docs: <https://git.io/JvxXE>
   php:
     name: PHP ${{ matrix.php }}, ${{ matrix.setup }} setup, laravel ${{ matrix.laravel }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 10
     strategy:
       fail-fast: false
       matrix:
         setup: [basic, lowest]
         laravel: [default]
         coverage: [yes]
-        php: ['7.3', '7.4', '8.0']
-        include:
-          - php: '7.3'
-            setup: basic
-            coverage: no
-            laravel: '^7.0'
+        php: ['8.0', '8.1', '8.2']
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup PHP, with composer and extensions
         uses: shivammathur/setup-php@v2 # Action page: <https://github.com/shivammathur/setup-php>
         with:
           php-version: ${{ matrix.php }}
           extensions: mbstring
-          tools: composer:v1 # TODO update composer up to v2
+          tools: composer:v2
 
       - name: Get Composer Cache Directory # Docs: <https://git.io/JfAKn#php---composer>
         id: composer-cache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+        run: echo "dir=dir::$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache dependencies # Docs: <https://git.io/JfAKn#php---composer>
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ matrix.setup }}-${{ hashFiles('**/composer.json') }}
@@ -74,7 +69,7 @@ jobs: # Docs: <https://git.io/JvxXE>
           XDEBUG_MODE: coverage
         run: composer test-cover
 
-      - uses: codecov/codecov-action@v1 # Docs: <https://github.com/codecov/codecov-action>
+      - uses: codecov/codecov-action@v3 # Docs: <https://github.com/codecov/codecov-action>
         if: matrix.coverage == 'yes'
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -84,10 +79,10 @@ jobs: # Docs: <https://git.io/JvxXE>
 
   lint-changelog:
     name: Lint changelog file
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Lint changelog file
         uses: docker://avtodev/markdown-lint:v1 # Action page: <https://github.com/avto-dev/markdown-lint>

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog][keepachangelog] and this project adheres to [Semantic Versioning][semver].
 
+## Unreleased
+
+### Changed
+
+- Minimal require PHP version now is `8.0`
+- Minimal Laravel version now is `9.0`
+- Version of `composer` in docker container updated up to `2.5.3`
+
 ## v3.4.0
 
 ### Added

Dockerfile

@@ -2,13 +2,13 @@ FROM php:8.0-alpine
 
 ENV COMPOSER_HOME="/tmp/composer"
 
-COPY --from=composer:2.0.7 /usr/bin/composer /usr/bin/composer
+COPY --from=composer:2.5.3 /usr/bin/composer /usr/bin/composer
 
 RUN set -x \
     && apk add --no-cache binutils git \
-    && apk add --no-cache --virtual .build-deps autoconf pkgconf make g++ gcc 1>/dev/null \
+    && apk add --no-cache --virtual .build-deps linux-headers autoconf pkgconf make g++ gcc 1>/dev/null \
     # install xdebug (for testing with code coverage), but do not enable it
-    && pecl install xdebug-3.0.0 1>/dev/null \
+    && pecl install xdebug-3.2.0 1>/dev/null \
     && apk del .build-deps \
     && mkdir /src ${COMPOSER_HOME} \
     && ln -s /usr/bin/composer /usr/bin/c \

composer.json

@@ -14,18 +14,19 @@
         }
     ],
     "require": {
-        "php": "^7.3 || ^8.0",
-        "symfony/console": "^4.4 || ^5.0 || ^6.0",
-        "illuminate/contracts": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/container": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/support": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "illuminate/view": "^6.0 || ^7.0 || ^8.0 || ^9.0"
+        "php": "^8.0",
+        "symfony/console": "^6.0",
+        "illuminate/contracts": "^9.0",
+        "illuminate/container": "^9.0",
+        "illuminate/support": "^9.0",
+        "illuminate/view": "^9.0"
     },
     "require-dev": {
-        "laravel/laravel": "^6.0 || ^7.0 || ^8.0 || ^9.0",
-        "mockery/mockery": "^1.4",
-        "phpstan/phpstan": "^0.12.34",
-        "phpunit/phpunit": "^9.3"
+        "laravel/laravel": "^9.0",
+        "mockery/mockery": "^1.5.1",
+        "phpstan/phpstan": "^1.9",
+        "phpunit/phpunit": "^9.6",
+        "nesbot/carbon": "^2.66.0"
     },
     "autoload": {
         "psr-4": {

config/version.php

@@ -56,10 +56,10 @@
     */
 
     'config' => [
-        'major' => (int) env('APP_VERSION_MAJOR', 1),
-        'minor' => (int) env('APP_VERSION_MINOR', 0),
-        'patch' => (int) env('APP_VERSION_PATCH', 0),
-        'build' => (string) env('APP_VERSION_BUILD', 0),
+        'major' => env('APP_VERSION_MAJOR', 1),
+        'minor' => env('APP_VERSION_MINOR', 0),
+        'patch' => env('APP_VERSION_PATCH', 0),
+        'build' => env('APP_VERSION_BUILD', 0),
 
         'build_file' => storage_path('app/APP_BUILD'),
     ],

phpunit.xml.dist

@@ -2,19 +2,13 @@
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="./tests/bootstrap.php"
-         backupGlobals="false"
-         backupStaticAttributes="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
          forceCoversAnnotation="true"
-         stopOnFailure="false">
+>
 
     <testsuites>
         <testsuite name="Unit">
-            <directory suffix="Test.php">./tests</directory>
+            <directory>./tests</directory>
         </testsuite>
     </testsuites>
 
@@ -29,7 +23,7 @@
         <report>
             <clover outputFile="./coverage/clover.xml"/>
             <html outputDirectory="./coverage/html"/>
-            <text outputFile="php://stdout" showUncoveredFiles="false"/>
+            <text outputFile="php://stdout"/>
             <xml outputDirectory="./coverage/xml"/>
         </report>
     </coverage>

src/Drivers/ChangelogFileDriver.php

@@ -30,7 +30,9 @@ class ChangelogFileDriver implements DriverInterface
      */
     public function __construct(ConfigRepository $config, Filesystem $filesystem)
     {
-        $this->file_location = (string) $config->get(ServiceProvider::getConfigRootKeyName() . '.changelog.path');
+        /** @var string|null $changelog_path */
+        $changelog_path      = $config->get(ServiceProvider::getConfigRootKeyName() . '.changelog.path');
+        $this->file_location = (string) $changelog_path;
         $this->filesystem    = $filesystem;
     }
 

src/Drivers/ConfigFileDriver.php

@@ -35,7 +35,9 @@ class ConfigFileDriver implements DriverInterface
      */
     public function __construct(ConfigRepository $config, Filesystem $filesystem)
     {
-        $this->build_file_location = (string) $config->get(ServiceProvider::getConfigRootKeyName() . '.config.build_file');
+        /** @var string|null $build_file */
+        $build_file                = $config->get(ServiceProvider::getConfigRootKeyName() . '.config.build_file');
+        $this->build_file_location = (string) $build_file;
         $this->config              = $config;
         $this->filesystem          = $filesystem;
     }

src/Drivers/FileDriver.php

@@ -30,7 +30,9 @@ class FileDriver implements DriverInterface
      */
     public function __construct(ConfigRepository $config, Filesystem $filesystem)
     {
-        $this->file_location = (string) $config->get(ServiceProvider::getConfigRootKeyName() . '.file.path');
+        /** @var string|null $file_path */
+        $file_path           = $config->get(ServiceProvider::getConfigRootKeyName() . '.file.path');
+        $this->file_location = (string) $file_path;
         $this->filesystem    = $filesystem;
     }
 

src/ServiceProvider.php

@@ -60,7 +60,11 @@ protected function registerManager(): void
         $this->app->singleton(ManagerInterface::class, static function (Container $app): ManagerInterface {
             /** @var ConfigRepository $config */
             $config = $app->make(ConfigRepository::class);
-            $driver = $app->make($config->get(static::getConfigRootKeyName() . '.driver'));
+
+            /** @var string $driver_name */
+            $driver_name = $config->get(static::getConfigRootKeyName() . '.driver');
+
+            $driver = $app->make($driver_name);
 
             if ($driver instanceof DriverInterface) {
                 return new AppVersionManager($driver->createRepository());