From 78c2703a2b23240d1a32123bc2f8e15609294f3d Mon Sep 17 00:00:00 2001 From: cp6 Date: Mon, 26 Sep 2022 13:22:52 +1000 Subject: [PATCH 01/19] Added doctrine/dbal Added doctrine/dbal --- composer.json | 3 +- composer.lock | 1625 ++++++++++++++++++++++++++++++------------------- 2 files changed, 1000 insertions(+), 628 deletions(-) diff --git a/composer.json b/composer.json index cc4133c..5538ab7 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,8 @@ "laravel/tinker": "^2.7", "laravel/ui": "^3.4", "yajra/laravel-datatables-oracle": "~9.20", - "ext-json": "*" + "ext-json": "*", + "doctrine/dbal": "v3.4" }, "require-dev": { "fakerphp/faker": "^1.19.0", diff --git a/composer.lock b/composer.lock index e40a37b..59f8b03 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": "55798c5a176c5e23380eb4562240a5ec", + "content-hash": "823354ab53adfd62c8498eceb35e4470", "packages": [ { "name": "asm89/stack-cors", @@ -64,26 +64,26 @@ }, { "name": "brick/math", - "version": "0.9.3", + "version": "0.10.2", "source": { "type": "git", "url": "https://github.com/brick/math.git", - "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae" + "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brick/math/zipball/ca57d18f028f84f777b2168cd1911b0dee2343ae", - "reference": "ca57d18f028f84f777b2168cd1911b0dee2343ae", + "url": "https://api.github.com/repos/brick/math/zipball/459f2781e1a08d52ee56b0b1444086e038561e3f", + "reference": "459f2781e1a08d52ee56b0b1444086e038561e3f", "shasum": "" }, "require": { "ext-json": "*", - "php": "^7.1 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "php-coveralls/php-coveralls": "^2.2", - "phpunit/phpunit": "^7.5.15 || ^8.5 || ^9.0", - "vimeo/psalm": "4.9.2" + "phpunit/phpunit": "^9.0", + "vimeo/psalm": "4.25.0" }, "type": "library", "autoload": { @@ -108,19 +108,15 @@ ], "support": { "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/0.9.3" + "source": "https://github.com/brick/math/tree/0.10.2" }, "funding": [ { "url": "https://github.com/BenMorel", "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/brick/math", - "type": "tidelift" } ], - "time": "2021-08-15T20:50:18+00:00" + "time": "2022-08-10T22:54:19+00:00" }, { "name": "dflydev/dot-access-data", @@ -198,29 +194,367 @@ "time": "2021-08-13T13:06:58+00:00" }, { - "name": "doctrine/inflector", - "version": "2.0.4", + "name": "doctrine/cache", + "version": "2.2.0", "source": { "type": "git", - "url": "https://github.com/doctrine/inflector.git", - "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89" + "url": "https://github.com/doctrine/cache.git", + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", - "reference": "8b7ff3e4b7de6b2c84da85637b59fd2880ecaa89", + "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb", + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb", + "shasum": "" + }, + "require": { + "php": "~7.1 || ^8.0" + }, + "conflict": { + "doctrine/common": ">2.2,<2.4" + }, + "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psr/cache": "^1.0 || ^2.0 || ^3.0", + "symfony/cache": "^4.4 || ^5.4 || ^6", + "symfony/var-exporter": "^4.4 || ^5.4 || ^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" + } + }, + "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": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.", + "homepage": "https://www.doctrine-project.org/projects/cache.html", + "keywords": [ + "abstraction", + "apcu", + "cache", + "caching", + "couchdb", + "memcached", + "php", + "redis", + "xcache" + ], + "support": { + "issues": "https://github.com/doctrine/cache/issues", + "source": "https://github.com/doctrine/cache/tree/2.2.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", + "type": "tidelift" + } + ], + "time": "2022-05-20T20:07:39+00:00" + }, + { + "name": "doctrine/dbal", + "version": "3.4.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal.git", + "reference": "118a360e9437e88d49024f36283c8bcbd76105f5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/118a360e9437e88d49024f36283c8bcbd76105f5", + "reference": "118a360e9437e88d49024f36283c8bcbd76105f5", + "shasum": "" + }, + "require": { + "composer-runtime-api": "^2", + "doctrine/cache": "^1.11|^2.0", + "doctrine/deprecations": "^0.5.3|^1", + "doctrine/event-manager": "^1.0", + "php": "^7.4 || ^8.0", + "psr/cache": "^1|^2|^3", + "psr/log": "^1|^2|^3" + }, + "require-dev": { + "doctrine/coding-standard": "9.0.0", + "jetbrains/phpstorm-stubs": "2022.1", + "phpstan/phpstan": "1.8.2", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "9.5.21", + "psalm/plugin-phpunit": "0.17.0", + "squizlabs/php_codesniffer": "3.7.1", + "symfony/cache": "^5.4|^6.0", + "symfony/console": "^4.4|^5.4|^6.0", + "vimeo/psalm": "4.24.0" + }, + "suggest": { + "symfony/console": "For helpful console commands such as SQL execution and import of files." + }, + "bin": [ + "bin/doctrine-dbal" + ], + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\DBAL\\": "src" + } + }, + "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" + } + ], + "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.", + "homepage": "https://www.doctrine-project.org/projects/dbal.html", + "keywords": [ + "abstraction", + "database", + "db2", + "dbal", + "mariadb", + "mssql", + "mysql", + "oci8", + "oracle", + "pdo", + "pgsql", + "postgresql", + "queryobject", + "sasql", + "sql", + "sqlite", + "sqlserver", + "sqlsrv" + ], + "support": { + "issues": "https://github.com/doctrine/dbal/issues", + "source": "https://github.com/doctrine/dbal/tree/3.4.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal", + "type": "tidelift" + } + ], + "time": "2022-08-06T20:35:57+00:00" + }, + { + "name": "doctrine/deprecations", + "version": "v1.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/deprecations.git", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "reference": "0e2a4f1f8cdfc7a92ec3b01c9334898c806b30de", + "shasum": "" + }, + "require": { + "php": "^7.1|^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5|^8.5|^9.5", + "psr/log": "^1|^2|^3" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/v1.0.0" + }, + "time": "2022-05-02T15:47:09+00:00" + }, + { + "name": "doctrine/event-manager", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/event-manager.git", + "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/eb2ecf80e3093e8f3c2769ac838e27d8ede8e683", + "reference": "eb2ecf80e3093e8f3c2769ac838e27d8ede8e683", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/common": "<2.9" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "~1.4.10 || ^1.5.4", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "vimeo/psalm": "^4.22" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "lib/Doctrine/Common" + } + }, + "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" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.", + "homepage": "https://www.doctrine-project.org/projects/event-manager.html", + "keywords": [ + "event", + "event dispatcher", + "event manager", + "event system", + "events" + ], + "support": { + "issues": "https://github.com/doctrine/event-manager/issues", + "source": "https://github.com/doctrine/event-manager/tree/1.1.2" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", + "type": "tidelift" + } + ], + "time": "2022-07-27T22:18:11+00:00" + }, + { + "name": "doctrine/inflector", + "version": "2.0.5", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "ade2b3bbfb776f27f0558e26eed43b5d9fe1b392" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/ade2b3bbfb776f27f0558e26eed43b5d9fe1b392", + "reference": "ade2b3bbfb776f27f0558e26eed43b5d9fe1b392", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^8.2", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", - "phpstan/phpstan-strict-rules": "^0.12", - "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", - "vimeo/psalm": "^4.10" + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25" }, "type": "library", "autoload": { @@ -270,7 +604,7 @@ ], "support": { "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.4" + "source": "https://github.com/doctrine/inflector/tree/2.0.5" }, "funding": [ { @@ -286,7 +620,7 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:16:43+00:00" + "time": "2022-09-07T09:01:28+00:00" }, { "name": "doctrine/lexer", @@ -366,16 +700,16 @@ }, { "name": "dragonmantank/cron-expression", - "version": "v3.3.1", + "version": "v3.3.2", "source": { "type": "git", "url": "https://github.com/dragonmantank/cron-expression.git", - "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa" + "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/be85b3f05b46c39bbc0d95f6c071ddff669510fa", - "reference": "be85b3f05b46c39bbc0d95f6c071ddff669510fa", + "url": "https://api.github.com/repos/dragonmantank/cron-expression/zipball/782ca5968ab8b954773518e9e49a6f892a34b2a8", + "reference": "782ca5968ab8b954773518e9e49a6f892a34b2a8", "shasum": "" }, "require": { @@ -415,7 +749,7 @@ ], "support": { "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.1" + "source": "https://github.com/dragonmantank/cron-expression/tree/v3.3.2" }, "funding": [ { @@ -423,7 +757,7 @@ "type": "github" } ], - "time": "2022-01-18T15:43:28+00:00" + "time": "2022-09-10T18:51:20+00:00" }, { "name": "egulias/email-validator", @@ -645,24 +979,24 @@ }, { "name": "graham-campbell/result-type", - "version": "v1.0.4", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Result-Type.git", - "reference": "0690bde05318336c7221785f2a932467f98b64ca" + "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/0690bde05318336c7221785f2a932467f98b64ca", - "reference": "0690bde05318336c7221785f2a932467f98b64ca", + "url": "https://api.github.com/repos/GrahamCampbell/Result-Type/zipball/a878d45c1914464426dc94da61c9e1d36ae262a8", + "reference": "a878d45c1914464426dc94da61c9e1d36ae262a8", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0", - "phpoption/phpoption": "^1.8" + "php": "^7.2.5 || ^8.0", + "phpoption/phpoption": "^1.9" }, "require-dev": { - "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + "phpunit/phpunit": "^8.5.28 || ^9.5.21" }, "type": "library", "autoload": { @@ -691,7 +1025,7 @@ ], "support": { "issues": "https://github.com/GrahamCampbell/Result-Type/issues", - "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.0.4" + "source": "https://github.com/GrahamCampbell/Result-Type/tree/v1.1.0" }, "funding": [ { @@ -703,20 +1037,20 @@ "type": "tidelift" } ], - "time": "2021-11-21T21:41:47+00:00" + "time": "2022-07-30T15:56:11+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.4.5", + "version": "7.5.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", - "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b50a2a1251152e43f6a37f0fa053e730a67d25ba", + "reference": "b50a2a1251152e43f6a37f0fa053e730a67d25ba", "shasum": "" }, "require": { @@ -731,10 +1065,10 @@ "psr/http-client-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", "php-http/client-integration-tests": "^3.0", - "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { @@ -744,8 +1078,12 @@ }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { - "dev-master": "7.4-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -811,7 +1149,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.4.5" + "source": "https://github.com/guzzle/guzzle/tree/7.5.0" }, "funding": [ { @@ -827,20 +1165,20 @@ "type": "tidelift" } ], - "time": "2022-06-20T22:16:13+00:00" + "time": "2022-08-28T15:39:27+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.1", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" + "reference": "b94b2807d85443f9719887892882d0329d1e2598" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", - "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", + "reference": "b94b2807d85443f9719887892882d0329d1e2598", "shasum": "" }, "require": { @@ -895,7 +1233,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.1" + "source": "https://github.com/guzzle/promises/tree/1.5.2" }, "funding": [ { @@ -911,20 +1249,20 @@ "type": "tidelift" } ], - "time": "2021-10-22T20:56:57+00:00" + "time": "2022-08-28T14:55:35+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.4.0", + "version": "2.4.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "13388f00956b1503577598873fffb5ae994b5737" + "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737", - "reference": "13388f00956b1503577598873fffb5ae994b5737", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/69568e4293f4fa993f3b0e51c9723e1e17c41379", + "reference": "69568e4293f4fa993f3b0e51c9723e1e17c41379", "shasum": "" }, "require": { @@ -938,15 +1276,19 @@ "psr/http-message-implementation": "1.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", + "bamarni/composer-bin-plugin": "^1.8.1", "http-interop/http-factory-tests": "^0.9", - "phpunit/phpunit": "^8.5.8 || ^9.3.10" + "phpunit/phpunit": "^8.5.29 || ^9.5.23" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": false + }, "branch-alias": { "dev-master": "2.4-dev" } @@ -1010,7 +1352,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.4.0" + "source": "https://github.com/guzzle/psr7/tree/2.4.1" }, "funding": [ { @@ -1026,20 +1368,20 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:11+00:00" + "time": "2022-08-28T14:45:39+00:00" }, { "name": "laravel/framework", - "version": "v9.19.0", + "version": "v9.31.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "bbce25bd823133f6a5a724f2d62680b711f1d0df" + "reference": "75013d4fffe3b24748d313fbbea53206351214f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/bbce25bd823133f6a5a724f2d62680b711f1d0df", - "reference": "bbce25bd823133f6a5a724f2d62680b711f1d0df", + "url": "https://api.github.com/repos/laravel/framework/zipball/75013d4fffe3b24748d313fbbea53206351214f7", + "reference": "75013d4fffe3b24748d313fbbea53206351214f7", "shasum": "" }, "require": { @@ -1054,12 +1396,13 @@ "league/flysystem": "^3.0.16", "monolog/monolog": "^2.0", "nesbot/carbon": "^2.53.1", + "nunomaduro/termwind": "^1.13", "php": "^8.0.2", "psr/container": "^1.1.1|^2.0.1", "psr/log": "^1.0|^2.0|^3.0", "psr/simple-cache": "^1.0|^2.0|^3.0", "ramsey/uuid": "^4.2.2", - "symfony/console": "^6.0", + "symfony/console": "^6.0.3", "symfony/error-handler": "^6.0", "symfony/finder": "^6.0", "symfony/http-foundation": "^6.0", @@ -1068,6 +1411,7 @@ "symfony/mime": "^6.0", "symfony/process": "^6.0", "symfony/routing": "^6.0", + "symfony/uid": "^6.0", "symfony/var-dumper": "^6.0", "tijsverkoyen/css-to-inline-styles": "^2.2.2", "vlucas/phpdotenv": "^5.4.1", @@ -1115,12 +1459,15 @@ "illuminate/view": "self.version" }, "require-dev": { + "ably/ably-php": "^1.0", "aws/aws-sdk-php": "^3.198.1", "doctrine/dbal": "^2.13.3|^3.1.4", "fakerphp/faker": "^1.9.2", "guzzlehttp/guzzle": "^7.2", "league/flysystem-aws-s3-v3": "^3.0", "league/flysystem-ftp": "^3.0", + "league/flysystem-path-prefixing": "^3.3", + "league/flysystem-read-only": "^3.3", "league/flysystem-sftp-v3": "^3.0", "mockery/mockery": "^1.4.4", "orchestra/testbench-core": "^7.1", @@ -1148,6 +1495,8 @@ "laravel/tinker": "Required to use the tinker console command (^2.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (^3.0).", "league/flysystem-ftp": "Required to use the Flysystem FTP driver (^3.0).", + "league/flysystem-path-prefixing": "Required to use the scoped driver (^3.3).", + "league/flysystem-read-only": "Required to use read-only disks (^3.3)", "league/flysystem-sftp-v3": "Required to use the Flysystem SFTP driver (^3.0).", "mockery/mockery": "Required to use mocking (^1.4.4).", "nyholm/psr7": "Required to use PSR-7 bridging features (^1.2).", @@ -1205,29 +1554,30 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2022-06-28T14:33:19+00:00" + "time": "2022-09-20T13:32:50+00:00" }, { "name": "laravel/serializable-closure", - "version": "v1.2.0", + "version": "v1.2.2", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "09f0e9fb61829f628205b7c94906c28740ff9540" + "reference": "47afb7fae28ed29057fdca37e16a84f90cc62fae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/09f0e9fb61829f628205b7c94906c28740ff9540", - "reference": "09f0e9fb61829f628205b7c94906c28740ff9540", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/47afb7fae28ed29057fdca37e16a84f90cc62fae", + "reference": "47afb7fae28ed29057fdca37e16a84f90cc62fae", "shasum": "" }, "require": { "php": "^7.3|^8.0" }, "require-dev": { - "pestphp/pest": "^1.18", - "phpstan/phpstan": "^0.12.98", - "symfony/var-dumper": "^5.3" + "nesbot/carbon": "^2.61", + "pestphp/pest": "^1.21.3", + "phpstan/phpstan": "^1.8.2", + "symfony/var-dumper": "^5.4.11" }, "type": "library", "extra": { @@ -1264,7 +1614,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2022-05-16T17:09:47+00:00" + "time": "2022-09-08T13:45:54+00:00" }, { "name": "laravel/tinker", @@ -1397,16 +1747,16 @@ }, { "name": "league/commonmark", - "version": "2.3.3", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/thephpleague/commonmark.git", - "reference": "0da1dca5781dd3cfddbe328224d9a7a62571addc" + "reference": "84d74485fdb7074f4f9dd6f02ab957b1de513257" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/0da1dca5781dd3cfddbe328224d9a7a62571addc", - "reference": "0da1dca5781dd3cfddbe328224d9a7a62571addc", + "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/84d74485fdb7074f4f9dd6f02ab957b1de513257", + "reference": "84d74485fdb7074f4f9dd6f02ab957b1de513257", "shasum": "" }, "require": { @@ -1428,13 +1778,13 @@ "github/gfm": "0.29.0", "michelf/php-markdown": "^1.4", "nyholm/psr7": "^1.5", - "phpstan/phpstan": "^0.12.88 || ^1.0.0", - "phpunit/phpunit": "^9.5.5", + "phpstan/phpstan": "^1.8.2", + "phpunit/phpunit": "^9.5.21", "scrutinizer/ocular": "^1.8.1", - "symfony/finder": "^5.3", + "symfony/finder": "^5.3 | ^6.0", "symfony/yaml": "^2.3 | ^3.0 | ^4.0 | ^5.0 | ^6.0", - "unleashedtech/php-coding-standard": "^3.1", - "vimeo/psalm": "^4.7.3" + "unleashedtech/php-coding-standard": "^3.1.1", + "vimeo/psalm": "^4.24.0" }, "suggest": { "symfony/yaml": "v2.3+ required if using the Front Matter extension" @@ -1499,7 +1849,7 @@ "type": "tidelift" } ], - "time": "2022-06-07T21:28:26+00:00" + "time": "2022-07-29T10:59:45+00:00" }, { "name": "league/config", @@ -1585,16 +1935,16 @@ }, { "name": "league/flysystem", - "version": "3.1.0", + "version": "3.5.2", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "34a68067b7ae3b836ea5e57e1fc432478372a4f5" + "reference": "c73c4eb31f2e883b3897ab5591aa2dbc48112433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/34a68067b7ae3b836ea5e57e1fc432478372a4f5", - "reference": "34a68067b7ae3b836ea5e57e1fc432478372a4f5", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/c73c4eb31f2e883b3897ab5591aa2dbc48112433", + "reference": "c73c4eb31f2e883b3897ab5591aa2dbc48112433", "shasum": "" }, "require": { @@ -1605,6 +1955,7 @@ "aws/aws-sdk-php": "3.209.31 || 3.210.0", "guzzlehttp/guzzle": "<7.0", "guzzlehttp/ringphp": "<1.1.1", + "phpseclib/phpseclib": "3.0.15", "symfony/http-client": "<5.2" }, "require-dev": { @@ -1618,7 +1969,7 @@ "friendsofphp/php-cs-fixer": "^3.5", "google/cloud-storage": "^1.23", "microsoft/azure-storage-blob": "^1.1", - "phpseclib/phpseclib": "^2.0", + "phpseclib/phpseclib": "^3.0.14", "phpstan/phpstan": "^0.12.26", "phpunit/phpunit": "^9.5.11", "sabre/dav": "^4.3.1" @@ -1655,11 +2006,11 @@ ], "support": { "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/3.1.0" + "source": "https://github.com/thephpleague/flysystem/tree/3.5.2" }, "funding": [ { - "url": "https://offset.earth/frankdejonge", + "url": "https://ecologi.com/frankdejonge", "type": "custom" }, { @@ -1671,7 +2022,7 @@ "type": "tidelift" } ], - "time": "2022-06-29T17:29:54+00:00" + "time": "2022-09-23T18:59:16+00:00" }, { "name": "league/mime-type-detection", @@ -1731,16 +2082,16 @@ }, { "name": "monolog/monolog", - "version": "2.7.0", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524" + "reference": "720488632c590286b88b80e62aa3d3d551ad4a50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/5579edf28aee1190a798bfa5be8bc16c563bd524", - "reference": "5579edf28aee1190a798bfa5be8bc16c563bd524", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/720488632c590286b88b80e62aa3d3d551ad4a50", + "reference": "720488632c590286b88b80e62aa3d3d551ad4a50", "shasum": "" }, "require": { @@ -1760,11 +2111,10 @@ "guzzlehttp/psr7": "^2.2", "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", - "php-console/php-console": "^3.1.3", "phpspec/prophecy": "^1.15", "phpstan/phpstan": "^0.12.91", "phpunit/phpunit": "^8.5.14", - "predis/predis": "^1.1", + "predis/predis": "^1.1 || ^2.0", "rollbar/rollbar": "^1.3 || ^2 || ^3", "ruflin/elastica": "^7", "swiftmailer/swiftmailer": "^5.3|^6.0", @@ -1784,7 +2134,6 @@ "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, @@ -1819,7 +2168,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.7.0" + "source": "https://github.com/Seldaek/monolog/tree/2.8.0" }, "funding": [ { @@ -1831,20 +2180,20 @@ "type": "tidelift" } ], - "time": "2022-06-09T08:59:12+00:00" + "time": "2022-07-24T11:55:47+00:00" }, { "name": "nesbot/carbon", - "version": "2.59.1", + "version": "2.62.1", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5" + "reference": "01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a9000603ea337c8df16cc41f8b6be95a65f4d0f5", - "reference": "a9000603ea337c8df16cc41f8b6be95a65f4d0f5", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a", + "reference": "01bc4cdefe98ef58d1f9cb31bdbbddddf2a88f7a", "shasum": "" }, "require": { @@ -1933,7 +2282,7 @@ "type": "tidelift" } ], - "time": "2022-06-29T21:43:55+00:00" + "time": "2022-09-02T07:48:13+00:00" }, { "name": "nette/schema", @@ -1999,20 +2348,20 @@ }, { "name": "nette/utils", - "version": "v3.2.7", + "version": "v3.2.8", "source": { "type": "git", "url": "https://github.com/nette/utils.git", - "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99" + "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nette/utils/zipball/0af4e3de4df9f1543534beab255ccf459e7a2c99", - "reference": "0af4e3de4df9f1543534beab255ccf459e7a2c99", + "url": "https://api.github.com/repos/nette/utils/zipball/02a54c4c872b99e4ec05c4aec54b5a06eb0f6368", + "reference": "02a54c4c872b99e4ec05c4aec54b5a06eb0f6368", "shasum": "" }, "require": { - "php": ">=7.2 <8.2" + "php": ">=7.2 <8.3" }, "conflict": { "nette/di": "<3.0.6" @@ -2078,22 +2427,22 @@ ], "support": { "issues": "https://github.com/nette/utils/issues", - "source": "https://github.com/nette/utils/tree/v3.2.7" + "source": "https://github.com/nette/utils/tree/v3.2.8" }, - "time": "2022-01-24T11:29:14+00:00" + "time": "2022-09-12T23:36:20+00:00" }, { "name": "nikic/php-parser", - "version": "v4.14.0", + "version": "v4.15.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1" + "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1", - "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", + "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900", "shasum": "" }, "require": { @@ -2134,35 +2483,125 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.14.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1" }, - "time": "2022-05-31T20:59:12+00:00" + "time": "2022-09-04T07:30:47+00:00" }, { - "name": "phpoption/phpoption", - "version": "1.8.1", + "name": "nunomaduro/termwind", + "version": "v1.14.0", "source": { "type": "git", - "url": "https://github.com/schmittjoh/php-option.git", - "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15" + "url": "https://github.com/nunomaduro/termwind.git", + "reference": "10065367baccf13b6e30f5e9246fa4f63a79eb1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", - "reference": "eab7a0df01fe2344d172bff4cd6dbd3f8b84ad15", + "url": "https://api.github.com/repos/nunomaduro/termwind/zipball/10065367baccf13b6e30f5e9246fa4f63a79eb1d", + "reference": "10065367baccf13b6e30f5e9246fa4f63a79eb1d", "shasum": "" }, "require": { - "php": "^7.0 || ^8.0" + "ext-mbstring": "*", + "php": "^8.0", + "symfony/console": "^5.3.0|^6.0.0" }, "require-dev": { - "bamarni/composer-bin-plugin": "^1.4.1", - "phpunit/phpunit": "^6.5.14 || ^7.5.20 || ^8.5.19 || ^9.5.8" + "ergebnis/phpstan-rules": "^1.0.", + "illuminate/console": "^8.0|^9.0", + "illuminate/support": "^8.0|^9.0", + "laravel/pint": "^1.0.0", + "pestphp/pest": "^1.21.0", + "pestphp/pest-plugin-mock": "^1.0", + "phpstan/phpstan": "^1.4.6", + "phpstan/phpstan-strict-rules": "^1.1.0", + "symfony/var-dumper": "^5.2.7|^6.0.0", + "thecodingmachine/phpstan-strict-rules": "^1.0.0" }, "type": "library", "extra": { + "laravel": { + "providers": [ + "Termwind\\Laravel\\TermwindServiceProvider" + ] + } + }, + "autoload": { + "files": [ + "src/Functions.php" + ], + "psr-4": { + "Termwind\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nuno Maduro", + "email": "enunomaduro@gmail.com" + } + ], + "description": "Its like Tailwind CSS, but for the console.", + "keywords": [ + "cli", + "console", + "css", + "package", + "php", + "style" + ], + "support": { + "issues": "https://github.com/nunomaduro/termwind/issues", + "source": "https://github.com/nunomaduro/termwind/tree/v1.14.0" + }, + "funding": [ + { + "url": "https://www.paypal.com/paypalme/enunomaduro", + "type": "custom" + }, + { + "url": "https://github.com/nunomaduro", + "type": "github" + }, + { + "url": "https://github.com/xiCO2k", + "type": "github" + } + ], + "time": "2022-08-01T11:03:24+00:00" + }, + { + "name": "phpoption/phpoption", + "version": "1.9.0", + "source": { + "type": "git", + "url": "https://github.com/schmittjoh/php-option.git", + "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/schmittjoh/php-option/zipball/dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", + "reference": "dc5ff11e274a90cc1c743f66c9ad700ce50db9ab", + "shasum": "" + }, + "require": { + "php": "^7.2.5 || ^8.0" + }, + "require-dev": { + "bamarni/composer-bin-plugin": "^1.8", + "phpunit/phpunit": "^8.5.28 || ^9.5.21" + }, + "type": "library", + "extra": { + "bamarni-bin": { + "bin-links": true, + "forward-command": true + }, "branch-alias": { - "dev-master": "1.8-dev" + "dev-master": "1.9-dev" } }, "autoload": { @@ -2195,7 +2634,7 @@ ], "support": { "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.8.1" + "source": "https://github.com/schmittjoh/php-option/tree/1.9.0" }, "funding": [ { @@ -2207,7 +2646,56 @@ "type": "tidelift" } ], - "time": "2021-12-04T23:24:31+00:00" + "time": "2022-07-30T15:51:26+00:00" + }, + { + "name": "psr/cache", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/cache.git", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/cache/zipball/aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "reference": "aa5030cfa5405eccfdcb1083ce040c2cb8d253bf", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Cache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for caching libraries", + "keywords": [ + "cache", + "psr", + "psr-6" + ], + "support": { + "source": "https://github.com/php-fig/cache/tree/3.0.0" + }, + "time": "2021-02-03T23:26:27+00:00" }, { "name": "psr/container", @@ -2575,16 +3063,16 @@ }, { "name": "psy/psysh", - "version": "v0.11.7", + "version": "v0.11.8", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "77fc7270031fbc28f9a7bea31385da5c4855cb7a" + "reference": "f455acf3645262ae389b10e9beba0c358aa6994e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/77fc7270031fbc28f9a7bea31385da5c4855cb7a", - "reference": "77fc7270031fbc28f9a7bea31385da5c4855cb7a", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/f455acf3645262ae389b10e9beba0c358aa6994e", + "reference": "f455acf3645262ae389b10e9beba0c358aa6994e", "shasum": "" }, "require": { @@ -2645,9 +3133,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.7" + "source": "https://github.com/bobthecow/psysh/tree/v0.11.8" }, - "time": "2022-07-07T13:49:11+00:00" + "time": "2022-07-28T14:25:11+00:00" }, { "name": "ralouphie/getallheaders", @@ -2774,20 +3262,20 @@ }, { "name": "ramsey/uuid", - "version": "4.3.1", + "version": "4.5.1", "source": { "type": "git", "url": "https://github.com/ramsey/uuid.git", - "reference": "8505afd4fea63b81a85d3b7b53ac3cb8dc347c28" + "reference": "a161a26d917604dc6d3aa25100fddf2556e9f35d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ramsey/uuid/zipball/8505afd4fea63b81a85d3b7b53ac3cb8dc347c28", - "reference": "8505afd4fea63b81a85d3b7b53ac3cb8dc347c28", + "url": "https://api.github.com/repos/ramsey/uuid/zipball/a161a26d917604dc6d3aa25100fddf2556e9f35d", + "reference": "a161a26d917604dc6d3aa25100fddf2556e9f35d", "shasum": "" }, "require": { - "brick/math": "^0.8 || ^0.9", + "brick/math": "^0.8.8 || ^0.9 || ^0.10", "ext-ctype": "*", "ext-json": "*", "php": "^8.0", @@ -2803,18 +3291,18 @@ "doctrine/annotations": "^1.8", "ergebnis/composer-normalize": "^2.15", "mockery/mockery": "^1.3", - "moontoast/math": "^1.1", "paragonie/random-lib": "^2", "php-mock/php-mock": "^2.2", "php-mock/php-mock-mockery": "^1.3", "php-parallel-lint/php-parallel-lint": "^1.1", "phpbench/phpbench": "^1.0", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-mockery": "^0.12", - "phpstan/phpstan-phpunit": "^0.12", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-phpunit": "^1.1", "phpunit/phpunit": "^8.5 || ^9", - "slevomat/coding-standard": "^7.0", + "ramsey/composer-repl": "^1.4", + "slevomat/coding-standard": "^8.4", "squizlabs/php_codesniffer": "^3.5", "vimeo/psalm": "^4.9" }, @@ -2852,7 +3340,7 @@ ], "support": { "issues": "https://github.com/ramsey/uuid/issues", - "source": "https://github.com/ramsey/uuid/tree/4.3.1" + "source": "https://github.com/ramsey/uuid/tree/4.5.1" }, "funding": [ { @@ -2864,20 +3352,20 @@ "type": "tidelift" } ], - "time": "2022-03-27T21:42:02+00:00" + "time": "2022-09-16T03:22:46+00:00" }, { "name": "symfony/console", - "version": "v6.1.2", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "7a86c1c42fbcb69b59768504c7bca1d3767760b7" + "reference": "7fccea8728aa2d431a6725b02b3ce759049fc84d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/7a86c1c42fbcb69b59768504c7bca1d3767760b7", - "reference": "7a86c1c42fbcb69b59768504c7bca1d3767760b7", + "url": "https://api.github.com/repos/symfony/console/zipball/7fccea8728aa2d431a6725b02b3ce759049fc84d", + "reference": "7fccea8728aa2d431a6725b02b3ce759049fc84d", "shasum": "" }, "require": { @@ -2944,7 +3432,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.1.2" + "source": "https://github.com/symfony/console/tree/v6.1.4" }, "funding": [ { @@ -2960,20 +3448,20 @@ "type": "tidelift" } ], - "time": "2022-06-26T13:01:30+00:00" + "time": "2022-08-26T10:32:31+00:00" }, { "name": "symfony/css-selector", - "version": "v6.1.0", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "05c40f02f621609404b8820ff8bc39acb46e19cf" + "reference": "0dd5e36b80e1de97f8f74ed7023ac2b837a36443" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/05c40f02f621609404b8820ff8bc39acb46e19cf", - "reference": "05c40f02f621609404b8820ff8bc39acb46e19cf", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/0dd5e36b80e1de97f8f74ed7023ac2b837a36443", + "reference": "0dd5e36b80e1de97f8f74ed7023ac2b837a36443", "shasum": "" }, "require": { @@ -3009,7 +3497,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.1.0" + "source": "https://github.com/symfony/css-selector/tree/v6.1.3" }, "funding": [ { @@ -3025,7 +3513,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T11:15:52+00:00" + "time": "2022-06-27T17:24:16+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3096,16 +3584,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.1.0", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "d02c662651e5de760bb7d5e94437113309e8f8a0" + "reference": "736e42db3fd586d91820355988698e434e1d8419" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/d02c662651e5de760bb7d5e94437113309e8f8a0", - "reference": "d02c662651e5de760bb7d5e94437113309e8f8a0", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/736e42db3fd586d91820355988698e434e1d8419", + "reference": "736e42db3fd586d91820355988698e434e1d8419", "shasum": "" }, "require": { @@ -3147,7 +3635,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.1.0" + "source": "https://github.com/symfony/error-handler/tree/v6.1.3" }, "funding": [ { @@ -3163,7 +3651,7 @@ "type": "tidelift" } ], - "time": "2022-05-23T10:32:57+00:00" + "time": "2022-07-29T07:42:06+00:00" }, { "name": "symfony/event-dispatcher", @@ -3329,16 +3817,16 @@ }, { "name": "symfony/finder", - "version": "v6.1.0", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "45b8beb69d6eb3b05a65689ebfd4222326773f8f" + "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/45b8beb69d6eb3b05a65689ebfd4222326773f8f", - "reference": "45b8beb69d6eb3b05a65689ebfd4222326773f8f", + "url": "https://api.github.com/repos/symfony/finder/zipball/39696bff2c2970b3779a5cac7bf9f0b88fc2b709", + "reference": "39696bff2c2970b3779a5cac7bf9f0b88fc2b709", "shasum": "" }, "require": { @@ -3373,7 +3861,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.1.0" + "source": "https://github.com/symfony/finder/tree/v6.1.3" }, "funding": [ { @@ -3389,20 +3877,20 @@ "type": "tidelift" } ], - "time": "2022-04-15T08:08:08+00:00" + "time": "2022-07-29T07:42:06+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.1.2", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "86119d294e51afe4d8e07da96b63332bd1f3f52c" + "reference": "18e0f106a32887bcebef757e5b39c88e39a08f20" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/86119d294e51afe4d8e07da96b63332bd1f3f52c", - "reference": "86119d294e51afe4d8e07da96b63332bd1f3f52c", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/18e0f106a32887bcebef757e5b39c88e39a08f20", + "reference": "18e0f106a32887bcebef757e5b39c88e39a08f20", "shasum": "" }, "require": { @@ -3413,8 +3901,11 @@ "require-dev": { "predis/predis": "~1.0", "symfony/cache": "^5.4|^6.0", + "symfony/dependency-injection": "^5.4|^6.0", "symfony/expression-language": "^5.4|^6.0", - "symfony/mime": "^5.4|^6.0" + "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4", + "symfony/mime": "^5.4|^6.0", + "symfony/rate-limiter": "^5.2|^6.0" }, "suggest": { "symfony/mime": "To use the file extension guesser" @@ -3445,7 +3936,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.1.2" + "source": "https://github.com/symfony/http-foundation/tree/v6.1.4" }, "funding": [ { @@ -3461,20 +3952,20 @@ "type": "tidelift" } ], - "time": "2022-06-19T13:21:48+00:00" + "time": "2022-08-19T14:27:04+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.1.2", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8aaede489900dda61aee208557f63bfa1bca0877" + "reference": "2144c53a278254af57fa1e6f71427be656fab6f4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8aaede489900dda61aee208557f63bfa1bca0877", - "reference": "8aaede489900dda61aee208557f63bfa1bca0877", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/2144c53a278254af57fa1e6f71427be656fab6f4", + "reference": "2144c53a278254af57fa1e6f71427be656fab6f4", "shasum": "" }, "require": { @@ -3555,7 +4046,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.1.2" + "source": "https://github.com/symfony/http-kernel/tree/v6.1.4" }, "funding": [ { @@ -3571,20 +4062,20 @@ "type": "tidelift" } ], - "time": "2022-06-26T17:06:14+00:00" + "time": "2022-08-26T14:50:30+00:00" }, { "name": "symfony/mailer", - "version": "v6.1.2", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "8fa150355115ea09238858ae3cfaf249fd1fd5ed" + "reference": "55a7cb8f8518d35e2a039daaec6e1ee20509510e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/8fa150355115ea09238858ae3cfaf249fd1fd5ed", - "reference": "8fa150355115ea09238858ae3cfaf249fd1fd5ed", + "url": "https://api.github.com/repos/symfony/mailer/zipball/55a7cb8f8518d35e2a039daaec6e1ee20509510e", + "reference": "55a7cb8f8518d35e2a039daaec6e1ee20509510e", "shasum": "" }, "require": { @@ -3629,7 +4120,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.1.2" + "source": "https://github.com/symfony/mailer/tree/v6.1.4" }, "funding": [ { @@ -3645,20 +4136,20 @@ "type": "tidelift" } ], - "time": "2022-06-19T13:21:48+00:00" + "time": "2022-08-03T05:16:05+00:00" }, { "name": "symfony/mime", - "version": "v6.1.1", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "56508865dd883dce3c863af11b3e8053adab30d7" + "reference": "5d1de2d3c52f8ca469c488f4b9e007e9e9cee0b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/56508865dd883dce3c863af11b3e8053adab30d7", - "reference": "56508865dd883dce3c863af11b3e8053adab30d7", + "url": "https://api.github.com/repos/symfony/mime/zipball/5d1de2d3c52f8ca469c488f4b9e007e9e9cee0b3", + "reference": "5d1de2d3c52f8ca469c488f4b9e007e9e9cee0b3", "shasum": "" }, "require": { @@ -3710,7 +4201,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.1.1" + "source": "https://github.com/symfony/mime/tree/v6.1.4" }, "funding": [ { @@ -3726,7 +4217,7 @@ "type": "tidelift" } ], - "time": "2022-06-09T12:51:38+00:00" + "time": "2022-08-19T14:27:04+00:00" }, { "name": "symfony/polyfill-ctype", @@ -4384,17 +4875,99 @@ "time": "2022-05-24T11:49:31+00:00" }, { - "name": "symfony/process", - "version": "v6.1.0", + "name": "symfony/polyfill-uuid", + "version": "v1.26.0", "source": { "type": "git", - "url": "https://github.com/symfony/process.git", - "reference": "318718453c2be58266f1a9e74063d13cb8dd4165" + "url": "https://github.com/symfony/polyfill-uuid.git", + "reference": "a41886c1c81dc075a09c71fe6db5b9d68c79de23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/318718453c2be58266f1a9e74063d13cb8dd4165", - "reference": "318718453c2be58266f1a9e74063d13cb8dd4165", + "url": "https://api.github.com/repos/symfony/polyfill-uuid/zipball/a41886c1c81dc075a09c71fe6db5b9d68c79de23", + "reference": "a41886c1c81dc075a09c71fe6db5b9d68c79de23", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-uuid": "*" + }, + "suggest": { + "ext-uuid": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.26-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Uuid\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Grégoire Pineau", + "email": "lyrixx@lyrixx.info" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for uuid functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "uuid" + ], + "support": { + "source": "https://github.com/symfony/polyfill-uuid/tree/v1.26.0" + }, + "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-05-24T11:49:31+00:00" + }, + { + "name": "symfony/process", + "version": "v6.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/process.git", + "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/process/zipball/a6506e99cfad7059b1ab5cab395854a0a0c21292", + "reference": "a6506e99cfad7059b1ab5cab395854a0a0c21292", "shasum": "" }, "require": { @@ -4426,7 +4999,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.1.0" + "source": "https://github.com/symfony/process/tree/v6.1.3" }, "funding": [ { @@ -4442,20 +5015,20 @@ "type": "tidelift" } ], - "time": "2022-05-11T12:12:29+00:00" + "time": "2022-06-27T17:24:16+00:00" }, { "name": "symfony/routing", - "version": "v6.1.1", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8f068b792e515b25e26855ac8dc7fe800399f3e5" + "reference": "ef9108b3a88045b7546e808fb404ddb073dd35ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8f068b792e515b25e26855ac8dc7fe800399f3e5", - "reference": "8f068b792e515b25e26855ac8dc7fe800399f3e5", + "url": "https://api.github.com/repos/symfony/routing/zipball/ef9108b3a88045b7546e808fb404ddb073dd35ea", + "reference": "ef9108b3a88045b7546e808fb404ddb073dd35ea", "shasum": "" }, "require": { @@ -4514,7 +5087,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.1.1" + "source": "https://github.com/symfony/routing/tree/v6.1.3" }, "funding": [ { @@ -4530,7 +5103,7 @@ "type": "tidelift" } ], - "time": "2022-06-08T12:21:15+00:00" + "time": "2022-07-20T15:00:40+00:00" }, { "name": "symfony/service-contracts", @@ -4619,16 +5192,16 @@ }, { "name": "symfony/string", - "version": "v6.1.2", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "1903f2879875280c5af944625e8246d81c2f0604" + "reference": "290972cad7b364e3befaa74ba0ec729800fb161c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/1903f2879875280c5af944625e8246d81c2f0604", - "reference": "1903f2879875280c5af944625e8246d81c2f0604", + "url": "https://api.github.com/repos/symfony/string/zipball/290972cad7b364e3befaa74ba0ec729800fb161c", + "reference": "290972cad7b364e3befaa74ba0ec729800fb161c", "shasum": "" }, "require": { @@ -4684,7 +5257,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.1.2" + "source": "https://github.com/symfony/string/tree/v6.1.4" }, "funding": [ { @@ -4700,20 +5273,20 @@ "type": "tidelift" } ], - "time": "2022-06-26T16:35:04+00:00" + "time": "2022-08-12T18:05:43+00:00" }, { "name": "symfony/translation", - "version": "v6.1.0", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "b254416631615bc6fe49b0a67f18658827288147" + "reference": "45d0f5bb8df7255651ca91c122fab604e776af03" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/b254416631615bc6fe49b0a67f18658827288147", - "reference": "b254416631615bc6fe49b0a67f18658827288147", + "url": "https://api.github.com/repos/symfony/translation/zipball/45d0f5bb8df7255651ca91c122fab604e776af03", + "reference": "45d0f5bb8df7255651ca91c122fab604e776af03", "shasum": "" }, "require": { @@ -4780,7 +5353,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.1.0" + "source": "https://github.com/symfony/translation/tree/v6.1.4" }, "funding": [ { @@ -4796,7 +5369,7 @@ "type": "tidelift" } ], - "time": "2022-05-11T12:12:29+00:00" + "time": "2022-08-02T16:17:38+00:00" }, { "name": "symfony/translation-contracts", @@ -4880,17 +5453,91 @@ "time": "2022-06-27T17:24:16+00:00" }, { - "name": "symfony/var-dumper", - "version": "v6.1.0", + "name": "symfony/uid", + "version": "v6.1.3", "source": { "type": "git", - "url": "https://github.com/symfony/var-dumper.git", - "reference": "98587d939cb783aa04e828e8fa857edaca24c212" + "url": "https://github.com/symfony/uid.git", + "reference": "ea2ccf0fdb88c83e626105b68e5bab5c132d812b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/98587d939cb783aa04e828e8fa857edaca24c212", - "reference": "98587d939cb783aa04e828e8fa857edaca24c212", + "url": "https://api.github.com/repos/symfony/uid/zipball/ea2ccf0fdb88c83e626105b68e5bab5c132d812b", + "reference": "ea2ccf0fdb88c83e626105b68e5bab5c132d812b", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-uuid": "^1.15" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Uid\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Grégoire Pineau", + "email": "lyrixx@lyrixx.info" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to generate and represent UIDs", + "homepage": "https://symfony.com", + "keywords": [ + "UID", + "ulid", + "uuid" + ], + "support": { + "source": "https://github.com/symfony/uid/tree/v6.1.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-07-20T13:46:29+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v6.1.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427", + "reference": "d5a5e44a2260c5eb5e746bf4f1fbd12ee6ceb427", "shasum": "" }, "require": { @@ -4949,7 +5596,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.1.0" + "source": "https://github.com/symfony/var-dumper/tree/v6.1.3" }, "funding": [ { @@ -4965,20 +5612,20 @@ "type": "tidelift" } ], - "time": "2022-05-21T13:34:40+00:00" + "time": "2022-07-20T13:46:29+00:00" }, { "name": "tijsverkoyen/css-to-inline-styles", - "version": "2.2.4", + "version": "2.2.5", "source": { "type": "git", "url": "https://github.com/tijsverkoyen/CssToInlineStyles.git", - "reference": "da444caae6aca7a19c0c140f68c6182e337d5b1c" + "reference": "4348a3a06651827a27d989ad1d13efec6bb49b19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/da444caae6aca7a19c0c140f68c6182e337d5b1c", - "reference": "da444caae6aca7a19c0c140f68c6182e337d5b1c", + "url": "https://api.github.com/repos/tijsverkoyen/CssToInlineStyles/zipball/4348a3a06651827a27d989ad1d13efec6bb49b19", + "reference": "4348a3a06651827a27d989ad1d13efec6bb49b19", "shasum": "" }, "require": { @@ -5016,9 +5663,9 @@ "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", "support": { "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.4" + "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.5" }, - "time": "2021-12-08T09:12:39+00:00" + "time": "2022-09-12T13:28:28+00:00" }, { "name": "vlucas/phpdotenv", @@ -5234,16 +5881,16 @@ }, { "name": "yajra/laravel-datatables-oracle", - "version": "v9.21.1", + "version": "v9.21.2", "source": { "type": "git", "url": "https://github.com/yajra/laravel-datatables.git", - "reference": "8f37e59e7ed1c1d2ff713497918bcaee72d587bb" + "reference": "a7fd01f06282923e9c63fa27fe6b391e21dc321a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/8f37e59e7ed1c1d2ff713497918bcaee72d587bb", - "reference": "8f37e59e7ed1c1d2ff713497918bcaee72d587bb", + "url": "https://api.github.com/repos/yajra/laravel-datatables/zipball/a7fd01f06282923e9c63fa27fe6b391e21dc321a", + "reference": "a7fd01f06282923e9c63fa27fe6b391e21dc321a", "shasum": "" }, "require": { @@ -5303,7 +5950,7 @@ ], "support": { "issues": "https://github.com/yajra/laravel-datatables/issues", - "source": "https://github.com/yajra/laravel-datatables/tree/v9.21.1" + "source": "https://github.com/yajra/laravel-datatables/tree/v9.21.2" }, "funding": [ { @@ -5315,7 +5962,7 @@ "type": "patreon" } ], - "time": "2022-06-22T09:21:30+00:00" + "time": "2022-07-12T04:48:03+00:00" } ], "packages-dev": [ @@ -5389,71 +6036,18 @@ ], "time": "2022-03-03T08:28:38+00:00" }, - { - "name": "facade/ignition-contracts", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/facade/ignition-contracts.git", - "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/facade/ignition-contracts/zipball/3c921a1cdba35b68a7f0ccffc6dffc1995b18267", - "reference": "3c921a1cdba35b68a7f0ccffc6dffc1995b18267", - "shasum": "" - }, - "require": { - "php": "^7.3|^8.0" - }, - "require-dev": { - "friendsofphp/php-cs-fixer": "^v2.15.8", - "phpunit/phpunit": "^9.3.11", - "vimeo/psalm": "^3.17.1" - }, - "type": "library", - "autoload": { - "psr-4": { - "Facade\\IgnitionContracts\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Freek Van der Herten", - "email": "freek@spatie.be", - "homepage": "https://flareapp.io", - "role": "Developer" - } - ], - "description": "Solution contracts for Ignition", - "homepage": "https://github.com/facade/ignition-contracts", - "keywords": [ - "contracts", - "flare", - "ignition" - ], - "support": { - "issues": "https://github.com/facade/ignition-contracts/issues", - "source": "https://github.com/facade/ignition-contracts/tree/1.0.2" - }, - "time": "2020-10-16T08:27:54+00:00" - }, { "name": "fakerphp/faker", - "version": "v1.19.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/FakerPHP/Faker.git", - "reference": "d7f08a622b3346766325488aa32ddc93ccdecc75" + "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/d7f08a622b3346766325488aa32ddc93ccdecc75", - "reference": "d7f08a622b3346766325488aa32ddc93ccdecc75", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/37f751c67a5372d4e26353bd9384bc03744ec77b", + "reference": "37f751c67a5372d4e26353bd9384bc03744ec77b", "shasum": "" }, "require": { @@ -5480,7 +6074,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "v1.19-dev" + "dev-main": "v1.20-dev" } }, "autoload": { @@ -5505,9 +6099,9 @@ ], "support": { "issues": "https://github.com/FakerPHP/Faker/issues", - "source": "https://github.com/FakerPHP/Faker/tree/v1.19.0" + "source": "https://github.com/FakerPHP/Faker/tree/v1.20.0" }, - "time": "2022-02-02T17:38:57+00:00" + "time": "2022-07-20T13:12:54+00:00" }, { "name": "filp/whoops", @@ -5633,23 +6227,27 @@ }, { "name": "laravel/breeze", - "version": "v1.10.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/laravel/breeze.git", - "reference": "e98e855ab4bde5bf0083c4a4d73c0f5b474241ae" + "reference": "1c7592561f5a834eea6c38a77e43ae3c2ee83609" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/breeze/zipball/e98e855ab4bde5bf0083c4a4d73c0f5b474241ae", - "reference": "e98e855ab4bde5bf0083c4a4d73c0f5b474241ae", + "url": "https://api.github.com/repos/laravel/breeze/zipball/1c7592561f5a834eea6c38a77e43ae3c2ee83609", + "reference": "1c7592561f5a834eea6c38a77e43ae3c2ee83609", "shasum": "" }, "require": { - "illuminate/filesystem": "^8.42|^9.0", - "illuminate/support": "^8.42|^9.0", - "illuminate/validation": "^8.42|^9.0", - "php": "^7.3|^8.0" + "illuminate/console": "^9.21", + "illuminate/filesystem": "^9.21", + "illuminate/support": "^9.21", + "illuminate/validation": "^9.21", + "php": "^8.0.2" + }, + "conflict": { + "laravel/framework": "<9.19.0" }, "type": "library", "extra": { @@ -5686,20 +6284,20 @@ "issues": "https://github.com/laravel/breeze/issues", "source": "https://github.com/laravel/breeze" }, - "time": "2022-06-28T11:52:06+00:00" + "time": "2022-09-19T14:29:29+00:00" }, { "name": "laravel/sail", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "676e1ff33c1b8af657779f62f57360c376cba666" + "reference": "73030c18b769f27e6f6aacf7848d024fa9a55560" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/676e1ff33c1b8af657779f62f57360c376cba666", - "reference": "676e1ff33c1b8af657779f62f57360c376cba666", + "url": "https://api.github.com/repos/laravel/sail/zipball/73030c18b769f27e6f6aacf7848d024fa9a55560", + "reference": "73030c18b769f27e6f6aacf7848d024fa9a55560", "shasum": "" }, "require": { @@ -5746,20 +6344,20 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2022-06-24T13:56:11+00:00" + "time": "2022-08-31T16:38:14+00:00" }, { "name": "mockery/mockery", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac" + "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac", - "reference": "c10a5f6e06fc2470ab1822fa13fa2a7380f8fbac", + "url": "https://api.github.com/repos/mockery/mockery/zipball/e92dcc83d5a51851baf5f5591d32cb2b16e3684e", + "reference": "e92dcc83d5a51851baf5f5591d32cb2b16e3684e", "shasum": "" }, "require": { @@ -5816,9 +6414,9 @@ ], "support": { "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/1.5.0" + "source": "https://github.com/mockery/mockery/tree/1.5.1" }, - "time": "2022-01-20T13:18:17+00:00" + "time": "2022-09-07T15:32:08+00:00" }, { "name": "myclabs/deep-copy", @@ -5881,32 +6479,32 @@ }, { "name": "nunomaduro/collision", - "version": "v6.2.1", + "version": "v6.3.0", "source": { "type": "git", "url": "https://github.com/nunomaduro/collision.git", - "reference": "5f058f7e39278b701e455b3c82ec5298cf001d89" + "reference": "17f600e2e8872856ff2846243efb74ad4b6da531" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nunomaduro/collision/zipball/5f058f7e39278b701e455b3c82ec5298cf001d89", - "reference": "5f058f7e39278b701e455b3c82ec5298cf001d89", + "url": "https://api.github.com/repos/nunomaduro/collision/zipball/17f600e2e8872856ff2846243efb74ad4b6da531", + "reference": "17f600e2e8872856ff2846243efb74ad4b6da531", "shasum": "" }, "require": { - "facade/ignition-contracts": "^1.0.2", "filp/whoops": "^2.14.5", "php": "^8.0.0", "symfony/console": "^6.0.2" }, "require-dev": { "brianium/paratest": "^6.4.1", - "laravel/framework": "^9.7", - "laravel/pint": "^0.2.1", - "nunomaduro/larastan": "^1.0.2", + "laravel/framework": "^9.26.1", + "laravel/pint": "^1.1.1", + "nunomaduro/larastan": "^1.0.3", "nunomaduro/mock-final-classes": "^1.1.0", - "orchestra/testbench": "^7.3.0", - "phpunit/phpunit": "^9.5.11" + "orchestra/testbench": "^7.7", + "phpunit/phpunit": "^9.5.23", + "spatie/ignition": "^1.4.1" }, "type": "library", "extra": { @@ -5965,7 +6563,7 @@ "type": "patreon" } ], - "time": "2022-06-27T16:11:16+00:00" + "time": "2022-08-29T09:11:20+00:00" }, { "name": "phar-io/manifest", @@ -6078,252 +6676,25 @@ }, "time": "2022-02-21T01:04:05+00:00" }, - { - "name": "phpdocumentor/reflection-common", - "version": "2.2.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-2.x": "2.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" - }, - "time": "2020-06-27T09:03:43+00:00" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", - "shasum": "" - }, - "require": { - "ext-filter": "*", - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", - "webmozart/assert": "^1.9.1" - }, - "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - }, - { - "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" - }, - "time": "2021-10-19T17:43:47+00:00" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "1.6.1", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "77a32518733312af16a44300404e945338981de3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/77a32518733312af16a44300404e945338981de3", - "reference": "77a32518733312af16a44300404e945338981de3", - "shasum": "" - }, - "require": { - "php": "^7.2 || ^8.0", - "phpdocumentor/reflection-common": "^2.0" - }, - "require-dev": { - "ext-tokenizer": "*", - "psalm/phar": "^4.8" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-1.x": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": "src" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "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.1" - }, - "time": "2022-03-15T21:29:03+00:00" - }, - { - "name": "phpspec/prophecy", - "version": "v1.15.0", - "source": { - "type": "git", - "url": "https://github.com/phpspec/prophecy.git", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.2", - "php": "^7.2 || ~8.0, <8.2", - "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0", - "sebastian/recursion-context": "^3.0 || ^4.0" - }, - "require-dev": { - "phpspec/phpspec": "^6.0 || ^7.0", - "phpunit/phpunit": "^8.0 || ^9.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, - "autoload": { - "psr-4": { - "Prophecy\\": "src/Prophecy" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Konstantin Kudryashov", - "email": "ever.zet@gmail.com", - "homepage": "http://everzet.com" - }, - { - "name": "Marcello Duarte", - "email": "marcello.duarte@gmail.com" - } - ], - "description": "Highly opinionated mocking framework for PHP 5.3+", - "homepage": "https://github.com/phpspec/prophecy", - "keywords": [ - "Double", - "Dummy", - "fake", - "mock", - "spy", - "stub" - ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.15.0" - }, - "time": "2021-12-08T12:19:24+00:00" - }, { "name": "phpunit/php-code-coverage", - "version": "9.2.15", + "version": "9.2.17", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f" + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/2e9da11878c4202f97915c1cb4bb1ca318a63f5f", - "reference": "2e9da11878c4202f97915c1cb4bb1ca318a63f5f", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", + "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.14", "php": ">=7.3", "phpunit/php-file-iterator": "^3.0.3", "phpunit/php-text-template": "^2.0.2", @@ -6372,7 +6743,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.15" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" }, "funding": [ { @@ -6380,7 +6751,7 @@ "type": "github" } ], - "time": "2022-03-07T09:28:20+00:00" + "time": "2022-08-30T12:24:04+00:00" }, { "name": "phpunit/php-file-iterator", @@ -6625,16 +6996,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.21", + "version": "9.5.25", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1" + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/0e32b76be457de00e83213528f6bb37e2a38fcb1", - "reference": "0e32b76be457de00e83213528f6bb37e2a38fcb1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", "shasum": "" }, "require": { @@ -6649,7 +7020,6 @@ "phar-io/manifest": "^2.0.3", "phar-io/version": "^3.0.2", "php": ">=7.3", - "phpspec/prophecy": "^1.12.1", "phpunit/php-code-coverage": "^9.2.13", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", @@ -6657,19 +7027,16 @@ "phpunit/php-timer": "^5.0.2", "sebastian/cli-parser": "^1.0.1", "sebastian/code-unit": "^1.0.6", - "sebastian/comparator": "^4.0.5", + "sebastian/comparator": "^4.0.8", "sebastian/diff": "^4.0.3", "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.3", + "sebastian/exporter": "^4.0.5", "sebastian/global-state": "^5.0.1", "sebastian/object-enumerator": "^4.0.3", "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.0", + "sebastian/type": "^3.2", "sebastian/version": "^3.0.2" }, - "require-dev": { - "phpspec/prophecy-phpunit": "^2.0.1" - }, "suggest": { "ext-soap": "*", "ext-xdebug": "*" @@ -6711,7 +7078,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" }, "funding": [ { @@ -6721,9 +7088,13 @@ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2022-06-19T12:14:25+00:00" + "time": "2022-09-25T03:44:45+00:00" }, { "name": "sebastian/cli-parser", @@ -6894,16 +7265,16 @@ }, { "name": "sebastian/comparator", - "version": "4.0.6", + "version": "4.0.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382" + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", - "reference": "55f4261989e546dc112258c7a75935a81a7ce382", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", "shasum": "" }, "require": { @@ -6956,7 +7327,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" }, "funding": [ { @@ -6964,7 +7335,7 @@ "type": "github" } ], - "time": "2020-10-26T15:49:45+00:00" + "time": "2022-09-14T12:41:17+00:00" }, { "name": "sebastian/complexity", @@ -7154,16 +7525,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9" + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/65e8b7db476c5dd267e65eea9cab77584d3cfff9", - "reference": "65e8b7db476c5dd267e65eea9cab77584d3cfff9", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", "shasum": "" }, "require": { @@ -7219,7 +7590,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.4" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" }, "funding": [ { @@ -7227,7 +7598,7 @@ "type": "github" } ], - "time": "2021-11-11T14:18:36+00:00" + "time": "2022-09-14T06:03:37+00:00" }, { "name": "sebastian/global-state", @@ -7582,16 +7953,16 @@ }, { "name": "sebastian/type", - "version": "3.0.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad" + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", - "reference": "b233b84bc4465aff7b57cf1c4bc75c86d00d6dad", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", + "reference": "fb3fe09c5f0bae6bc27ef3ce933a1e0ed9464b6e", "shasum": "" }, "require": { @@ -7603,7 +7974,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.2-dev" } }, "autoload": { @@ -7626,7 +7997,7 @@ "homepage": "https://github.com/sebastianbergmann/type", "support": { "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/3.0.0" + "source": "https://github.com/sebastianbergmann/type/tree/3.2.0" }, "funding": [ { @@ -7634,7 +8005,7 @@ "type": "github" } ], - "time": "2022-03-15T09:54:48+00:00" + "time": "2022-09-12T14:47:03+00:00" }, { "name": "sebastian/version", @@ -7753,16 +8124,16 @@ }, { "name": "spatie/flare-client-php", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/spatie/flare-client-php.git", - "reference": "86a380f5b1ce839af04a08f1c8f2697184cdf23f" + "reference": "b1b974348750925b717fa8c8b97a0db0d1aa40ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/86a380f5b1ce839af04a08f1c8f2697184cdf23f", - "reference": "86a380f5b1ce839af04a08f1c8f2697184cdf23f", + "url": "https://api.github.com/repos/spatie/flare-client-php/zipball/b1b974348750925b717fa8c8b97a0db0d1aa40ca", + "reference": "b1b974348750925b717fa8c8b97a0db0d1aa40ca", "shasum": "" }, "require": { @@ -7810,7 +8181,7 @@ ], "support": { "issues": "https://github.com/spatie/flare-client-php/issues", - "source": "https://github.com/spatie/flare-client-php/tree/1.2.0" + "source": "https://github.com/spatie/flare-client-php/tree/1.3.0" }, "funding": [ { @@ -7818,20 +8189,20 @@ "type": "github" } ], - "time": "2022-05-16T12:13:39+00:00" + "time": "2022-08-08T10:10:20+00:00" }, { "name": "spatie/ignition", - "version": "1.3.1", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/spatie/ignition.git", - "reference": "997363fbcce809b1e55f571997d49017f9c623d9" + "reference": "dd3d456779108d7078baf4e43f8c2b937d9794a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/ignition/zipball/997363fbcce809b1e55f571997d49017f9c623d9", - "reference": "997363fbcce809b1e55f571997d49017f9c623d9", + "url": "https://api.github.com/repos/spatie/ignition/zipball/dd3d456779108d7078baf4e43f8c2b937d9794a1", + "reference": "dd3d456779108d7078baf4e43f8c2b937d9794a1", "shasum": "" }, "require": { @@ -7893,31 +8264,31 @@ "type": "github" } ], - "time": "2022-05-16T13:16:07+00:00" + "time": "2022-08-26T11:51:15+00:00" }, { "name": "spatie/laravel-ignition", - "version": "1.3.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/spatie/laravel-ignition.git", - "reference": "fe37a0eafe6ea040804255c70e9808af13314f87" + "reference": "192962f4d84526f6868c512530c00633e3165749" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/fe37a0eafe6ea040804255c70e9808af13314f87", - "reference": "fe37a0eafe6ea040804255c70e9808af13314f87", + "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/192962f4d84526f6868c512530c00633e3165749", + "reference": "192962f4d84526f6868c512530c00633e3165749", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", - "illuminate/support": "^8.77|^9.0", + "illuminate/support": "^8.77|^9.27", "monolog/monolog": "^2.3", "php": "^8.0", "spatie/flare-client-php": "^1.0.1", - "spatie/ignition": "^1.2.4", + "spatie/ignition": "^1.4.1", "symfony/console": "^5.0|^6.0", "symfony/var-dumper": "^5.0|^6.0" }, @@ -7983,7 +8354,7 @@ "type": "github" } ], - "time": "2022-06-17T06:28:57+00:00" + "time": "2022-09-16T13:45:54+00:00" }, { "name": "theseer/tokenizer", @@ -8046,5 +8417,5 @@ "ext-json": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.1.0" } From 2ae19112e35b0fbf3b5afdf65a30c2c5294b340f Mon Sep 17 00:00:00 2001 From: cp6 Date: Mon, 26 Sep 2022 13:24:53 +1000 Subject: [PATCH 02/19] Update readme Update readme for composer --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index a0f10ba..66441af 100644 --- a/README.md +++ b/README.md @@ -36,11 +36,13 @@ Example yabs.sh call to POST the result #### Please run the following if updating from existing install: ```shell +composer install php artisan migrate php artisan route:cache php artisan cache:clear ``` +* Added doctrine/dbal * Removed old method and functions for adding a YABS result * Fixed YABS JSON parser disk being the ram value * Fixed YABS JSON parser disk conversion (MB & GB) From dadef7936708141a1041ca074477b5b63665796f Mon Sep 17 00:00:00 2001 From: imlonghao Date: Mon, 26 Sep 2022 22:46:53 +0800 Subject: [PATCH 03/19] fix: server page due in 0 days --- resources/views/servers/index.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/servers/index.blade.php b/resources/views/servers/index.blade.php index 3157823..2bd26d1 100644 --- a/resources/views/servers/index.blade.php +++ b/resources/views/servers/index.blade.php @@ -79,7 +79,7 @@ {{ $server->provider->name }} {{ $server->price->price }} {{$server->price->currency}} {{\App\Process::paymentTermIntToString($server->price->term)}} - {{now()->diffInDays(Carbon\Carbon::parse($server->next_due_date), false)}} + {{now()->diffInDays(Carbon\Carbon::parse($server->price->next_due_date), false)}} days {{ $server->owned_since }} From 3f669df9221bc486a18c3c69bb04e2b39a553aee Mon Sep 17 00:00:00 2001 From: imlonghao Date: Tue, 27 Sep 2022 00:05:57 +0800 Subject: [PATCH 04/19] controller(server): fix update server ssh port --- app/Http/Controllers/ServerController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 9074f7a..b5bd6d3 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -153,7 +153,7 @@ class ServerController extends Controller 'hostname' => $request->hostname, 'server_type' => $request->server_type, 'os_id' => $request->os_id, - 'ssh' => $request->ssh, + 'ssh' => $request->ssh_port, 'provider_id' => $request->provider_id, 'location_id' => $request->location_id, 'ram' => $request->ram, From 41413a224f3d3f81a3ee017d308157d503d76d1c Mon Sep 17 00:00:00 2001 From: cp6 Date: Tue, 4 Oct 2022 11:13:57 +1100 Subject: [PATCH 05/19] Updated server fixed server_type & virt Updated server fixed server_type & virt Merged server_type & virt into just server_type Updated serviceServerType() for paramater types and a short/long return value --- app/Models/Server.php | 10 +++- resources/views/servers/create.blade.php | 28 ++++------ resources/views/servers/edit.blade.php | 66 ++++++++++-------------- resources/views/servers/show.blade.php | 2 +- 4 files changed, 47 insertions(+), 59 deletions(-) diff --git a/app/Models/Server.php b/app/Models/Server.php index c19d8d0..0d059ed 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -68,19 +68,27 @@ class Server extends Model }); } - public static function serviceServerType($type) + public static function serviceServerType(int $type, bool $short = true): string { if ($type === 1) { return "KVM"; } elseif ($type === 2) { return "OVZ"; } elseif ($type === 3) { + if (!$short) { + return "Dedicated"; + } return "DEDI"; } elseif ($type === 4) { return "LXC"; } elseif ($type === 6) { return "VMware"; + } elseif ($type === 7) { + return "NAT"; } else { + if (!$short) { + return "Semi-dedicated"; + } return "SEMI-DEDI"; } } diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php index a078c85..4b72fe1 100644 --- a/resources/views/servers/create.blade.php +++ b/resources/views/servers/create.blade.php @@ -35,14 +35,16 @@
-
Type
+
Server type
-
+ + + + + + + +
@@ -84,18 +86,6 @@
-
-
-
Virt
-
-
SSH diff --git a/resources/views/servers/edit.blade.php b/resources/views/servers/edit.blade.php index b39b263..67cada8 100644 --- a/resources/views/servers/edit.blade.php +++ b/resources/views/servers/edit.blade.php @@ -31,43 +31,7 @@
-
Type
- -
-
-
- - {{$server_data->os_id}} - -
-
-
-
- - NS1 - ns1 - 255 - {{ $server_data->ns1 }} - -
-
- - NS2 - ns2 - 255 - {{ $server_data->ns2 }} - -
-
-
-
-
-
Virt
+
Server type
+ + {{$server_data->os_id}} + +
+
+
+
+ + NS1 + ns1 + 255 + {{ $server_data->ns1 }} + +
+
+ + NS2 + ns2 + 255 + {{ $server_data->ns2 }} + +
+
SSH ssh_port @@ -105,7 +95,7 @@ {{ $server_data->bandwidth }}
-
+
Promo price was_promo diff --git a/resources/views/servers/show.blade.php b/resources/views/servers/show.blade.php index 249667d..9c0f65d 100644 --- a/resources/views/servers/show.blade.php +++ b/resources/views/servers/show.blade.php @@ -37,7 +37,7 @@ Type - {{ $server_data->serviceServerType($server_data->server_type) }} + {{ $server_data->serviceServerType($server_data->server_type, false) }} From b44b4bb2591f5c3a9ecb1cb4600298c95f49c3aa Mon Sep 17 00:00:00 2001 From: cp6 Date: Wed, 5 Oct 2022 11:58:19 +1100 Subject: [PATCH 06/19] Code cleanup Removed unused osIdAsString function Added return types to some functions --- app/Http/Controllers/ServerController.php | 5 +- app/Models/IPs.php | 4 +- app/Models/Pricing.php | 4 +- app/Models/Server.php | 67 +---------------------- 4 files changed, 8 insertions(+), 72 deletions(-) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index b5bd6d3..882d80d 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -200,9 +200,8 @@ class ServerController extends Controller public function destroy(Server $server) { - $items = Server::find($server->id); - - $items->delete(); + $item = Server::find($server->id); + $item->delete(); $p = new Pricing(); $p->deletePricing($server->id); diff --git a/app/Models/IPs.php b/app/Models/IPs.php index cf14220..882c660 100644 --- a/app/Models/IPs.php +++ b/app/Models/IPs.php @@ -25,9 +25,9 @@ class IPs extends Model DB::table('ips')->where('service_id', '=', $service_id)->delete(); } - public static function insertIP(string $service_id, string $address) + public static function insertIP(string $service_id, string $address): IPs { - self::create( + return self::create( [ 'id' => Str::random(8), 'service_id' => $service_id, diff --git a/app/Models/Pricing.php b/app/Models/Pricing.php index 32ea3ed..867d9c3 100644 --- a/app/Models/Pricing.php +++ b/app/Models/Pricing.php @@ -109,7 +109,7 @@ class Pricing extends Model DB::table('pricings')->where('service_id', '=', $id)->delete(); } - public function insertPricing(int $type, string $service_id, string $currency, float $price, int $term, string $next_due_date, int $is_active = 1) + public function insertPricing(int $type, string $service_id, string $currency, float $price, int $term, string $next_due_date, int $is_active = 1): Pricing { $as_usd = $this->convertToUSD($price, $currency); return self::create([ @@ -125,7 +125,7 @@ class Pricing extends Model ]); } - public function updatePricing(string $service_id, string $currency, float $price, int $term, float $as_usd, string $next_due_date, int $is_active = 1) + public function updatePricing(string $service_id, string $currency, float $price, int $term, float $as_usd, string $next_due_date, int $is_active = 1): int { return DB::table('pricings') ->where('service_id', $service_id) diff --git a/app/Models/Server.php b/app/Models/Server.php index 0d059ed..4bdff9a 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -93,7 +93,7 @@ class Server extends Model } } - public static function osIntToIcon(int $os, string $os_name) + public static function osIntToIcon(int $os, string $os_name): string { if ($os === 1) {//None return ""; @@ -116,70 +116,7 @@ class Server extends Model } } - public static function osIdAsString($os) - { - if ($os === "0") { - return "None"; - } elseif ($os === "1") { - return "CentOS 7"; - } elseif ($os === "2") { - return "CentOS 8"; - } elseif ($os === "3") { - return "CentOS"; - } elseif ($os === "4") { - return "Debian 9"; - } elseif ($os === "5") { - return "Debian 10"; - } elseif ($os === "6") { - return "Debian"; - } elseif ($os === "7") { - return "Fedora 32"; - } elseif ($os === "8") { - return "Fedora 33"; - } elseif ($os === "9") { - return "Fedora"; - } elseif ($os === "10") { - return "FreeBSD 11.4"; - } elseif ($os === "11") { - return "FreeBSD 12.1"; - } elseif ($os === "12") { - return "FreeBSD"; - } elseif ($os === "13") { - return "OpenBSD 6.7"; - } elseif ($os === "14") { - return "OpenBSD 6.8"; - } elseif ($os === "15") { - return "OpenBSD"; - } elseif ($os == "16") { - return "Ubuntu 16.04"; - } elseif ($os === "17") { - return "Ubuntu 18.04"; - } elseif ($os === "18") { - return "Ubuntu 20.04"; - } elseif ($os === "19") { - return "Ubuntu 20.10"; - } elseif ($os === "20") { - return "Ubuntu"; - } elseif ($os === "21") { - return "Windows Server 2008"; - } elseif ($os === "22") { - return "Windows Server 2012"; - } elseif ($os === "23") { - return "Windows Server 2016"; - } elseif ($os === "24") { - return "Windows Server 2019"; - } elseif ($os === "25") { - return "Windows 10"; - } elseif ($os === "26") { - return "Custom"; - } elseif ($os === "27") { - return "Other"; - } else { - return "Unknown"; - } - } - - public static function tableRowCompare(string $val1, string $val2, string $value_type = '', bool $is_int = true) + public static function tableRowCompare(string $val1, string $val2, string $value_type = '', bool $is_int = true): string { //+303MBps $str = 'addHour(1), function () use ($server_id) { + return Cache::remember("ip_addresses.$server_id", now()->addHours(1), function () use ($server_id) { return json_decode(DB::table('ips as i') ->where('i.service_id', '=', $server_id) ->get(), true); From 20d308b7becb13ea4aaf2f292debee8ee753cc1f Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 13:43:09 +1100 Subject: [PATCH 08/19] Removed unused labels.label with Removed unused labels.label with --- app/Http/Controllers/DNSController.php | 2 +- app/Models/Domains.php | 4 ++-- app/Models/Reseller.php | 4 ++-- app/Models/SeedBoxes.php | 4 ++-- app/Models/Server.php | 10 +++++----- app/Models/Shared.php | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/Http/Controllers/DNSController.php b/app/Http/Controllers/DNSController.php index 8864e55..d1de0d8 100644 --- a/app/Http/Controllers/DNSController.php +++ b/app/Http/Controllers/DNSController.php @@ -82,7 +82,7 @@ class DNSController extends Controller $labels = DB::table('labels_assigned as l') ->join('labels', 'l.label_id', '=', 'labels.id') ->where('l.service_id', '=', $dn->id) - ->get(['labels.id', 'labels.label']); + ->get(['labels.id']); return view('dns.edit', compact(['dn', 'labels', 'Servers', 'Domains', 'Shareds', 'Resellers'])); } diff --git a/app/Models/Domains.php b/app/Models/Domains.php index c6cb7d0..0fd0150 100644 --- a/app/Models/Domains.php +++ b/app/Models/Domains.php @@ -23,7 +23,7 @@ class Domains extends Model public static function allDomains() {//All domains and relationships (no using joins) return Cache::remember("all_domains", now()->addMonth(1), function () { - return Domains::with(['provider', 'price', 'labels', 'labels.label'])->get(); + return Domains::with(['provider', 'price', 'labels'])->get(); }); } @@ -31,7 +31,7 @@ class Domains extends Model {//Single domains and relationships (no using joins) return Cache::remember("domain.$domain_id", now()->addMonth(1), function () use ($domain_id) { return Domains::where('id', $domain_id) - ->with(['provider', 'price', 'labels', 'labels.label'])->first(); + ->with(['provider', 'price', 'labels'])->first(); }); } diff --git a/app/Models/Reseller.php b/app/Models/Reseller.php index 88eec65..312e8c5 100644 --- a/app/Models/Reseller.php +++ b/app/Models/Reseller.php @@ -36,7 +36,7 @@ class Reseller extends Model public static function allResellerHosting() {//All reseller hosting and relationships (no using joins) return Cache::remember("all_reseller", now()->addMonth(1), function () { - return Reseller::with(['location', 'provider', 'price', 'ips', 'labels', 'labels.label'])->get(); + return Reseller::with(['location', 'provider', 'price', 'ips', 'labels'])->get(); }); } @@ -44,7 +44,7 @@ class Reseller extends Model {//Single reseller hosting and relationships (no using joins) return Cache::remember("reseller_hosting.$shared_id", now()->addMonth(1), function () use ($shared_id) { return Reseller::where('id', $shared_id) - ->with(['location', 'provider', 'price', 'ips', 'labels', 'labels.label'])->first(); + ->with(['location', 'provider', 'price', 'ips', 'labels'])->first(); }); } diff --git a/app/Models/SeedBoxes.php b/app/Models/SeedBoxes.php index 17b025b..3fe0d32 100644 --- a/app/Models/SeedBoxes.php +++ b/app/Models/SeedBoxes.php @@ -36,7 +36,7 @@ class SeedBoxes extends Model public static function allSeedboxes() {//All seedboxes and relationships (no using joins) return Cache::remember("all_seedboxes", now()->addMonth(1), function () { - return SeedBoxes::with(['location', 'provider', 'price', 'labels.label'])->get(); + return SeedBoxes::with(['location', 'provider', 'price'])->get(); }); } @@ -44,7 +44,7 @@ class SeedBoxes extends Model {//Single seedbox and relationships (no using joins) return Cache::remember("seedbox.$seedbox_id", now()->addMonth(1), function () use ($seedbox_id) { return SeedBoxes::where('id', $seedbox_id) - ->with(['location', 'provider', 'price', 'labels.label'])->first(); + ->with(['location', 'provider', 'price'])->first(); }); } diff --git a/app/Models/Server.php b/app/Models/Server.php index d42689e..f34357e 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -43,7 +43,7 @@ class Server extends Model public static function allServers() {//All servers and relationships (no using joins) return Cache::remember("all_servers", now()->addMonth(1), function () { - return Server::with(['location', 'provider', 'os', 'price', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels', 'labels.label'])->get(); + return Server::with(['location', 'provider', 'os', 'price', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels'])->get(); }); } @@ -51,7 +51,7 @@ class Server extends Model {//Single server and relationships (no using joins) return Cache::remember("server.$server_id", now()->addMonth(1), function () use ($server_id) { return Server::where('id', $server_id) - ->with(['location', 'provider', 'os', 'price', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels', 'labels.label'])->first(); + ->with(['location', 'provider', 'os', 'price', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels'])->first(); }); } @@ -59,7 +59,7 @@ class Server extends Model {//All ACTIVE servers and relationships replaces activeServersDataIndexPage() return Cache::remember("all_active_servers", now()->addMonth(1), function () { return Server::where('active', '=', 1) - ->with(['location', 'provider', 'os', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels', 'labels.label', 'price'])->get(); + ->with(['location', 'provider', 'os', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels', 'price'])->get(); }); } @@ -67,7 +67,7 @@ class Server extends Model {//All NON ACTIVE servers and relationships replaces nonActiveServersDataIndexPage() return Cache::remember("non_active_servers", now()->addMonth(1), function () { return Server::where('active', '=', 0) - ->with(['location', 'provider', 'os', 'price', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels', 'labels.label']) + ->with(['location', 'provider', 'os', 'price', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels']) ->get(); }); } @@ -76,7 +76,7 @@ class Server extends Model {//server data that will be publicly viewable (values in settings) return Cache::remember("public_server_data", now()->addMonth(1), function () { return Server::where('show_public', '=', 1) - ->with(['location', 'provider', 'os', 'price', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels', 'labels.label']) + ->with(['location', 'provider', 'os', 'price', 'ips', 'yabs', 'yabs.disk_speed', 'yabs.network_speed', 'labels']) ->get(); }); } diff --git a/app/Models/Shared.php b/app/Models/Shared.php index 4d2eec8..c5b116b 100644 --- a/app/Models/Shared.php +++ b/app/Models/Shared.php @@ -36,7 +36,7 @@ class Shared extends Model public static function allSharedHosting() {//All shared hosting and relationships (no using joins) return Cache::remember("all_shared", now()->addMonth(1), function () { - return Shared::with(['location', 'provider', 'price', 'ips', 'labels', 'labels.label'])->get(); + return Shared::with(['location', 'provider', 'price', 'ips', 'labels'])->get(); }); } @@ -44,7 +44,7 @@ class Shared extends Model {//Single shared hosting and relationships (no using joins) return Cache::remember("shared_hosting.$shared_id", now()->addMonth(1), function () use ($shared_id) { return Shared::where('id', $shared_id) - ->with(['location', 'provider', 'price', 'ips', 'labels', 'labels.label'])->first(); + ->with(['location', 'provider', 'price', 'ips', 'labels'])->first(); }); } From 4b3e72bc93793888f901c1f71c8ce955723e48fe Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 14:19:39 +1100 Subject: [PATCH 09/19] Updated the confirm delete modal JS Updated the confirm delete modal JS More readability --- resources/views/reseller/index.blade.php | 10 +++++----- resources/views/seedboxes/index.blade.php | 10 +++++----- resources/views/servers/index.blade.php | 14 +++++++------- resources/views/shared/index.blade.php | 10 +++++----- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/resources/views/reseller/index.blade.php b/resources/views/reseller/index.blade.php index 47347a6..05d2641 100644 --- a/resources/views/reseller/index.blade.php +++ b/resources/views/reseller/index.blade.php @@ -56,8 +56,8 @@ class="text-body mx-1"> - + @@ -90,10 +90,10 @@ showModal: false }, methods: { - modalForm(event) { + confirmDeleteModal(event) { this.showModal = true; - this.modal_hostname = event.target.id.replace('btn-', ''); - this.modal_id = event.target.title; + this.modal_hostname = event.target.title; + this.modal_id = event.target.id; this.delete_form_action = 'reseller/' + this.modal_id; } } diff --git a/resources/views/seedboxes/index.blade.php b/resources/views/seedboxes/index.blade.php index aa1afd5..699f6f2 100644 --- a/resources/views/seedboxes/index.blade.php +++ b/resources/views/seedboxes/index.blade.php @@ -80,8 +80,8 @@ class="text-body mx-1"> - + @@ -112,10 +112,10 @@ showModal: false }, methods: { - modalForm(event) { + confirmDeleteModal(event) { this.showModal = true; - this.modal_hostname = event.target.id.replace('btn-', ''); - this.modal_id = event.target.title; + this.modal_hostname = event.target.title; + this.modal_id = event.target.id; this.delete_form_action = 'seedboxes/' + this.modal_id; } } diff --git a/resources/views/servers/index.blade.php b/resources/views/servers/index.blade.php index 2bd26d1..d4b1bdb 100644 --- a/resources/views/servers/index.blade.php +++ b/resources/views/servers/index.blade.php @@ -97,8 +97,8 @@ title="check if up" @click="onClk"> - + @@ -179,8 +179,8 @@ title="check if up" @click="onClk"> - + @@ -237,10 +237,10 @@ }); } }, - modalForm(event) { + confirmDeleteModal(event) { this.showModal = true; - this.modal_hostname = event.target.id.replace('btn-', ''); - this.modal_id = event.target.title; + this.modal_hostname = event.target.title; + this.modal_id = event.target.id; this.delete_form_action = 'servers/' + this.modal_id; } } diff --git a/resources/views/shared/index.blade.php b/resources/views/shared/index.blade.php index 6d289ba..774db1e 100644 --- a/resources/views/shared/index.blade.php +++ b/resources/views/shared/index.blade.php @@ -58,8 +58,8 @@ - + @@ -90,10 +90,10 @@ showModal: false }, methods: { - modalForm(event) { + confirmDeleteModal(event) { this.showModal = true; - this.modal_hostname = event.target.id.replace('btn-', ''); - this.modal_id = event.target.title; + this.modal_hostname = event.target.title; + this.modal_id = event.target.id; this.delete_form_action = 'shared/' + this.modal_id; } } From dcb8a78ff817b92fb91e3c91c84bdf65167201bb Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 14:20:26 +1100 Subject: [PATCH 10/19] Updated the server choose compare method Updated the server choose compare method If 2 suitable servers aren't found then throw an error alert --- app/Http/Controllers/ServerController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index 0593f86..60fd171 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -208,7 +208,13 @@ class ServerController extends Controller public function chooseCompare() {//NOTICE: Selecting servers is not cached yet $all_servers = Server::where('has_yabs', 1)->get(); - return view('servers.choose-compare', compact('all_servers')); + + if (isset($all_servers[1])){ + return view('servers.choose-compare', compact('all_servers')); + } + + return redirect()->route('servers.index') + ->with('error', 'You need atleast 2 servers with a YABS to do a compare'); } public function compareServers($server1, $server2) From cde2c8d8b65897dca3832b099ab0b825fc6a2b96 Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 14:21:27 +1100 Subject: [PATCH 11/19] Added input parameters for compareYabs() Added input parameters for compareYabs() Used abort(404) instead of return response()->view('errors.404',........ --- app/Http/Controllers/YabsController.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/YabsController.php b/app/Http/Controllers/YabsController.php index daa7a48..21c549f 100644 --- a/app/Http/Controllers/YabsController.php +++ b/app/Http/Controllers/YabsController.php @@ -4,13 +4,9 @@ namespace App\Http\Controllers; use App\Models\Server; use App\Models\Yabs; -use App\Process; -use App\Models\DiskSpeed; -use App\Models\NetworkSpeed; use Illuminate\Http\Request; use Illuminate\Support\Facades\Cache; use Illuminate\Support\Facades\DB; -use Illuminate\Support\Str; class YabsController extends Controller { @@ -66,18 +62,18 @@ class YabsController extends Controller ->with('error', 'You need atleast 2 YABS to do a compare'); } - public function compareYabs($yabs1, $yabs2) + public function compareYabs(string $yabs1, string $yabs2) { $yabs1_data = Yabs::yabs($yabs1); if (count($yabs1_data) === 0) { - return response()->view('errors.404', array("status" => 404, "title" => "Page not found", "message" => "No YABs data was found for id '$yabs1'"), 404); + abort(404); } $yabs2_data = Yabs::yabs($yabs2); if (count($yabs2_data) === 0) { - return response()->view('errors.404', array("status" => 404, "title" => "Page not found", "message" => "No YABs data was found for id '$server2'"), 404); + abort(404); } return view('yabs.compare', compact('yabs1_data', 'yabs2_data')); From 888171c9701fe9d2223adb0733a36e1637772e16 Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 14:33:45 +1100 Subject: [PATCH 12/19] Removed unused alert components Removed unused alert components --- resources/views/components/errors-alert.blade.php | 5 ----- resources/views/components/success-alert.blade.php | 5 ----- 2 files changed, 10 deletions(-) delete mode 100644 resources/views/components/errors-alert.blade.php delete mode 100644 resources/views/components/success-alert.blade.php diff --git a/resources/views/components/errors-alert.blade.php b/resources/views/components/errors-alert.blade.php deleted file mode 100644 index e4c357a..0000000 --- a/resources/views/components/errors-alert.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@if ($message = Session::get('error')) - -@endif diff --git a/resources/views/components/success-alert.blade.php b/resources/views/components/success-alert.blade.php deleted file mode 100644 index add129c..0000000 --- a/resources/views/components/success-alert.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@if ($message = Session::get('success')) - -@endif From c52a55dd5aa907f8fbdd961eb4f91b3681b7752a Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 14:34:00 +1100 Subject: [PATCH 13/19] Added response alert for success and error Added response alert for success and error --- resources/views/components/response-alerts.blade.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 resources/views/components/response-alerts.blade.php diff --git a/resources/views/components/response-alerts.blade.php b/resources/views/components/response-alerts.blade.php new file mode 100644 index 0000000..da6f579 --- /dev/null +++ b/resources/views/components/response-alerts.blade.php @@ -0,0 +1,9 @@ +@if ($message = Session::get('success')) + +@elseif($message = Session::get('error')) + +@endif From 3b35cae87599f0417415bd5bc798bb4edc8c8370 Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 14:36:21 +1100 Subject: [PATCH 14/19] Implemented new response alert component into views Implemented new response alert component into views --- resources/views/dns/create.blade.php | 2 +- resources/views/dns/edit.blade.php | 2 +- resources/views/dns/index.blade.php | 2 +- resources/views/domains/create.blade.php | 2 +- resources/views/domains/edit.blade.php | 2 +- resources/views/domains/index.blade.php | 2 +- resources/views/ips/create.blade.php | 2 +- resources/views/ips/index.blade.php | 2 +- resources/views/labels/create.blade.php | 2 +- resources/views/labels/index.blade.php | 2 +- resources/views/locations/create.blade.php | 2 +- resources/views/locations/index.blade.php | 2 +- resources/views/misc/create.blade.php | 2 +- resources/views/misc/edit.blade.php | 2 +- resources/views/misc/index.blade.php | 2 +- resources/views/os/create.blade.php | 2 +- resources/views/os/index.blade.php | 2 +- resources/views/providers/create.blade.php | 2 +- resources/views/providers/index.blade.php | 2 +- resources/views/servers/create.blade.php | 2 +- resources/views/servers/edit.blade.php | 2 +- resources/views/servers/index.blade.php | 3 +-- resources/views/yabs/create.blade.php | 2 +- resources/views/yabs/index.blade.php | 3 +-- 24 files changed, 24 insertions(+), 26 deletions(-) diff --git a/resources/views/dns/create.blade.php b/resources/views/dns/create.blade.php index 9a34d0e..4c22ccf 100644 --- a/resources/views/dns/create.blade.php +++ b/resources/views/dns/create.blade.php @@ -10,7 +10,7 @@ {{ route('dns.index') }} Go back - +
@csrf
diff --git a/resources/views/dns/edit.blade.php b/resources/views/dns/edit.blade.php index c2a382c..babd88d 100644 --- a/resources/views/dns/edit.blade.php +++ b/resources/views/dns/edit.blade.php @@ -10,7 +10,7 @@ {{ route('dns.index') }} Go back - + @csrf @method('PUT') diff --git a/resources/views/dns/index.blade.php b/resources/views/dns/index.blade.php index 9d546bb..cc2e881 100644 --- a/resources/views/dns/index.blade.php +++ b/resources/views/dns/index.blade.php @@ -14,7 +14,7 @@ Add DNS - +
diff --git a/resources/views/domains/create.blade.php b/resources/views/domains/create.blade.php index 3db9c9f..f0094b7 100644 --- a/resources/views/domains/create.blade.php +++ b/resources/views/domains/create.blade.php @@ -10,7 +10,7 @@ {{ route('domains.index') }} Go back - + @csrf
diff --git a/resources/views/domains/edit.blade.php b/resources/views/domains/edit.blade.php index d3d5681..e70c0b4 100644 --- a/resources/views/domains/edit.blade.php +++ b/resources/views/domains/edit.blade.php @@ -10,7 +10,7 @@ {{ route('domains.index') }} Go back - + @csrf @method('PUT') diff --git a/resources/views/domains/index.blade.php b/resources/views/domains/index.blade.php index 95d5bd5..c4eae36 100644 --- a/resources/views/domains/index.blade.php +++ b/resources/views/domains/index.blade.php @@ -14,7 +14,7 @@ Add a domain - +
diff --git a/resources/views/ips/create.blade.php b/resources/views/ips/create.blade.php index 9dc6f8b..35c7212 100644 --- a/resources/views/ips/create.blade.php +++ b/resources/views/ips/create.blade.php @@ -10,7 +10,7 @@ {{ route('IPs.index') }} Go back - + @csrf
diff --git a/resources/views/ips/index.blade.php b/resources/views/ips/index.blade.php index c38e293..b18b96f 100644 --- a/resources/views/ips/index.blade.php +++ b/resources/views/ips/index.blade.php @@ -17,7 +17,7 @@ Add IP - +
diff --git a/resources/views/labels/create.blade.php b/resources/views/labels/create.blade.php index cc13a44..aa44e0b 100644 --- a/resources/views/labels/create.blade.php +++ b/resources/views/labels/create.blade.php @@ -10,7 +10,7 @@ {{ route('labels.index') }} Go back - + @csrf
diff --git a/resources/views/labels/index.blade.php b/resources/views/labels/index.blade.php index 4eb0656..58914d1 100644 --- a/resources/views/labels/index.blade.php +++ b/resources/views/labels/index.blade.php @@ -17,7 +17,7 @@ Add a label - +
diff --git a/resources/views/locations/create.blade.php b/resources/views/locations/create.blade.php index b15998b..b613798 100644 --- a/resources/views/locations/create.blade.php +++ b/resources/views/locations/create.blade.php @@ -10,7 +10,7 @@ {{ route('locations.index') }} Go back - + @csrf
diff --git a/resources/views/locations/index.blade.php b/resources/views/locations/index.blade.php index 3d1080e..4639ea1 100644 --- a/resources/views/locations/index.blade.php +++ b/resources/views/locations/index.blade.php @@ -17,7 +17,7 @@ Add a location - +
diff --git a/resources/views/misc/create.blade.php b/resources/views/misc/create.blade.php index 260cedc..419f3a7 100644 --- a/resources/views/misc/create.blade.php +++ b/resources/views/misc/create.blade.php @@ -10,7 +10,7 @@ {{ route('misc.index') }} Go back - + @csrf
diff --git a/resources/views/misc/edit.blade.php b/resources/views/misc/edit.blade.php index c05db6f..99f3c87 100644 --- a/resources/views/misc/edit.blade.php +++ b/resources/views/misc/edit.blade.php @@ -10,7 +10,7 @@ {{ route('misc.index') }} Go back - + @csrf @method('PUT') diff --git a/resources/views/misc/index.blade.php b/resources/views/misc/index.blade.php index cd574b3..567362b 100644 --- a/resources/views/misc/index.blade.php +++ b/resources/views/misc/index.blade.php @@ -14,7 +14,7 @@ Add misc service - +
diff --git a/resources/views/os/create.blade.php b/resources/views/os/create.blade.php index 2acde16..879eefd 100644 --- a/resources/views/os/create.blade.php +++ b/resources/views/os/create.blade.php @@ -10,7 +10,7 @@ {{ route('os.index') }} Go back - + @csrf
diff --git a/resources/views/os/index.blade.php b/resources/views/os/index.blade.php index e35cd53..3569103 100644 --- a/resources/views/os/index.blade.php +++ b/resources/views/os/index.blade.php @@ -17,7 +17,7 @@ Add an OS - +
diff --git a/resources/views/providers/create.blade.php b/resources/views/providers/create.blade.php index c118286..e9e1676 100644 --- a/resources/views/providers/create.blade.php +++ b/resources/views/providers/create.blade.php @@ -10,7 +10,7 @@ {{ route('providers.index') }} Go back - + @csrf
diff --git a/resources/views/providers/index.blade.php b/resources/views/providers/index.blade.php index 5b94b90..81bd2e0 100644 --- a/resources/views/providers/index.blade.php +++ b/resources/views/providers/index.blade.php @@ -17,7 +17,7 @@ Add a provider - +
diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php index 4b72fe1..d4207ec 100644 --- a/resources/views/servers/create.blade.php +++ b/resources/views/servers/create.blade.php @@ -14,7 +14,7 @@ {{ route('servers.index') }} Go back - + @csrf
diff --git a/resources/views/servers/edit.blade.php b/resources/views/servers/edit.blade.php index 67cada8..bef06fd 100644 --- a/resources/views/servers/edit.blade.php +++ b/resources/views/servers/edit.blade.php @@ -12,7 +12,7 @@ {{ route('servers.index') }} Back to servers - + @csrf @method('PUT') diff --git a/resources/views/servers/index.blade.php b/resources/views/servers/index.blade.php index d4b1bdb..880ad5b 100644 --- a/resources/views/servers/index.blade.php +++ b/resources/views/servers/index.blade.php @@ -12,6 +12,7 @@
+
@@ -118,7 +118,6 @@ Add serverCompare servers -
diff --git a/resources/views/yabs/create.blade.php b/resources/views/yabs/create.blade.php index a34b94b..bc2c8d0 100644 --- a/resources/views/yabs/create.blade.php +++ b/resources/views/yabs/create.blade.php @@ -10,7 +10,7 @@ {{ route('yabs.index') }} Go back - + @csrf
diff --git a/resources/views/yabs/index.blade.php b/resources/views/yabs/index.blade.php index 8556878..0cf3cbd 100644 --- a/resources/views/yabs/index.blade.php +++ b/resources/views/yabs/index.blade.php @@ -14,8 +14,7 @@ Compare YABs - - +
From 07194a299dce8ea0f564258a675a6bdb0db9d212 Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 16:03:31 +1100 Subject: [PATCH 15/19] Updated views title @section Updated views title @section This method removes the whitespace --- resources/views/account/index.blade.php | 2 +- resources/views/dns/create.blade.php | 2 +- resources/views/dns/edit.blade.php | 2 +- resources/views/dns/index.blade.php | 2 +- resources/views/dns/show.blade.php | 2 +- resources/views/domains/create.blade.php | 2 +- resources/views/domains/edit.blade.php | 2 +- resources/views/domains/index.blade.php | 2 +- resources/views/domains/show.blade.php | 4 +--- resources/views/home.blade.php | 2 +- resources/views/ips/create.blade.php | 2 +- resources/views/ips/index.blade.php | 2 +- resources/views/labels/create.blade.php | 2 +- resources/views/labels/index.blade.php | 2 +- resources/views/labels/show.blade.php | 2 +- resources/views/locations/create.blade.php | 2 +- resources/views/locations/index.blade.php | 2 +- resources/views/locations/show.blade.php | 2 +- resources/views/misc/create.blade.php | 2 +- resources/views/misc/edit.blade.php | 2 +- resources/views/misc/index.blade.php | 2 +- resources/views/misc/show.blade.php | 2 +- resources/views/os/create.blade.php | 2 +- resources/views/os/index.blade.php | 2 +- resources/views/providers/create.blade.php | 2 +- resources/views/providers/index.blade.php | 2 +- resources/views/providers/show.blade.php | 2 +- resources/views/reseller/create.blade.php | 2 +- resources/views/reseller/edit.blade.php | 2 +- resources/views/reseller/index.blade.php | 2 +- resources/views/reseller/show.blade.php | 2 +- resources/views/seedboxes/create.blade.php | 2 +- resources/views/seedboxes/edit.blade.php | 2 +- resources/views/seedboxes/index.blade.php | 2 +- resources/views/seedboxes/show.blade.php | 2 +- resources/views/servers/choose-compare.blade.php | 2 +- resources/views/servers/compare.blade.php | 4 +--- resources/views/servers/create.blade.php | 2 +- resources/views/servers/edit.blade.php | 4 +--- resources/views/servers/index-cards.blade.php | 4 +--- resources/views/servers/index.blade.php | 2 +- resources/views/servers/public-index.blade.php | 2 +- resources/views/servers/show.blade.php | 4 +--- resources/views/settings/index.blade.php | 2 +- resources/views/shared/create.blade.php | 2 +- resources/views/shared/edit.blade.php | 2 +- resources/views/shared/index.blade.php | 2 +- resources/views/shared/show.blade.php | 2 +- resources/views/yabs/choose-compare.blade.php | 4 +--- resources/views/yabs/compare.blade.php | 2 +- resources/views/yabs/create.blade.php | 2 +- resources/views/yabs/index.blade.php | 2 +- resources/views/yabs/show.blade.php | 2 +- 53 files changed, 53 insertions(+), 65 deletions(-) diff --git a/resources/views/account/index.blade.php b/resources/views/account/index.blade.php index 55a3f57..4a25290 100644 --- a/resources/views/account/index.blade.php +++ b/resources/views/account/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Edit account'}} @endsection +@section("title", "Edit account") Edit account diff --git a/resources/views/dns/create.blade.php b/resources/views/dns/create.blade.php index 4c22ccf..7339c26 100644 --- a/resources/views/dns/create.blade.php +++ b/resources/views/dns/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Insert DNS'}} @endsection +@section("title", "Insert DNS") {{ __('Insert a new DNS') }} diff --git a/resources/views/dns/edit.blade.php b/resources/views/dns/edit.blade.php index babd88d..6f7274b 100644 --- a/resources/views/dns/edit.blade.php +++ b/resources/views/dns/edit.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Edit'}} {{ $dn->hostname }} {{$dn->dns_type}} {{'DNS'}} @endsection +@section("title", "Edit {$dn->hostname} {$dn->dns_type} DNS") Edit {{ $dn->hostname }} {{$dn->dns_type}} record diff --git a/resources/views/dns/index.blade.php b/resources/views/dns/index.blade.php index cc2e881..565ee03 100644 --- a/resources/views/dns/index.blade.php +++ b/resources/views/dns/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'DNS'}} @endsection +@section("title", "DNS") @section('style') @endsection diff --git a/resources/views/dns/show.blade.php b/resources/views/dns/show.blade.php index ca575ee..57329e9 100644 --- a/resources/views/dns/show.blade.php +++ b/resources/views/dns/show.blade.php @@ -1,4 +1,4 @@ -@section('title') {{ $dns->hostname }} {{$dns->dns_type}} {{'dns'}} @endsection +@section("title", "{$dns->hostname} {$dns->dns_type} DNS") {{ __('DNS details') }} diff --git a/resources/views/domains/create.blade.php b/resources/views/domains/create.blade.php index f0094b7..880b0c5 100644 --- a/resources/views/domains/create.blade.php +++ b/resources/views/domains/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Insert domain'}} @endsection +@section("title", "Insert Domain") {{ __('Insert a new domain') }} diff --git a/resources/views/domains/edit.blade.php b/resources/views/domains/edit.blade.php index e70c0b4..ce9013f 100644 --- a/resources/views/domains/edit.blade.php +++ b/resources/views/domains/edit.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Edit domain'}} @endsection +@section("title", "Edit Domain") Edit {{ $domain_info->domain }}.{{ $domain_info->extension }} diff --git a/resources/views/domains/index.blade.php b/resources/views/domains/index.blade.php index c4eae36..d49e1d9 100644 --- a/resources/views/domains/index.blade.php +++ b/resources/views/domains/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Domains'}} @endsection +@section("title", "Domains") @section('style') @endsection diff --git a/resources/views/domains/show.blade.php b/resources/views/domains/show.blade.php index 0a72b69..76d0fba 100644 --- a/resources/views/domains/show.blade.php +++ b/resources/views/domains/show.blade.php @@ -1,6 +1,4 @@ -@section('title') - {{ $domain_info->domain }}.{{$domain_info->extension}} {{'domain'}} -@endsection +@section("title", "{$domain_info->domain }.{$domain_info->extension} domain") {{ __('Domain details') }} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 8a0587b..1d6e3c7 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Home'}} @endsection +@section("title", "Home")
@if (Route::has('login')) diff --git a/resources/views/ips/create.blade.php b/resources/views/ips/create.blade.php index 35c7212..71b1a12 100644 --- a/resources/views/ips/create.blade.php +++ b/resources/views/ips/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Insert IP address'}} @endsection +@section("title", "Insert IP address") {{ __('Insert a new IP') }} diff --git a/resources/views/ips/index.blade.php b/resources/views/ips/index.blade.php index b18b96f..a4390ad 100644 --- a/resources/views/ips/index.blade.php +++ b/resources/views/ips/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'IP Addresses'}} @endsection +@section("title", "IP addresses") @section('css_links') @endsection diff --git a/resources/views/labels/create.blade.php b/resources/views/labels/create.blade.php index aa44e0b..eccc6d4 100644 --- a/resources/views/labels/create.blade.php +++ b/resources/views/labels/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Insert project'}} @endsection +@section("title", "Add label") {{ __('Insert a new label') }} diff --git a/resources/views/labels/index.blade.php b/resources/views/labels/index.blade.php index 58914d1..e96940b 100644 --- a/resources/views/labels/index.blade.php +++ b/resources/views/labels/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Labels'}} @endsection +@section("title", "Labels") @section('css_links') @endsection diff --git a/resources/views/labels/show.blade.php b/resources/views/labels/show.blade.php index af7d3ee..2949b71 100644 --- a/resources/views/labels/show.blade.php +++ b/resources/views/labels/show.blade.php @@ -1,4 +1,4 @@ -@section('title') {{ $label->label }} {{'label'}} @endsection +@section("title", "{$label->label} label") {{ __('Label details') }} diff --git a/resources/views/locations/create.blade.php b/resources/views/locations/create.blade.php index b613798..7f23c74 100644 --- a/resources/views/locations/create.blade.php +++ b/resources/views/locations/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Insert location'}} @endsection +@section("title", "Insert Location") {{ __('Insert a new location') }} diff --git a/resources/views/locations/index.blade.php b/resources/views/locations/index.blade.php index 4639ea1..07e51e5 100644 --- a/resources/views/locations/index.blade.php +++ b/resources/views/locations/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Locations'}} @endsection +@section("title", "Locations") @section('css_links') @endsection diff --git a/resources/views/locations/show.blade.php b/resources/views/locations/show.blade.php index 5e18bd7..6ecf7f3 100644 --- a/resources/views/locations/show.blade.php +++ b/resources/views/locations/show.blade.php @@ -1,4 +1,4 @@ -@section('title') {{ $location->name }} {{'location'}} @endsection +@section("title", "{$location->name} location") {{ __('Location details') }} diff --git a/resources/views/misc/create.blade.php b/resources/views/misc/create.blade.php index 419f3a7..df16ec6 100644 --- a/resources/views/misc/create.blade.php +++ b/resources/views/misc/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Insert misc service'}} @endsection +@section("title", "Insert misc service") {{ __('Insert a new misc service') }} diff --git a/resources/views/misc/edit.blade.php b/resources/views/misc/edit.blade.php index 99f3c87..dd2a09e 100644 --- a/resources/views/misc/edit.blade.php +++ b/resources/views/misc/edit.blade.php @@ -1,4 +1,4 @@ -@section('title') {{$misc_data->name}} {{'edit'}} @endsection +@section("title", "{$misc_data->name} edit") Edit {{ $misc_data->name }} diff --git a/resources/views/misc/index.blade.php b/resources/views/misc/index.blade.php index 567362b..c91f044 100644 --- a/resources/views/misc/index.blade.php +++ b/resources/views/misc/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Misc services'}} @endsection +@section("title", "Misc services") @section('style') @endsection diff --git a/resources/views/misc/show.blade.php b/resources/views/misc/show.blade.php index 8bb5e4c..1390545 100644 --- a/resources/views/misc/show.blade.php +++ b/resources/views/misc/show.blade.php @@ -1,4 +1,4 @@ -@section('title') {{ $misc_data->name }} {{'service'}} @endsection +@section("title", "{$misc_data->name} service") {{ __('Misc details') }} diff --git a/resources/views/os/create.blade.php b/resources/views/os/create.blade.php index 879eefd..b2f15fc 100644 --- a/resources/views/os/create.blade.php +++ b/resources/views/os/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Insert operating system'}} @endsection +@section("title", "Insert operating system") {{ __('Insert a new OS') }} diff --git a/resources/views/os/index.blade.php b/resources/views/os/index.blade.php index 3569103..f4d4327 100644 --- a/resources/views/os/index.blade.php +++ b/resources/views/os/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Operating systems'}} @endsection +@section("title", "Operating systems") @section('css_links') @endsection diff --git a/resources/views/providers/create.blade.php b/resources/views/providers/create.blade.php index e9e1676..98e237b 100644 --- a/resources/views/providers/create.blade.php +++ b/resources/views/providers/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Insert provider'}} @endsection +@section("title", "Insert provider") {{ __('Insert a new provider') }} diff --git a/resources/views/providers/index.blade.php b/resources/views/providers/index.blade.php index 81bd2e0..c8bf3db 100644 --- a/resources/views/providers/index.blade.php +++ b/resources/views/providers/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Providers'}} @endsection +@section("title", "Providers") @section('css_links') @endsection diff --git a/resources/views/providers/show.blade.php b/resources/views/providers/show.blade.php index 9898d41..cee0f13 100644 --- a/resources/views/providers/show.blade.php +++ b/resources/views/providers/show.blade.php @@ -1,4 +1,4 @@ -@section('title') {{ $provider->name }} {{'provider'}} @endsection +@section("title", "{$provider->name } provider") {{ __('Provider details') }} diff --git a/resources/views/reseller/create.blade.php b/resources/views/reseller/create.blade.php index b4e4ee4..8129791 100644 --- a/resources/views/reseller/create.blade.php +++ b/resources/views/reseller/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Enter new reseller hosting'}} @endsection +@section("title", "Enter new reseller hosting") {{ __('Insert a new reseller hosting') }} diff --git a/resources/views/reseller/edit.blade.php b/resources/views/reseller/edit.blade.php index 8cee131..38340b2 100644 --- a/resources/views/reseller/edit.blade.php +++ b/resources/views/reseller/edit.blade.php @@ -1,4 +1,4 @@ -@section('title') {{$reseller->main_domain}} {{'edit'}} @endsection +@section("title", "{$reseller->main_domain} edit") Edit {{ $reseller->main_domain }} diff --git a/resources/views/reseller/index.blade.php b/resources/views/reseller/index.blade.php index 05d2641..edaae17 100644 --- a/resources/views/reseller/index.blade.php +++ b/resources/views/reseller/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Resellers'}} @endsection +@section("title", "Resellers") @section('style') @endsection diff --git a/resources/views/reseller/show.blade.php b/resources/views/reseller/show.blade.php index 78d7b25..638cc64 100644 --- a/resources/views/reseller/show.blade.php +++ b/resources/views/reseller/show.blade.php @@ -1,4 +1,4 @@ -@section('title') {{$reseller->main_domain}} {{'reseller hosting'}} @endsection +@section("title", "{$reseller->main_domain} reseller hosting") {{ __('Reseller hosting details') }} diff --git a/resources/views/seedboxes/create.blade.php b/resources/views/seedboxes/create.blade.php index 108a989..d9b393c 100644 --- a/resources/views/seedboxes/create.blade.php +++ b/resources/views/seedboxes/create.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Enter new seed box'}} @endsection +@section("title", "Enter new seed box") {{ __('Insert a new seed box') }} diff --git a/resources/views/seedboxes/edit.blade.php b/resources/views/seedboxes/edit.blade.php index 737c7bd..2118000 100644 --- a/resources/views/seedboxes/edit.blade.php +++ b/resources/views/seedboxes/edit.blade.php @@ -1,4 +1,4 @@ -@section('title') {{$seedbox_data->title}} {{'edit'}} @endsection +@section("title", "{$seedbox_data->title} edit") Edit {{ $seedbox_data->title }} diff --git a/resources/views/seedboxes/index.blade.php b/resources/views/seedboxes/index.blade.php index 699f6f2..bb254ee 100644 --- a/resources/views/seedboxes/index.blade.php +++ b/resources/views/seedboxes/index.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Seed boxes'}} @endsection +@section("title", "Seed boxes") @section('style') @endsection diff --git a/resources/views/seedboxes/show.blade.php b/resources/views/seedboxes/show.blade.php index 579a95d..b5e7cdf 100644 --- a/resources/views/seedboxes/show.blade.php +++ b/resources/views/seedboxes/show.blade.php @@ -1,4 +1,4 @@ -@section('title') {{$seedbox_data->title}} {{'Seed box'}} @endsection +@section("title", "{$seedbox_data->title} seed box") {{ __('Seed box details') }} diff --git a/resources/views/servers/choose-compare.blade.php b/resources/views/servers/choose-compare.blade.php index 82154eb..158fcbf 100644 --- a/resources/views/servers/choose-compare.blade.php +++ b/resources/views/servers/choose-compare.blade.php @@ -1,4 +1,4 @@ -@section('title') {{'Choose servers'}} @endsection +@section("title", "Choose servers") @section('scripts') @endsection diff --git a/resources/views/servers/compare.blade.php b/resources/views/servers/compare.blade.php index cd11811..2a7234e 100644 --- a/resources/views/servers/compare.blade.php +++ b/resources/views/servers/compare.blade.php @@ -1,6 +1,4 @@ -@section('title') - {{'Compare servers'}} -@endsection +@section("title", "Compare servers") @section('style') - - - - -
- @if (Route::has('login')) - - @endif - -
-
- - - - - -
- -
-
-
-
- -
Documentation
-
- -
-
- Laravel has wonderful, thorough documentation covering every aspect of the framework. Whether you are new to the framework or have previous experience with Laravel, we recommend reading all of the documentation from beginning to end. -
-
-
- -
-
- -
Laracasts
-
- -
-
- Laracasts offers thousands of video tutorials on Laravel, PHP, and JavaScript development. Check them out, see for yourself, and massively level up your development skills in the process. -
-
-
- -
-
- -
Laravel News
-
- -
-
- Laravel News is a community driven portal and newsletter aggregating all of the latest and most important news in the Laravel ecosystem, including new package releases and tutorials. -
-
-
- -
-
- -
Vibrant Ecosystem
-
- -
-
- Laravel's robust library of first-party tools and libraries, such as Forge, Vapor, Nova, and Envoyer help you take your projects to the next level. Pair them with powerful open source libraries like Cashier, Dusk, Echo, Horizon, Sanctum, Telescope, and more. -
-
-
-
-
- -
-
-
- - - - - - Shop - - - - - - - - Sponsor - -
-
- -
- Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }}) -
-
-
-
- - From 83500fa58e2085e3a5270b4a072e285262867b93 Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 16:04:26 +1100 Subject: [PATCH 17/19] Updated RouteServiceProvider::HOME for '/' Updated RouteServiceProvider::HOME for '/' instead of '/dashboard' --- app/Providers/RouteServiceProvider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3ee2b67..21563c8 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -17,7 +17,7 @@ class RouteServiceProvider extends ServiceProvider * * @var string */ - public const HOME = '/dashboard'; + public const HOME = '/'; /** * The controller namespace for the application. From ea8c15d2d87e5cd2d8ad0469427a8d052385221e Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 16:04:50 +1100 Subject: [PATCH 18/19] Removed dashboard redirect from routes Removed dashboard redirect from routes --- routes/web.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/routes/web.php b/routes/web.php index b99ed60..f8cbf3f 100644 --- a/routes/web.php +++ b/routes/web.php @@ -30,11 +30,6 @@ use Illuminate\Support\Facades\Route; Route::get('/', 'App\Http\Controllers\HomeController@index')->name('/'); - -Route::get('dashboard', function () { - return redirect('/'); -}); - require __DIR__ . '/auth.php'; Route::resource('account', AccountController::class)->middleware(['auth']); @@ -61,7 +56,6 @@ Route::get('servers/public', 'App\Http\Controllers\ServerController@showServersP Route::resource('servers', ServerController::class)->middleware(['auth']); - Route::resource('settings', SettingsController::class)->middleware(['auth']); Route::resource('seedboxes', SeedBoxesController::class)->middleware(['auth']); From 0ad542afb4a6a06b934651c61ad9f433ccbff9ab Mon Sep 17 00:00:00 2001 From: cp6 Date: Thu, 13 Oct 2022 16:09:30 +1100 Subject: [PATCH 19/19] Updated readme for 2.1.7 Updated readme for 2.1.7 --- README.md | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 66441af..751e3f7 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Despite what the name infers this self hosted web app isn't just for storing idl a [YABs](https://github.com/masonr/yet-another-bench-script) output you can get disk & network speed values along with GeekBench 5 scores to do easier comparing and sorting. -[![Generic badge](https://img.shields.io/badge/version-2.1.6-blue.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/Laravel-9.0-red.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/PHP-8.1-purple.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/Bootstrap-5.1-pink.svg)](https://shields.io/) +[![Generic badge](https://img.shields.io/badge/version-2.1.7-blue.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/Laravel-9.0-red.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/PHP-8.1-purple.svg)](https://shields.io/) [![Generic badge](https://img.shields.io/badge/Bootstrap-5.1-pink.svg)](https://shields.io/) @@ -20,7 +20,7 @@ GeekBench 5 scores to do easier comparing and sorting. [Cloud Five Limited](https://cloud-v.net/) for providing the hosting for demo installation. -## 2.1.6 changes (22th September 2022): +## 2.1.7 changes (13th October 2022): #### You can no longer use the form to submit YABS results yabs.sh now has JSON formatted response and can POST the output directly from calling the script. @@ -36,24 +36,26 @@ Example yabs.sh call to POST the result #### Please run the following if updating from existing install: ```shell -composer install php artisan migrate php artisan route:cache php artisan cache:clear ``` -* Added doctrine/dbal -* Removed old method and functions for adding a YABS result -* Fixed YABS JSON parser disk being the ram value -* Fixed YABS JSON parser disk conversion (MB & GB) -* Fixed YABS JSON parser RAM conversion (MB & GB) -* Fixed OS icons for server index page (showing wrongly) -* Added custom HTTP error pages -* Updated yabs table for gb5 values to be nullable -* Updated error alert component -* Updated posting YABS now clears relevant caches -* Updated models and controllers to use first() -* Update yabs compare view blade for nullable values +* Added default order by (Change this in settings) +* Added dual success & error response alert component +* Added new response alert component into views +* Added input parameters for `compareYabs()` +* Updated and fixed server_type and virt mix-ups +* Updated views title `@section` layout +* Updated cache timeframes +* Updated `RouteServiceProvider::HOME` for `'/'` +* Updated the server choose compare method +* Fixed update server ssh port +* Fixed server due in X days being null +* Removed unused with 'labels.label' in queries +* Removed unused welcome and dashboard views +* Removed dashboard redirect to / from routes file +* Removed now unused success & error alert components ## Requires