diff --git a/.idea/php.xml b/.idea/php.xml index a38beb5..879712d 100644 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -2,148 +2,148 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/composer.json b/composer.json index d28d169..070a970 100644 --- a/composer.json +++ b/composer.json @@ -11,11 +11,11 @@ "php": "^7.4", "coraxster/flysystem-aws-s3-v3-minio": "^1.0", "fideloper/proxy": "^4.0", - "kalnoy/nestedset": "^5.0", "laravel/framework": "^8.0", "laravel/passport": "^10", "laravel/tinker": "^2.0", "maatwebsite/excel": "^3.1", + "nestedset/willaarts": "^5.0.7", "spatie/laravel-medialibrary": "^8.0.0", "wm/blog": "dev-master", "wm/common": "dev-master", diff --git a/composer.lock b/composer.lock index 57db8f0..07a2fbb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8f5498d899ee8ca761de0be543d89e5c", + "content-hash": "f2539e5a2210c008bcfa11c169c51582", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.164.1", + "version": "3.166.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "bfd16503bd71491e654483773efd23c431817710" + "reference": "fe0ec9235d07b0f51ec4396dce0dd639020ae1a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bfd16503bd71491e654483773efd23c431817710", - "reference": "bfd16503bd71491e654483773efd23c431817710", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/fe0ec9235d07b0f51ec4396dce0dd639020ae1a7", + "reference": "fe0ec9235d07b0f51ec4396dce0dd639020ae1a7", "shasum": "" }, "require": { @@ -92,9 +92,9 @@ "support": { "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.164.1" + "source": "https://github.com/aws/aws-sdk-php/tree/3.166.2" }, - "time": "2020-12-01T04:29:55+00:00" + "time": "2020-12-04T19:12:30+00:00" }, { "name": "brick/math", @@ -1169,81 +1169,18 @@ }, "time": "2019-11-02T09:15:47+00:00" }, - { - "name": "kalnoy/nestedset", - "version": "v5.0.2", - "source": { - "type": "git", - "url": "https://github.com/lazychaser/laravel-nestedset.git", - "reference": "1edd06d0744251940240f28021de7651d7fa71d3" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/lazychaser/laravel-nestedset/zipball/1edd06d0744251940240f28021de7651d7fa71d3", - "reference": "1edd06d0744251940240f28021de7651d7fa71d3", - "shasum": "" - }, - "require": { - "illuminate/database": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0", - "illuminate/events": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0", - "illuminate/support": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0", - "php": ">=7.1.3" - }, - "require-dev": { - "phpunit/phpunit": "7.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "v5.0.x-dev" - }, - "laravel": { - "providers": [ - "Kalnoy\\Nestedset\\NestedSetServiceProvider" - ] - } - }, - "autoload": { - "psr-4": { - "Kalnoy\\Nestedset\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Alexander Kalnoy", - "email": "lazychaser@gmail.com" - } - ], - "description": "Nested Set Model for Laravel 5.7 and up", - "keywords": [ - "database", - "hierarchy", - "laravel", - "nested sets", - "nsm" - ], - "support": { - "issues": "https://github.com/lazychaser/laravel-nestedset/issues", - "source": "https://github.com/lazychaser/laravel-nestedset/tree/v5.0.2" - }, - "time": "2020-09-11T06:18:17+00:00" - }, { "name": "laravel/framework", - "version": "v8.17.0", + "version": "v8.17.2", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "09bd79531d3f958f02fa34f1f14197b1716ef29b" + "reference": "b89363b540bd8ad6e727ee165b510a19fe170a28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/09bd79531d3f958f02fa34f1f14197b1716ef29b", - "reference": "09bd79531d3f958f02fa34f1f14197b1716ef29b", + "url": "https://api.github.com/repos/laravel/framework/zipball/b89363b540bd8ad6e727ee165b510a19fe170a28", + "reference": "b89363b540bd8ad6e727ee165b510a19fe170a28", "shasum": "" }, "require": { @@ -1397,7 +1334,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2020-12-01T15:01:58+00:00" + "time": "2020-12-03T13:47:59+00:00" }, { "name": "laravel/passport", @@ -2053,16 +1990,16 @@ }, { "name": "league/oauth2-server", - "version": "8.2.2", + "version": "8.2.3", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-server.git", - "reference": "e87248ffcd905c3dd91ca58d002caa0ec1381c2c" + "reference": "70bb329bc79b7965a56f46e293da946c5a976ef1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/e87248ffcd905c3dd91ca58d002caa0ec1381c2c", - "reference": "e87248ffcd905c3dd91ca58d002caa0ec1381c2c", + "url": "https://api.github.com/repos/thephpleague/oauth2-server/zipball/70bb329bc79b7965a56f46e293da946c5a976ef1", + "reference": "70bb329bc79b7965a56f46e293da946c5a976ef1", "shasum": "" }, "require": { @@ -2071,7 +2008,7 @@ "ext-openssl": "*", "lcobucci/jwt": "^3.4 || ^4.0", "league/event": "^2.2", - "php": "^7.3 || ^8.0", + "php": "^7.2 || ^8.0", "psr/http-message": "^1.0.1" }, "replace": { @@ -2079,10 +2016,10 @@ "lncd/oauth2": "*" }, "require-dev": { - "laminas/laminas-diactoros": "^2.5.0", + "laminas/laminas-diactoros": "^2.4.1", "phpstan/phpstan": "^0.12.57", "phpstan/phpstan-phpunit": "^0.12.16", - "phpunit/phpunit": "^9.4.3", + "phpunit/phpunit": "^8.5.13", "roave/security-advisories": "dev-master" }, "type": "library", @@ -2128,7 +2065,7 @@ ], "support": { "issues": "https://github.com/thephpleague/oauth2-server/issues", - "source": "https://github.com/thephpleague/oauth2-server/tree/8.2.2" + "source": "https://github.com/thephpleague/oauth2-server/tree/8.2.3" }, "funding": [ { @@ -2136,7 +2073,7 @@ "type": "github" } ], - "time": "2020-11-30T10:10:52+00:00" + "time": "2020-12-03T21:32:29+00:00" }, { "name": "maatwebsite/excel", @@ -2769,18 +2706,80 @@ ], "time": "2020-11-28T14:25:28+00:00" }, + { + "name": "nestedset/willaarts", + "version": "v5.0.7", + "source": { + "type": "git", + "url": "https://github.com/aliqasemi/laravel-nestedset.git", + "reference": "6ce0f09d89423df59b82169c6dbeb30e7a0b4e74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/aliqasemi/laravel-nestedset/zipball/6ce0f09d89423df59b82169c6dbeb30e7a0b4e74", + "reference": "6ce0f09d89423df59b82169c6dbeb30e7a0b4e74", + "shasum": "" + }, + "require": { + "illuminate/database": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0", + "illuminate/events": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0", + "illuminate/support": "~5.7.0|~5.8.0|^6.0|^7.0|^8.0", + "php": ">=7.1.3" + }, + "require-dev": { + "phpunit/phpunit": "7.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "v5.0.x-dev" + }, + "laravel": { + "providers": [ + "Kalnoy\\Nestedset\\NestedSetServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Kalnoy\\Nestedset\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alexander Kalnoy", + "email": "lazychaser@gmail.com" + } + ], + "description": "Nested Set Model for Laravel 5.7 and up", + "keywords": [ + "database", + "hierarchy", + "laravel", + "nested sets", + "nsm" + ], + "support": { + "source": "https://github.com/aliqasemi/laravel-nestedset/tree/v5.0.7" + }, + "time": "2020-12-07T14:59:05+00:00" + }, { "name": "nikic/php-parser", - "version": "v4.10.2", + "version": "v4.10.3", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "658f1be311a230e0907f5dfe0213742aff0596de" + "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/658f1be311a230e0907f5dfe0213742aff0596de", - "reference": "658f1be311a230e0907f5dfe0213742aff0596de", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", + "reference": "dbe56d23de8fcb157bbc0cfb3ad7c7de0cfb0984", "shasum": "" }, "require": { @@ -2821,9 +2820,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.3" }, - "time": "2020-09-26T10:30:38+00:00" + "time": "2020-12-03T17:45:45+00:00" }, { "name": "nyholm/psr7", @@ -3715,16 +3714,16 @@ }, { "name": "psy/psysh", - "version": "v0.10.4", + "version": "v0.10.5", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560" + "reference": "7c710551d4a2653afa259c544508dc18a9098956" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a8aec1b2981ab66882a01cce36a49b6317dc3560", - "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7c710551d4a2653afa259c544508dc18a9098956", + "reference": "7c710551d4a2653afa259c544508dc18a9098956", "shasum": "" }, "require": { @@ -3785,9 +3784,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/master" + "source": "https://github.com/bobthecow/psysh/tree/v0.10.5" }, - "time": "2020-05-03T19:32:03+00:00" + "time": "2020-12-04T02:51:30+00:00" }, { "name": "ralouphie/getallheaders", @@ -4000,16 +3999,16 @@ }, { "name": "spatie/image", - "version": "1.10.0", + "version": "1.10.1", "source": { "type": "git", "url": "https://github.com/spatie/image.git", - "reference": "65d615c1f604e479764f25525291d696041dfcea" + "reference": "6eaf45d61832c2396dd4b10cc81d9fce93a59e2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/image/zipball/65d615c1f604e479764f25525291d696041dfcea", - "reference": "65d615c1f604e479764f25525291d696041dfcea", + "url": "https://api.github.com/repos/spatie/image/zipball/6eaf45d61832c2396dd4b10cc81d9fce93a59e2d", + "reference": "6eaf45d61832c2396dd4b10cc81d9fce93a59e2d", "shasum": "" }, "require": { @@ -4051,7 +4050,7 @@ ], "support": { "issues": "https://github.com/spatie/image/issues", - "source": "https://github.com/spatie/image/tree/1.10.0" + "source": "https://github.com/spatie/image/tree/1.10.1" }, "funding": [ { @@ -4063,7 +4062,7 @@ "type": "github" } ], - "time": "2020-11-27T14:44:09+00:00" + "time": "2020-12-01T20:42:11+00:00" }, { "name": "spatie/image-optimizer", @@ -6932,7 +6931,7 @@ "dist": { "type": "path", "url": "./modules/wm-blog", - "reference": "0b130335d46b1f94aadbed7f59e298167f656e79" + "reference": "32d370415a39f0cde486a7e471139c69014972ec" }, "require": { "php": "^7.1.3" @@ -6977,7 +6976,7 @@ "dist": { "type": "path", "url": "./modules/wm-common", - "reference": "35c1e0da9bf2059fa416a8672facd3c946efb1c3" + "reference": "95cdb98c720949f0611b32e09f7714a6a4cef7a0" }, "require": { "php": "^7.1.3", @@ -7023,7 +7022,7 @@ "dist": { "type": "path", "url": "./modules/wm-core", - "reference": "b8ac7be3411f7706caf3ce8f7448b059bd4e7ecf" + "reference": "70af36da3ab05f936b7633f73c05e18bf605be79" }, "require": { "php": "^7.1.3" @@ -7072,7 +7071,7 @@ "dist": { "type": "path", "url": "./modules/wm-crm", - "reference": "0c78c1991eb4f7a8a716d15b35413a6b206c372a" + "reference": "2252da1a040d63dfb44fc0bfadff5bad09053dc0" }, "require": { "php": "^7.1.3", @@ -7119,7 +7118,7 @@ "dist": { "type": "path", "url": "./modules/wm-portfolio", - "reference": "38fa3ce84d59f5c54b16789da542d9c5ef02c897" + "reference": "f26083d54caabe31175afeca564e35d89cc20068" }, "require": { "php": "^7.1.3" @@ -7165,7 +7164,7 @@ "dist": { "type": "path", "url": "./modules/wm-product", - "reference": "5167706bd2ad79abaf5079640a7eaf3f9896de97" + "reference": "d17a7123ab46413ecc72f9e3ad19023b521d7f9e" }, "require": { "php": "^7.1.3", @@ -8635,16 +8634,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.4.4", + "version": "9.5.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6535e637961f0829832621dc1b7308c2d24a799e" + "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6535e637961f0829832621dc1b7308c2d24a799e", - "reference": "6535e637961f0829832621dc1b7308c2d24a799e", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe", + "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe", "shasum": "" }, "require": { @@ -8660,7 +8659,7 @@ "phar-io/version": "^3.0.2", "php": ">=7.3", "phpspec/prophecy": "^1.12.1", - "phpunit/php-code-coverage": "^9.2", + "phpunit/php-code-coverage": "^9.2.3", "phpunit/php-file-iterator": "^3.0.5", "phpunit/php-invoker": "^3.1.1", "phpunit/php-text-template": "^2.0.3", @@ -8691,7 +8690,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.4-dev" + "dev-master": "9.5-dev" } }, "autoload": { @@ -8722,7 +8721,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.4.4" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.0" }, "funding": [ { @@ -8734,7 +8733,7 @@ "type": "github" } ], - "time": "2020-12-01T04:58:47+00:00" + "time": "2020-12-04T05:05:53+00:00" }, { "name": "sebastian/cli-parser", diff --git a/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 b/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 index 8cb2455..fa48f5c 100644 --- a/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 +++ b/storage/framework/cache/data/44/d1/44d142505dd1a3b497197e2f459d2aec779e9ed6 @@ -1 +1 @@ -1607187653i:1607187653; \ No newline at end of file +1607355448i:1607355448; \ No newline at end of file diff --git a/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c b/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c index 4d8c19d..639da8d 100644 --- a/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c +++ b/storage/framework/cache/data/c2/4f/c24f92750673b2169c8cb7bfbc999cfa8457dc7c @@ -1 +1 @@ -1607187653i:3; \ No newline at end of file +1607355448i:3; \ No newline at end of file