From 794e8df3eaedf72a6824b8b36584e5fd7cce58c2 Mon Sep 17 00:00:00 2001 From: Krzysztof Rewak Date: Thu, 31 Mar 2022 14:16:14 +0200 Subject: [PATCH 1/5] #5 - update codestyle to 1.x (#101) * #5 - update codestyle to 1.x * #5 - update codestyle to 1.x --- .github/workflows/test-and-lint-php.yml | 2 +- artisan | 2 + ecs.php => codestyle.php | 2 +- composer.json | 6 +- composer.lock | 655 ++++++++++++++++++++++-- readme.md | 6 +- server.php | 11 - 7 files changed, 620 insertions(+), 64 deletions(-) rename ecs.php => codestyle.php (71%) delete mode 100644 server.php diff --git a/.github/workflows/test-and-lint-php.yml b/.github/workflows/test-and-lint-php.yml index c4994a9..cfd1e94 100644 --- a/.github/workflows/test-and-lint-php.yml +++ b/.github/workflows/test-and-lint-php.yml @@ -45,7 +45,7 @@ jobs: run: composer install --prefer-dist --no-interaction --no-suggest - name: Run PHP linter - run: composer ecs + run: composer cs - name: Execute tests run: php artisan test --env=ci diff --git a/artisan b/artisan index 7e974c1..f4d3c7e 100755 --- a/artisan +++ b/artisan @@ -1,6 +1,8 @@ #!/usr/bin/env php add("public", "bootstrap/app.php", "ecs.php", "server.php"), + paths: $paths->add("codestyle.php"), ); return $config->config(); diff --git a/composer.json b/composer.json index 306094f..0d0c708 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "spatie/laravel-model-states": "^2.1" }, "require-dev": { - "blumilksoftware/codestyle": "^0.10.0", + "blumilksoftware/codestyle": "^1.0.0", "fakerphp/faker": "^1.19", "laravel/dusk": "^6.21", "mockery/mockery": "^1.4.4", @@ -45,8 +45,8 @@ } }, "scripts": { - "ecs": "./vendor/bin/ecs check --clear-cache", - "ecsf": "./vendor/bin/ecs check --clear-cache --fix", + "cs": "./vendor/bin/php-cs-fixer fix --dry-run --diff --config codestyle.php", + "csf": "./vendor/bin/php-cs-fixer fix --diff --config codestyle.php", "test": "@php artisan test", "fresh": "@php artisan migrate:fresh", "fresh:demo": [ diff --git a/composer.lock b/composer.lock index 151bc04..e0852f3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "45ec654a060d5985bc58fec1f42d8219", + "content-hash": "ba952c1eae2c9ac3c3dea37f7c93b7cb", "packages": [ { "name": "asm89/stack-cors", @@ -7532,28 +7532,27 @@ "packages-dev": [ { "name": "blumilksoftware/codestyle", - "version": "v0.10.0", + "version": "v1.0.0", "source": { "type": "git", "url": "https://github.com/blumilksoftware/codestyle.git", - "reference": "39da9ec4922e633e8f0bd065f244365217e9d00a" + "reference": "5e5e578e8f2cc2ee9296837047b3085eff66db3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/blumilksoftware/codestyle/zipball/39da9ec4922e633e8f0bd065f244365217e9d00a", - "reference": "39da9ec4922e633e8f0bd065f244365217e9d00a", + "url": "https://api.github.com/repos/blumilksoftware/codestyle/zipball/5e5e578e8f2cc2ee9296837047b3085eff66db3f", + "reference": "5e5e578e8f2cc2ee9296837047b3085eff66db3f", "shasum": "" }, "require": { + "friendsofphp/php-cs-fixer": "^3.8.0", "kubawerlos/php-cs-fixer-custom-fixers": "^3.7", - "php": "^8.0", - "symplify/easy-coding-standard": "10.1.0" + "php": "^8.0" }, "require-dev": { - "composer/composer": "2.*", "jetbrains/phpstorm-attributes": "^1.0", "phpunit/phpunit": "^9.5", - "symfony/console": "^5.3" + "symfony/console": "^6.0" }, "type": "library", "autoload": { @@ -7574,9 +7573,299 @@ "description": "Blumilk codestyle configurator", "support": { "issues": "https://github.com/blumilksoftware/codestyle/issues", - "source": "https://github.com/blumilksoftware/codestyle/tree/v0.10.0" + "source": "https://github.com/blumilksoftware/codestyle/tree/v1.0.0" }, - "time": "2022-02-23T07:26:50+00:00" + "time": "2022-03-31T08:43:56+00:00" + }, + { + "name": "composer/pcre", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/pcre/zipball/e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "reference": "e300eb6c535192decd27a85bc72a9290f0d6b3bd", + "shasum": "" + }, + "require": { + "php": "^7.4 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.3", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Pcre\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.0.0" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-02-25T20:21:48+00:00" + }, + { + "name": "composer/semver", + "version": "3.3.1", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "5d8e574bb0e69188786b8ef77d43341222a41a71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/semver/zipball/5d8e574bb0e69188786b8ef77d43341222a41a71", + "reference": "5d8e574bb0e69188786b8ef77d43341222a41a71", + "shasum": "" + }, + "require": { + "php": "^5.3.2 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.4", + "symfony/phpunit-bridge": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.3.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-03-16T11:22:07+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "ced299686f41dce890debac69273b47ffe98a40c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", + "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "symfony/phpunit-bridge": "^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", + "keywords": [ + "Xdebug", + "performance" + ], + "support": { + "irc": "irc://irc.freenode.org/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2022-02-25T21:32:43+00:00" + }, + { + "name": "doctrine/annotations", + "version": "1.13.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/5b668aef16090008790395c02c893b1ba13f7e08", + "reference": "5b668aef16090008790395c02c893b1ba13f7e08", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "ext-tokenizer": "*", + "php": "^7.1 || ^8.0", + "psr/cache": "^1 || ^2 || ^3" + }, + "require-dev": { + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/coding-standard": "^6.0 || ^8.1", + "phpstan/phpstan": "^0.12.20", + "phpunit/phpunit": "^7.5 || ^8.0 || ^9.1.5", + "symfony/cache": "^4.4 || ^5.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "https://www.doctrine-project.org/projects/annotations.html", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "support": { + "issues": "https://github.com/doctrine/annotations/issues", + "source": "https://github.com/doctrine/annotations/tree/1.13.2" + }, + "time": "2021-08-05T19:00:23+00:00" }, { "name": "doctrine/instantiator", @@ -7786,6 +8075,95 @@ ], "time": "2022-01-07T12:00:00+00:00" }, + { + "name": "friendsofphp/php-cs-fixer", + "version": "v3.8.0", + "source": { + "type": "git", + "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git", + "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3", + "reference": "cbad1115aac4b5c3c5540e7210d3c9fba2f81fa3", + "shasum": "" + }, + "require": { + "composer/semver": "^3.2", + "composer/xdebug-handler": "^3.0.3", + "doctrine/annotations": "^1.13", + "ext-json": "*", + "ext-tokenizer": "*", + "php": "^7.4 || ^8.0", + "php-cs-fixer/diff": "^2.0", + "symfony/console": "^5.4 || ^6.0", + "symfony/event-dispatcher": "^5.4 || ^6.0", + "symfony/filesystem": "^5.4 || ^6.0", + "symfony/finder": "^5.4 || ^6.0", + "symfony/options-resolver": "^5.4 || ^6.0", + "symfony/polyfill-mbstring": "^1.23", + "symfony/polyfill-php80": "^1.25", + "symfony/polyfill-php81": "^1.25", + "symfony/process": "^5.4 || ^6.0", + "symfony/stopwatch": "^5.4 || ^6.0" + }, + "require-dev": { + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^1.5", + "mikey179/vfsstream": "^1.6.10", + "php-coveralls/php-coveralls": "^2.5.2", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.2", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.2.1", + "phpspec/prophecy": "^1.15", + "phpspec/prophecy-phpunit": "^2.0", + "phpunit/phpunit": "^9.5", + "phpunitgoodpractices/polyfill": "^1.5", + "phpunitgoodpractices/traits": "^1.9.1", + "symfony/phpunit-bridge": "^6.0", + "symfony/yaml": "^5.4 || ^6.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz RumiƄski", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "support": { + "issues": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/issues", + "source": "https://github.com/FriendsOfPHP/PHP-CS-Fixer/tree/v3.8.0" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2022-03-18T17:20:59+00:00" + }, { "name": "hamcrest/hamcrest-php", "version": "v2.0.1", @@ -7839,16 +8217,16 @@ }, { "name": "kubawerlos/php-cs-fixer-custom-fixers", - "version": "v3.10.0", + "version": "v3.10.1", "source": { "type": "git", "url": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers.git", - "reference": "6257b9258df6ac487e94105c8b7d95a1ffd8972b" + "reference": "1a380cb6af607b11676c43386985f497442f0928" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/6257b9258df6ac487e94105c8b7d95a1ffd8972b", - "reference": "6257b9258df6ac487e94105c8b7d95a1ffd8972b", + "url": "https://api.github.com/repos/kubawerlos/php-cs-fixer-custom-fixers/zipball/1a380cb6af607b11676c43386985f497442f0928", + "reference": "1a380cb6af607b11676c43386985f497442f0928", "shasum": "" }, "require": { @@ -7881,9 +8259,9 @@ "description": "A set of custom fixers for PHP CS Fixer", "support": { "issues": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/issues", - "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.10.0" + "source": "https://github.com/kubawerlos/php-cs-fixer-custom-fixers/tree/v3.10.1" }, - "time": "2022-03-18T15:07:51+00:00" + "time": "2022-03-27T08:23:29+00:00" }, { "name": "laravel/dusk", @@ -8287,6 +8665,58 @@ }, "time": "2022-02-21T01:04:05+00:00" }, + { + "name": "php-cs-fixer/diff", + "version": "v2.0.2", + "source": { + "type": "git", + "url": "https://github.com/PHP-CS-Fixer/diff.git", + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/PHP-CS-Fixer/diff/zipball/29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "reference": "29dc0d507e838c4580d018bd8b5cb412474f7ec3", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0 || ^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^5.7.23 || ^6.4.3 || ^7.0", + "symfony/process": "^3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "sebastian/diff v3 backport support for PHP 5.6+", + "homepage": "https://github.com/PHP-CS-Fixer", + "keywords": [ + "diff" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/diff/issues", + "source": "https://github.com/PHP-CS-Fixer/diff/tree/v2.0.2" + }, + "time": "2020-10-14T08:32:19+00:00" + }, { "name": "php-webdriver/webdriver", "version": "1.12.0", @@ -10248,59 +10678,196 @@ "time": "2022-03-21T07:13:26+00:00" }, { - "name": "symplify/easy-coding-standard", - "version": "10.1.0", + "name": "symfony/filesystem", + "version": "v6.0.6", "source": { "type": "git", - "url": "https://github.com/symplify/easy-coding-standard.git", - "reference": "dcad0cff507fc3e56bf345dcd634dbea3ce0917e" + "url": "https://github.com/symfony/filesystem.git", + "reference": "52b888523545b0b4049ab9ce48766802484d7046" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symplify/easy-coding-standard/zipball/dcad0cff507fc3e56bf345dcd634dbea3ce0917e", - "reference": "dcad0cff507fc3e56bf345dcd634dbea3ce0917e", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/52b888523545b0b4049ab9ce48766802484d7046", + "reference": "52b888523545b0b4049ab9ce48766802484d7046", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.0.2", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" }, - "conflict": { - "friendsofphp/php-cs-fixer": "<3.0", - "squizlabs/php_codesniffer": "<3.6" - }, - "bin": [ - "bin/ecs" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-main": "9.5-dev" - } - }, "autoload": { - "files": [ - "bootstrap.php" + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Prefixed scoped version of ECS package", + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symplify/easy-coding-standard/tree/10.1.0" + "source": "https://github.com/symfony/filesystem/tree/v6.0.6" }, "funding": [ { - "url": "https://www.paypal.me/rectorphp", + "url": "https://symfony.com/sponsor", "type": "custom" }, { - "url": "https://github.com/tomasvotruba", + "url": "https://github.com/fabpot", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" } ], - "time": "2022-02-21T11:18:44+00:00" + "time": "2022-03-02T12:58:14+00:00" + }, + { + "name": "symfony/options-resolver", + "version": "v6.0.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "51f7006670febe4cbcbae177cbffe93ff833250d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/51f7006670febe4cbcbae177cbffe93ff833250d", + "reference": "51f7006670febe4cbcbae177cbffe93ff833250d", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v6.0.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:55:41+00:00" + }, + { + "name": "symfony/stopwatch", + "version": "v6.0.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "f2c1780607ec6502f2121d9729fd8150a655d337" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/f2c1780607ec6502f2121d9729fd8150a655d337", + "reference": "f2c1780607ec6502f2121d9729fd8150a655d337", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/service-contracts": "^1|^2|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v6.0.5" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-02-21T17:15:17+00:00" }, { "name": "theseer/tokenizer", @@ -10364,5 +10931,5 @@ "ext-redis": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } diff --git a/readme.md b/readme.md index 423afa1..22bd1cc 100644 --- a/readme.md +++ b/readme.md @@ -71,10 +71,8 @@ If xDebug is installed, set environment variable **XDEBUG_MODE=off** to improve ### Code style check - dcr php php vendor/bin/ecs check - dcr php composer ecs - dcr php php vendor/bin/ecs check --fix - dcr php composer ecsf + dcr php composer cs + dcr php composer csf dcr node npm run lint dcr node npm run lintf diff --git a/server.php b/server.php deleted file mode 100644 index e9497b7..0000000 --- a/server.php +++ /dev/null @@ -1,11 +0,0 @@ - Date: Fri, 1 Apr 2022 08:35:14 +0200 Subject: [PATCH 2/5] #5 - (php) Bump laravel/tinker from 2.7.1 to 2.7.2 (#102) * #5 - (php) Bump laravel/tinker from 2.7.1 to 2.7.2 Bumps [laravel/tinker](https://github.com/laravel/tinker) from 2.7.1 to 2.7.2. - [Release notes](https://github.com/laravel/tinker/releases) - [Changelog](https://github.com/laravel/tinker/blob/2.x/CHANGELOG.md) - [Commits](https://github.com/laravel/tinker/compare/v2.7.1...v2.7.2) --- updated-dependencies: - dependency-name: laravel/tinker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * #5 - bump dependencies Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Adrian Hopek --- composer.lock | 165 +++++++++++++++++++++++----------------------- package-lock.json | 28 ++++---- package.json | 4 +- 3 files changed, 98 insertions(+), 99 deletions(-) diff --git a/composer.lock b/composer.lock index e0852f3..76dbff0 100644 --- a/composer.lock +++ b/composer.lock @@ -515,16 +515,16 @@ }, { "name": "dompdf/dompdf", - "version": "v1.2.0", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/dompdf/dompdf.git", - "reference": "60b704331479a69e9bcdb3496da2315b5c4f94fd" + "reference": "c6dfd9bb8b0040609f04754f729d4cb3016e0575" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/60b704331479a69e9bcdb3496da2315b5c4f94fd", - "reference": "60b704331479a69e9bcdb3496da2315b5c4f94fd", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/c6dfd9bb8b0040609f04754f729d4cb3016e0575", + "reference": "c6dfd9bb8b0040609f04754f729d4cb3016e0575", "shasum": "" }, "require": { @@ -576,9 +576,9 @@ "homepage": "https://github.com/dompdf/dompdf", "support": { "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/v1.2.0" + "source": "https://github.com/dompdf/dompdf/tree/v1.2.1" }, - "time": "2022-02-07T13:02:10+00:00" + "time": "2022-03-24T12:57:42+00:00" }, { "name": "dragonmantank/cron-expression", @@ -1093,16 +1093,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.240.0", + "version": "v0.241.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "c6d39cda24d7ada02ecf8c464a1c8adb02607ba7" + "reference": "b4ba0dbcffa9ae30cf09ad3f8597f1374098acbf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/c6d39cda24d7ada02ecf8c464a1c8adb02607ba7", - "reference": "c6d39cda24d7ada02ecf8c464a1c8adb02607ba7", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/b4ba0dbcffa9ae30cf09ad3f8597f1374098acbf", + "reference": "b4ba0dbcffa9ae30cf09ad3f8597f1374098acbf", "shasum": "" }, "require": { @@ -1131,29 +1131,29 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.240.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.241.0" }, - "time": "2022-03-21T01:20:11+00:00" + "time": "2022-03-28T00:56:15+00:00" }, { "name": "google/auth", - "version": "v1.18.0", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-auth-library-php.git", - "reference": "21dd478e77b0634ed9e3a68613f74ed250ca9347" + "reference": "31e5d24d5fa0eaf6adc7e596292dc4732f4b60c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/21dd478e77b0634ed9e3a68613f74ed250ca9347", - "reference": "21dd478e77b0634ed9e3a68613f74ed250ca9347", + "url": "https://api.github.com/repos/googleapis/google-auth-library-php/zipball/31e5d24d5fa0eaf6adc7e596292dc4732f4b60c5", + "reference": "31e5d24d5fa0eaf6adc7e596292dc4732f4b60c5", "shasum": "" }, "require": { - "firebase/php-jwt": "~2.0|~3.0|~4.0|~5.0", - "guzzlehttp/guzzle": "^5.3.1|^6.2.1|^7.0", + "firebase/php-jwt": "~5.0", + "guzzlehttp/guzzle": "^6.2.1|^7.0", "guzzlehttp/psr7": "^1.7|^2.0", - "php": ">=5.4", + "php": ">=5.6", "psr/cache": "^1.0|^2.0", "psr/http-message": "^1.0" }, @@ -1161,8 +1161,10 @@ "guzzlehttp/promises": "0.1.1|^1.3", "kelvinmo/simplejwt": "^0.2.5|^0.5.1", "phpseclib/phpseclib": "^2.0.31", - "phpunit/phpunit": "^4.8.36|^5.7", - "sebastian/comparator": ">=1.2.3" + "phpspec/prophecy-phpunit": "^1.1", + "phpunit/phpunit": "^5.7||^8.5.13", + "sebastian/comparator": ">=1.2.3", + "squizlabs/php_codesniffer": "^3.5" }, "suggest": { "phpseclib/phpseclib": "May be used in place of OpenSSL for signing strings or for token management. Please require version ^2." @@ -1185,11 +1187,11 @@ "oauth2" ], "support": { - "docs": "https://googleapis.github.io/google-auth-library-php/master/", + "docs": "https://googleapis.github.io/google-auth-library-php/main/", "issues": "https://github.com/googleapis/google-auth-library-php/issues", - "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.18.0" + "source": "https://github.com/googleapis/google-auth-library-php/tree/v1.19.0" }, - "time": "2021-08-24T18:03:18+00:00" + "time": "2022-03-24T21:22:45+00:00" }, { "name": "graham-campbell/result-type", @@ -1731,16 +1733,16 @@ }, { "name": "laravel/framework", - "version": "v9.5.1", + "version": "v9.6.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "35be2599c9ac3d58bf1578895c2e85ea4848a0d7" + "reference": "47940a1a8774b96696ed57e6736ccea4a880c057" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/35be2599c9ac3d58bf1578895c2e85ea4848a0d7", - "reference": "35be2599c9ac3d58bf1578895c2e85ea4848a0d7", + "url": "https://api.github.com/repos/laravel/framework/zipball/47940a1a8774b96696ed57e6736ccea4a880c057", + "reference": "47940a1a8774b96696ed57e6736ccea4a880c057", "shasum": "" }, "require": { @@ -1906,24 +1908,25 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-03-15T14:41:19+00:00" + "time": "2022-03-29T14:41:26+00:00" }, { "name": "laravel/sanctum", - "version": "v2.14.2", + "version": "v2.15.0", "source": { "type": "git", "url": "https://github.com/laravel/sanctum.git", - "reference": "dc5d749ba9bfcfd68d8f5c272238f88bea223e66" + "reference": "5be160413b6f37dcf8758663edeab12d0e806f56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sanctum/zipball/dc5d749ba9bfcfd68d8f5c272238f88bea223e66", - "reference": "dc5d749ba9bfcfd68d8f5c272238f88bea223e66", + "url": "https://api.github.com/repos/laravel/sanctum/zipball/5be160413b6f37dcf8758663edeab12d0e806f56", + "reference": "5be160413b6f37dcf8758663edeab12d0e806f56", "shasum": "" }, "require": { "ext-json": "*", + "illuminate/console": "^6.9|^7.0|^8.0|^9.0", "illuminate/contracts": "^6.9|^7.0|^8.0|^9.0", "illuminate/database": "^6.9|^7.0|^8.0|^9.0", "illuminate/support": "^6.9|^7.0|^8.0|^9.0", @@ -1970,7 +1973,7 @@ "issues": "https://github.com/laravel/sanctum/issues", "source": "https://github.com/laravel/sanctum" }, - "time": "2022-02-16T14:40:23+00:00" + "time": "2022-03-28T13:53:05+00:00" }, { "name": "laravel/serializable-closure", @@ -2102,16 +2105,16 @@ }, { "name": "laravel/telescope", - "version": "v4.8.0", + "version": "v4.8.1", "source": { "type": "git", "url": "https://github.com/laravel/telescope.git", - "reference": "eac91c87ad9326e8a9eff14e24128d35766fc73d" + "reference": "2c61ad4a1d1366f2829cbe3d50d004cef7dfc691" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/telescope/zipball/eac91c87ad9326e8a9eff14e24128d35766fc73d", - "reference": "eac91c87ad9326e8a9eff14e24128d35766fc73d", + "url": "https://api.github.com/repos/laravel/telescope/zipball/2c61ad4a1d1366f2829cbe3d50d004cef7dfc691", + "reference": "2c61ad4a1d1366f2829cbe3d50d004cef7dfc691", "shasum": "" }, "require": { @@ -2164,22 +2167,22 @@ ], "support": { "issues": "https://github.com/laravel/telescope/issues", - "source": "https://github.com/laravel/telescope/tree/v4.8.0" + "source": "https://github.com/laravel/telescope/tree/v4.8.1" }, - "time": "2022-03-14T19:55:48+00:00" + "time": "2022-03-26T16:04:21+00:00" }, { "name": "laravel/tinker", - "version": "v2.7.1", + "version": "v2.7.2", "source": { "type": "git", "url": "https://github.com/laravel/tinker.git", - "reference": "1e2d500585a4e546346fadd3adc6f9c1a97e15f4" + "reference": "dff39b661e827dae6e092412f976658df82dbac5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/tinker/zipball/1e2d500585a4e546346fadd3adc6f9c1a97e15f4", - "reference": "1e2d500585a4e546346fadd3adc6f9c1a97e15f4", + "url": "https://api.github.com/repos/laravel/tinker/zipball/dff39b661e827dae6e092412f976658df82dbac5", + "reference": "dff39b661e827dae6e092412f976658df82dbac5", "shasum": "" }, "require": { @@ -2232,9 +2235,9 @@ ], "support": { "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.7.1" + "source": "https://github.com/laravel/tinker/tree/v2.7.2" }, - "time": "2022-03-15T15:25:01+00:00" + "time": "2022-03-23T12:38:24+00:00" }, { "name": "lasserafn/php-initial-avatar-generator", @@ -2809,16 +2812,16 @@ }, { "name": "maatwebsite/excel", - "version": "3.1.37", + "version": "3.1.38", "source": { "type": "git", "url": "https://github.com/SpartnerNL/Laravel-Excel.git", - "reference": "49ccd4142d3d7bce492d6bfb9dd9a27b12935408" + "reference": "dff132ce4d30b19863f4e84de1613fca99604992" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/49ccd4142d3d7bce492d6bfb9dd9a27b12935408", - "reference": "49ccd4142d3d7bce492d6bfb9dd9a27b12935408", + "url": "https://api.github.com/repos/SpartnerNL/Laravel-Excel/zipball/dff132ce4d30b19863f4e84de1613fca99604992", + "reference": "dff132ce4d30b19863f4e84de1613fca99604992", "shasum": "" }, "require": { @@ -2871,7 +2874,7 @@ ], "support": { "issues": "https://github.com/SpartnerNL/Laravel-Excel/issues", - "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.37" + "source": "https://github.com/SpartnerNL/Laravel-Excel/tree/3.1.38" }, "funding": [ { @@ -2883,7 +2886,7 @@ "type": "github" } ], - "time": "2022-02-28T10:20:04+00:00" + "time": "2022-03-24T16:00:29+00:00" }, { "name": "maennchen/zipstream-php", @@ -4817,25 +4820,24 @@ }, { "name": "ramsey/uuid", - "version": "4.2.3", + "version": "4.3.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df" + "reference": "8505afd4fea63b81a85d3b7b53ac3cb8dc347c28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df", - "reference": "fc9bb7fb5388691fd7373cd44dcb4d63bbcf24df", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/8505afd4fea63b81a85d3b7b53ac3cb8dc347c28", + "reference": "8505afd4fea63b81a85d3b7b53ac3cb8dc347c28", "shasum": "" }, "require": { "brick/math": "^0.8 || ^0.9", + "ext-ctype": "*", "ext-json": "*", - "php": "^7.2 || ^8.0", - "ramsey/collection": "^1.0", - "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-php80": "^1.14" + "php": "^8.0", + "ramsey/collection": "^1.0" }, "replace": { "rhumsaa/uuid": "self.version" @@ -4872,9 +4874,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "4.x-dev" - }, "captainhook": { "force-install": true } @@ -4899,7 +4898,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.2.3" + "source": "https://github.com/ramsey/uuid/tree/4.3.1" }, "funding": [ { @@ -4911,7 +4910,7 @@ "type": "tidelift" } ], - "time": "2021-09-25T23:10:38+00:00" + "time": "2022-03-27T21:42:02+00:00" }, { "name": "sabberworm/php-css-parser", @@ -8265,16 +8264,16 @@ }, { "name": "laravel/dusk", - "version": "v6.22.1", + "version": "v6.22.2", "source": { "type": "git", "url": "https://github.com/laravel/dusk.git", - "reference": "bc9fd27ea167746ba0616a7661e6b5bd4a80c472" + "reference": "f62afe10fd37c96b1e1e9afe17174961cc2b0f0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/dusk/zipball/bc9fd27ea167746ba0616a7661e6b5bd4a80c472", - "reference": "bc9fd27ea167746ba0616a7661e6b5bd4a80c472", + "url": "https://api.github.com/repos/laravel/dusk/zipball/f62afe10fd37c96b1e1e9afe17174961cc2b0f0a", + "reference": "f62afe10fd37c96b1e1e9afe17174961cc2b0f0a", "shasum": "" }, "require": { @@ -8332,9 +8331,9 @@ ], "support": { "issues": "https://github.com/laravel/dusk/issues", - "source": "https://github.com/laravel/dusk/tree/v6.22.1" + "source": "https://github.com/laravel/dusk/tree/v6.22.2" }, - "time": "2022-02-12T17:43:36+00:00" + "time": "2022-03-24T14:57:29+00:00" }, { "name": "mockery/mockery", @@ -8894,16 +8893,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706" + "reference": "77a32518733312af16a44300404e945338981de3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/93ebd0014cab80c4ea9f5e297ea48672f1b87706", - "reference": "93ebd0014cab80c4ea9f5e297ea48672f1b87706", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", + "reference": "77a32518733312af16a44300404e945338981de3", "shasum": "" }, "require": { @@ -8938,9 +8937,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.6.1" }, - "time": "2022-01-04T19:58:01+00:00" + "time": "2022-03-15T21:29:03+00:00" }, { "name": "phpspec/prophecy", @@ -10522,16 +10521,16 @@ }, { "name": "spatie/ignition", - "version": "1.2.6", + "version": "1.2.7", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "be24d33a9de271638314924b5da85e168e4148e4" + "reference": "2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/be24d33a9de271638314924b5da85e168e4148e4", - "reference": "be24d33a9de271638314924b5da85e168e4148e4", + "url": "https://api.github.com/repos/spatie/ignition/zipball/2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2", + "reference": "2f059cf42b48f7c522efbba1c05ad59fc2c1a3f2", "shasum": "" }, "require": { @@ -10588,7 +10587,7 @@ "type": "github" } ], - "time": "2022-03-23T11:02:14+00:00" + "time": "2022-03-29T08:48:34+00:00" }, { "name": "spatie/laravel-ignition", @@ -10931,5 +10930,5 @@ "ext-redis": "*" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.1.0" } diff --git a/package-lock.json b/package-lock.json index 6e6fd67..d3ebfdd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@vue/compiler-sfc": "^3.2.31", "autoprefixer": "^10.4.4", "axios": "^0.26.1", - "echarts": "^5.3.1", + "echarts": "^5.3.2", "eslit": "^6.0.0", "flatpickr": "^4.6.11", "laravel-mix": "^6.0.43", @@ -33,7 +33,7 @@ "vue3-popper": "^1.4.2" }, "devDependencies": { - "eslint": "^8.11.0", + "eslint": "^8.12.0", "eslint-plugin-tailwindcss": "^3.5.0", "eslint-plugin-vue": "^8.5.0" } @@ -4166,9 +4166,9 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==" }, "node_modules/echarts": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.1.tgz", - "integrity": "sha512-nWdlbgX3OVY0hpqncSvp0gDt1FRSKWn7lsWEH+PHmfCuvE0QmSw17pczQvm8AvawnLEkmf1Cts7YwQJZNC0AEQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.2.tgz", + "integrity": "sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ==", "dependencies": { "tslib": "2.3.0", "zrender": "5.3.1" @@ -4294,9 +4294,9 @@ } }, "node_modules/eslint": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz", - "integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz", + "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==", "dev": true, "dependencies": { "@eslint/eslintrc": "^1.2.1", @@ -12753,9 +12753,9 @@ "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==" }, "echarts": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.1.tgz", - "integrity": "sha512-nWdlbgX3OVY0hpqncSvp0gDt1FRSKWn7lsWEH+PHmfCuvE0QmSw17pczQvm8AvawnLEkmf1Cts7YwQJZNC0AEQ==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.3.2.tgz", + "integrity": "sha512-LWCt7ohOKdJqyiBJ0OGBmE9szLdfA9sGcsMEi+GGoc6+Xo75C+BkcT/6NNGRHAWtnQl2fNow05AQjznpap28TQ==", "requires": { "tslib": "2.3.0", "zrender": "5.3.1" @@ -12856,9 +12856,9 @@ "dev": true }, "eslint": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.11.0.tgz", - "integrity": "sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==", + "version": "8.12.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz", + "integrity": "sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q==", "dev": true, "requires": { "@eslint/eslintrc": "^1.2.1", diff --git a/package.json b/package.json index decb2c6..c0cf72c 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@vue/compiler-sfc": "^3.2.31", "autoprefixer": "^10.4.4", "axios": "^0.26.1", - "echarts": "^5.3.1", + "echarts": "^5.3.2", "eslit": "^6.0.0", "flatpickr": "^4.6.11", "laravel-mix": "^6.0.43", @@ -40,7 +40,7 @@ "vue3-popper": "^1.4.2" }, "devDependencies": { - "eslint": "^8.11.0", + "eslint": "^8.12.0", "eslint-plugin-tailwindcss": "^3.5.0", "eslint-plugin-vue": "^8.5.0" } From b52d2065540556695324601e6ad647a63c692075 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Mon, 4 Apr 2022 08:39:25 +0200 Subject: [PATCH 3/5] change order of release phase commands (#104) --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 6cf46a6..2d5c592 100644 --- a/Procfile +++ b/Procfile @@ -1,3 +1,3 @@ web: vendor/bin/heroku-php-nginx -C environment/prod/nginx.conf public/ -release: php artisan migrate --force && php artisan cache:clear && php artisan config:cache +release: php artisan config:cache && php artisan route:cache && php artisan migrate --force worker: php artisan queue:work From 1ae23bd7cbd6877aa00e3ab9c28ec3e252cddc80 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Mon, 4 Apr 2022 12:25:19 +0200 Subject: [PATCH 4/5] #48 - fix heroku deploy (#105) * wip * wip * wip * wip * wip * wip --- composer.json | 2 +- composer.lock | 223 +++++++++++++++++++++++++------------------------- 2 files changed, 113 insertions(+), 112 deletions(-) diff --git a/composer.json b/composer.json index 0d0c708..4b93ea8 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "inertiajs/inertia-laravel": "^0.5.1", - "laravel/framework": "^9.0", + "laravel/framework": "9.5.*", "laravel/sanctum": "^2.14", "laravel/socialite": "^5.2", "laravel/telescope": "^4.6", diff --git a/composer.lock b/composer.lock index 76dbff0..fa5f92e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ba952c1eae2c9ac3c3dea37f7c93b7cb", + "content-hash": "ddfd3d1584b1412a4b1d9c95d8cb9a31", "packages": [ { "name": "asm89/stack-cors", @@ -1093,16 +1093,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.241.0", + "version": "v0.242.0", "source": { "type": "git", "url": "https://github.com/googleapis/google-api-php-client-services.git", - "reference": "b4ba0dbcffa9ae30cf09ad3f8597f1374098acbf" + "reference": "73d4c0ed4b241e7396699e0ee1d1cdebabac25e8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/b4ba0dbcffa9ae30cf09ad3f8597f1374098acbf", - "reference": "b4ba0dbcffa9ae30cf09ad3f8597f1374098acbf", + "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/73d4c0ed4b241e7396699e0ee1d1cdebabac25e8", + "reference": "73d4c0ed4b241e7396699e0ee1d1cdebabac25e8", "shasum": "" }, "require": { @@ -1131,9 +1131,9 @@ ], "support": { "issues": "https://github.com/googleapis/google-api-php-client-services/issues", - "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.241.0" + "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.242.0" }, - "time": "2022-03-28T00:56:15+00:00" + "time": "2022-04-03T01:24:10+00:00" }, { "name": "google/auth", @@ -1733,16 +1733,16 @@ }, { "name": "laravel/framework", - "version": "v9.6.0", + "version": "v9.5.1", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "47940a1a8774b96696ed57e6736ccea4a880c057" + "reference": "35be2599c9ac3d58bf1578895c2e85ea4848a0d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/47940a1a8774b96696ed57e6736ccea4a880c057", - "reference": "47940a1a8774b96696ed57e6736ccea4a880c057", + "url": "https://api.github.com/repos/laravel/framework/zipball/35be2599c9ac3d58bf1578895c2e85ea4848a0d7", + "reference": "35be2599c9ac3d58bf1578895c2e85ea4848a0d7", "shasum": "" }, "require": { @@ -1908,7 +1908,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-03-29T14:41:26+00:00" + "time": "2022-03-15T14:41:19+00:00" }, { "name": "laravel/sanctum", @@ -2590,16 +2590,16 @@ }, { "name": "league/flysystem", - "version": "3.0.12", + "version": "3.0.13", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "4744d96fb2456d9808be3ad596a2520b902996e2" + "reference": "15dc1ccb2db8daef507c4d3e501565bae42a9f0e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/4744d96fb2456d9808be3ad596a2520b902996e2", - "reference": "4744d96fb2456d9808be3ad596a2520b902996e2", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/15dc1ccb2db8daef507c4d3e501565bae42a9f0e", + "reference": "15dc1ccb2db8daef507c4d3e501565bae42a9f0e", "shasum": "" }, "require": { @@ -2660,7 +2660,7 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.0.12" + "source": "https://github.com/thephpleague/flysystem/tree/3.0.13" }, "funding": [ { @@ -2676,7 +2676,7 @@ "type": "tidelift" } ], - "time": "2022-03-12T19:32:12+00:00" + "time": "2022-04-02T08:55:13+00:00" }, { "name": "league/mime-type-detection", @@ -4031,16 +4031,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "3.0.13", + "version": "3.0.14", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e" + "reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/1443ab79364eea48665fa8c09ac67f37d1025f7e", - "reference": "1443ab79364eea48665fa8c09ac67f37d1025f7e", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/2f0b7af658cbea265cbb4a791d6c29a6613f98ef", + "reference": "2f0b7af658cbea265cbb4a791d6c29a6613f98ef", "shasum": "" }, "require": { @@ -4049,9 +4049,7 @@ "php": ">=5.6.1" }, "require-dev": { - "phing/phing": "~2.7", - "phpunit/phpunit": "^5.7|^6.0|^9.4", - "squizlabs/php_codesniffer": "~2.0" + "phpunit/phpunit": "*" }, "suggest": { "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.", @@ -4122,7 +4120,7 @@ ], "support": { "issues": "https://github.com/phpseclib/phpseclib/issues", - "source": "https://github.com/phpseclib/phpseclib/tree/3.0.13" + "source": "https://github.com/phpseclib/phpseclib/tree/3.0.14" }, "funding": [ { @@ -4138,7 +4136,7 @@ "type": "tidelift" } ], - "time": "2022-01-30T08:50:05+00:00" + "time": "2022-04-04T05:15:45+00:00" }, { "name": "psr/cache", @@ -5175,16 +5173,16 @@ }, { "name": "symfony/console", - "version": "v6.0.5", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "3bebf4108b9e07492a2a4057d207aa5a77d146b1" + "reference": "70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/3bebf4108b9e07492a2a4057d207aa5a77d146b1", - "reference": "3bebf4108b9e07492a2a4057d207aa5a77d146b1", + "url": "https://api.github.com/repos/symfony/console/zipball/70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e", + "reference": "70dcf7b2ca2ea08ad6ebcc475f104a024fb5632e", "shasum": "" }, "require": { @@ -5250,7 +5248,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.0.5" + "source": "https://github.com/symfony/console/tree/v6.0.7" }, "funding": [ { @@ -5266,7 +5264,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T10:48:52+00:00" + "time": "2022-03-31T17:18:25+00:00" }, { "name": "symfony/css-selector", @@ -5402,16 +5400,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.0.3", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "20343b3bad7ebafa38138ddcb97290a24722b57b" + "reference": "e600c54e5b30555eecea3ffe4314e58f832e78ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/20343b3bad7ebafa38138ddcb97290a24722b57b", - "reference": "20343b3bad7ebafa38138ddcb97290a24722b57b", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/e600c54e5b30555eecea3ffe4314e58f832e78ee", + "reference": "e600c54e5b30555eecea3ffe4314e58f832e78ee", "shasum": "" }, "require": { @@ -5453,7 +5451,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.0.3" + "source": "https://github.com/symfony/error-handler/tree/v6.0.7" }, "funding": [ { @@ -5469,7 +5467,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-03-18T16:21:55+00:00" }, { "name": "symfony/event-dispatcher", @@ -5696,16 +5694,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.0.6", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "a000fcf2298a1bc79a1dcff22608792506534719" + "reference": "c816b26f03b6902dba79b352c84a17f53d815f0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a000fcf2298a1bc79a1dcff22608792506534719", - "reference": "a000fcf2298a1bc79a1dcff22608792506534719", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/c816b26f03b6902dba79b352c84a17f53d815f0d", + "reference": "c816b26f03b6902dba79b352c84a17f53d815f0d", "shasum": "" }, "require": { @@ -5748,7 +5746,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.0.6" + "source": "https://github.com/symfony/http-foundation/tree/v6.0.7" }, "funding": [ { @@ -5764,20 +5762,20 @@ "type": "tidelift" } ], - "time": "2022-03-05T21:04:00+00:00" + "time": "2022-03-24T14:13:59+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.0.6", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "f9e49ad9fe16895b24cd7a09dc28d3364282e21a" + "reference": "9c03dab07a6aa336ffaadc15352b1d14f4ce01f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/f9e49ad9fe16895b24cd7a09dc28d3364282e21a", - "reference": "f9e49ad9fe16895b24cd7a09dc28d3364282e21a", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9c03dab07a6aa336ffaadc15352b1d14f4ce01f5", + "reference": "9c03dab07a6aa336ffaadc15352b1d14f4ce01f5", "shasum": "" }, "require": { @@ -5857,7 +5855,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.0.6" + "source": "https://github.com/symfony/http-kernel/tree/v6.0.7" }, "funding": [ { @@ -5873,20 +5871,20 @@ "type": "tidelift" } ], - "time": "2022-03-05T21:19:20+00:00" + "time": "2022-04-02T06:35:11+00:00" }, { "name": "symfony/mailer", - "version": "v6.0.5", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "0f4772db6521a1beb44529aa2c0c1e56f671be8f" + "reference": "f7343f94e7afecca2ad840b078f9d80200e1bd27" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/0f4772db6521a1beb44529aa2c0c1e56f671be8f", - "reference": "0f4772db6521a1beb44529aa2c0c1e56f671be8f", + "url": "https://api.github.com/repos/symfony/mailer/zipball/f7343f94e7afecca2ad840b078f9d80200e1bd27", + "reference": "f7343f94e7afecca2ad840b078f9d80200e1bd27", "shasum": "" }, "require": { @@ -5931,7 +5929,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.0.5" + "source": "https://github.com/symfony/mailer/tree/v6.0.7" }, "funding": [ { @@ -5947,20 +5945,20 @@ "type": "tidelift" } ], - "time": "2022-02-25T10:48:52+00:00" + "time": "2022-03-18T16:06:28+00:00" }, { "name": "symfony/mime", - "version": "v6.0.3", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "2cd9601efd040e56f43360daa68f3c6b0534923a" + "reference": "74266e396f812a2301536397a6360b6e6913c0d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/2cd9601efd040e56f43360daa68f3c6b0534923a", - "reference": "2cd9601efd040e56f43360daa68f3c6b0534923a", + "url": "https://api.github.com/repos/symfony/mime/zipball/74266e396f812a2301536397a6360b6e6913c0d8", + "reference": "74266e396f812a2301536397a6360b6e6913c0d8", "shasum": "" }, "require": { @@ -6012,7 +6010,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.0.3" + "source": "https://github.com/symfony/mime/tree/v6.0.7" }, "funding": [ { @@ -6028,7 +6026,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-03-13T20:10:05+00:00" }, { "name": "symfony/polyfill-ctype", @@ -6687,16 +6685,16 @@ }, { "name": "symfony/process", - "version": "v6.0.5", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1" + "reference": "e13f6757e267d687e20ec5b26ccfcbbe511cd8f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/1ccceccc6497e96f4f646218f04b97ae7d9fa7a1", - "reference": "1ccceccc6497e96f4f646218f04b97ae7d9fa7a1", + "url": "https://api.github.com/repos/symfony/process/zipball/e13f6757e267d687e20ec5b26ccfcbbe511cd8f4", + "reference": "e13f6757e267d687e20ec5b26ccfcbbe511cd8f4", "shasum": "" }, "require": { @@ -6728,7 +6726,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.0.5" + "source": "https://github.com/symfony/process/tree/v6.0.7" }, "funding": [ { @@ -6744,7 +6742,7 @@ "type": "tidelift" } ], - "time": "2022-01-30T18:19:12+00:00" + "time": "2022-03-18T16:21:55+00:00" }, { "name": "symfony/routing", @@ -7003,16 +7001,16 @@ }, { "name": "symfony/translation", - "version": "v6.0.6", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "f6639cb9b5e0c57fe31e3263b900a77eedb0c908" + "reference": "b2792b39d74cf41ea3065f27fd2ddf0b556ac7a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/f6639cb9b5e0c57fe31e3263b900a77eedb0c908", - "reference": "f6639cb9b5e0c57fe31e3263b900a77eedb0c908", + "url": "https://api.github.com/repos/symfony/translation/zipball/b2792b39d74cf41ea3065f27fd2ddf0b556ac7a1", + "reference": "b2792b39d74cf41ea3065f27fd2ddf0b556ac7a1", "shasum": "" }, "require": { @@ -7078,7 +7076,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.0.6" + "source": "https://github.com/symfony/translation/tree/v6.0.7" }, "funding": [ { @@ -7094,7 +7092,7 @@ "type": "tidelift" } ], - "time": "2022-03-02T12:58:14+00:00" + "time": "2022-03-31T17:18:25+00:00" }, { "name": "symfony/translation-contracts", @@ -7531,16 +7529,16 @@ "packages-dev": [ { "name": "blumilksoftware/codestyle", - "version": "v1.0.0", + "version": "v1.0.1", "source": { "type": "git", "url": "https://github.com/blumilksoftware/codestyle.git", - "reference": "5e5e578e8f2cc2ee9296837047b3085eff66db3f" + "reference": "e86ebcd5175bc435d9c8d4f83bf201a6f5a9fc60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/blumilksoftware/codestyle/zipball/5e5e578e8f2cc2ee9296837047b3085eff66db3f", - "reference": "5e5e578e8f2cc2ee9296837047b3085eff66db3f", + "url": "https://api.github.com/repos/blumilksoftware/codestyle/zipball/e86ebcd5175bc435d9c8d4f83bf201a6f5a9fc60", + "reference": "e86ebcd5175bc435d9c8d4f83bf201a6f5a9fc60", "shasum": "" }, "require": { @@ -7572,9 +7570,9 @@ "description": "Blumilk codestyle configurator", "support": { "issues": "https://github.com/blumilksoftware/codestyle/issues", - "source": "https://github.com/blumilksoftware/codestyle/tree/v1.0.0" + "source": "https://github.com/blumilksoftware/codestyle/tree/v1.0.1" }, - "time": "2022-03-31T08:43:56+00:00" + "time": "2022-04-04T06:25:21+00:00" }, { "name": "composer/pcre", @@ -7649,16 +7647,16 @@ }, { "name": "composer/semver", - "version": "3.3.1", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "5d8e574bb0e69188786b8ef77d43341222a41a71" + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/5d8e574bb0e69188786b8ef77d43341222a41a71", - "reference": "5d8e574bb0e69188786b8ef77d43341222a41a71", + "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9", + "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9", "shasum": "" }, "require": { @@ -7710,7 +7708,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.3.1" + "source": "https://github.com/composer/semver/tree/3.3.2" }, "funding": [ { @@ -7726,7 +7724,7 @@ "type": "tidelift" } ], - "time": "2022-03-16T11:22:07+00:00" + "time": "2022-04-01T19:23:25+00:00" }, { "name": "composer/xdebug-handler", @@ -9328,16 +9326,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.19", + "version": "9.5.20", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807" + "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/35ea4b7f3acabb26f4bb640f8c30866c401da807", - "reference": "35ea4b7f3acabb26f4bb640f8c30866c401da807", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/12bc8879fb65aef2138b26fc633cb1e3620cffba", + "reference": "12bc8879fb65aef2138b26fc633cb1e3620cffba", "shasum": "" }, "require": { @@ -9415,7 +9413,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.20" }, "funding": [ { @@ -9427,7 +9425,7 @@ "type": "github" } ], - "time": "2022-03-15T09:57:31+00:00" + "time": "2022-04-01T12:37:26+00:00" }, { "name": "sebastian/cli-parser", @@ -9795,16 +9793,16 @@ }, { "name": "sebastian/environment", - "version": "5.1.3", + "version": "5.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac" + "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", - "reference": "388b6ced16caa751030f6a69e588299fa09200ac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1b5dff7bb151a4db11d49d90e5408e4e938270f7", + "reference": "1b5dff7bb151a4db11d49d90e5408e4e938270f7", "shasum": "" }, "require": { @@ -9846,7 +9844,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3" + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.4" }, "funding": [ { @@ -9854,7 +9852,7 @@ "type": "github" } ], - "time": "2020-09-28T05:52:38+00:00" + "time": "2022-04-03T09:37:03+00:00" }, { "name": "sebastian/exporter", @@ -10591,16 +10589,16 @@ }, { "name": "spatie/laravel-ignition", - "version": "1.1.1", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "f3243fd99351e0a79df6886a5354d8dd88d6d0d2" + "reference": "2b54c8c66f2d280f25e15064ebe3d5e3eda19820" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/f3243fd99351e0a79df6886a5354d8dd88d6d0d2", - "reference": "f3243fd99351e0a79df6886a5354d8dd88d6d0d2", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/2b54c8c66f2d280f25e15064ebe3d5e3eda19820", + "reference": "2b54c8c66f2d280f25e15064ebe3d5e3eda19820", "shasum": "" }, "require": { @@ -10639,6 +10637,9 @@ } }, "autoload": { + "files": [ + "src/helpers.php" + ], "psr-4": { "Spatie\\LaravelIgnition\\": "src" } @@ -10674,20 +10675,20 @@ "type": "github" } ], - "time": "2022-03-21T07:13:26+00:00" + "time": "2022-04-01T21:01:58+00:00" }, { "name": "symfony/filesystem", - "version": "v6.0.6", + "version": "v6.0.7", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "52b888523545b0b4049ab9ce48766802484d7046" + "reference": "6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/52b888523545b0b4049ab9ce48766802484d7046", - "reference": "52b888523545b0b4049ab9ce48766802484d7046", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff", + "reference": "6c9e4c41f2c51dfde3db298594ed9cba55dbf5ff", "shasum": "" }, "require": { @@ -10721,7 +10722,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.0.6" + "source": "https://github.com/symfony/filesystem/tree/v6.0.7" }, "funding": [ { @@ -10737,7 +10738,7 @@ "type": "tidelift" } ], - "time": "2022-03-02T12:58:14+00:00" + "time": "2022-04-01T12:54:51+00:00" }, { "name": "symfony/options-resolver", @@ -10930,5 +10931,5 @@ "ext-redis": "*" }, "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } From 3ab02f1df423f2cf74d2e46fe6c912f7e3bd596e Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Mon, 4 Apr 2022 15:02:22 +0200 Subject: [PATCH 5/5] - change document numbering system (#106) --- .../Providers/ObserverServiceProvider.php | 3 ++ app/Eloquent/Models/VacationRequest.php | 5 --- app/Eloquent/Models/YearPeriod.php | 6 ++++ .../Observers/VacationRequestObserver.php | 18 ++++++++++ .../RebuildDocumentNumberingSystem.php | 34 +++++++++++++++++++ ...name_column_in_vacation_requests_table.php | 23 +++++++++++++ 6 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 app/Eloquent/Observers/VacationRequestObserver.php create mode 100644 app/Infrastructure/Console/Commands/RebuildDocumentNumberingSystem.php create mode 100644 database/migrations/2022_04_04_135927_add_name_column_in_vacation_requests_table.php diff --git a/app/Architecture/Providers/ObserverServiceProvider.php b/app/Architecture/Providers/ObserverServiceProvider.php index 0a7dfa6..79bd86e 100644 --- a/app/Architecture/Providers/ObserverServiceProvider.php +++ b/app/Architecture/Providers/ObserverServiceProvider.php @@ -6,12 +6,15 @@ namespace Toby\Architecture\Providers; use Illuminate\Support\ServiceProvider; use Toby\Eloquent\Models\User; +use Toby\Eloquent\Models\VacationRequest; use Toby\Eloquent\Observers\UserObserver; +use Toby\Eloquent\Observers\VacationRequestObserver; class ObserverServiceProvider extends ServiceProvider { public function boot(): void { User::observe(UserObserver::class); + VacationRequest::observe(VacationRequestObserver::class); } } diff --git a/app/Eloquent/Models/VacationRequest.php b/app/Eloquent/Models/VacationRequest.php index e85708f..46bd084 100644 --- a/app/Eloquent/Models/VacationRequest.php +++ b/app/Eloquent/Models/VacationRequest.php @@ -91,11 +91,6 @@ class VacationRequest extends Model ->where("to", ">=", $vacationRequest->from); } - public function getNameAttribute(): string - { - return "{$this->id}/{$this->yearPeriod->year}"; - } - public function hasFlowSkipped(): bool { return $this->flow_skipped; diff --git a/app/Eloquent/Models/YearPeriod.php b/app/Eloquent/Models/YearPeriod.php index ae57938..7976fca 100644 --- a/app/Eloquent/Models/YearPeriod.php +++ b/app/Eloquent/Models/YearPeriod.php @@ -15,6 +15,7 @@ use Illuminate\Support\Collection; * @property int $id * @property int $year * @property Collection $vacationLimits + * @property Collection $vacationRequests * @property Collection $holidays */ class YearPeriod extends Model @@ -41,6 +42,11 @@ class YearPeriod extends Model return $this->hasMany(VacationLimit::class); } + public function vacationRequests(): HasMany + { + return $this->hasMany(VacationRequest::class); + } + public function holidays(): HasMany { return $this->hasMany(Holiday::class); diff --git a/app/Eloquent/Observers/VacationRequestObserver.php b/app/Eloquent/Observers/VacationRequestObserver.php new file mode 100644 index 0000000..30060c9 --- /dev/null +++ b/app/Eloquent/Observers/VacationRequestObserver.php @@ -0,0 +1,18 @@ +yearPeriod->vacationRequests()->count(); + $number = $count + 1; + + $vacationRequest->name = "{$number}/{$vacationRequest->yearPeriod->year}"; + } +} diff --git a/app/Infrastructure/Console/Commands/RebuildDocumentNumberingSystem.php b/app/Infrastructure/Console/Commands/RebuildDocumentNumberingSystem.php new file mode 100644 index 0000000..96dbb39 --- /dev/null +++ b/app/Infrastructure/Console/Commands/RebuildDocumentNumberingSystem.php @@ -0,0 +1,34 @@ +vacationRequests() + ->oldest() + ->get(); + + foreach ($vacationRequests as $vacationRequest) { + $vacationRequest->update(["name" => "{$number}/{$yearPeriod->year}"]); + + $number++; + } + } + } +} diff --git a/database/migrations/2022_04_04_135927_add_name_column_in_vacation_requests_table.php b/database/migrations/2022_04_04_135927_add_name_column_in_vacation_requests_table.php new file mode 100644 index 0000000..ef9e691 --- /dev/null +++ b/database/migrations/2022_04_04_135927_add_name_column_in_vacation_requests_table.php @@ -0,0 +1,23 @@ +string("name")->nullable(); + }); + } + + public function down(): void + { + Schema::table("vacation_requests", function (Blueprint $table): void { + $table->dropColumn("name"); + }); + } +};