From 6abbf904c46ac06c3a86b7ddb22b8c8e9d45dee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Thu, 9 Dec 2021 20:52:19 +0100 Subject: [PATCH 1/8] php 8.1 --- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 10 +++++----- composer.json | 2 +- docker-compose.yml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bf7132bf6..79e1bdc78 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: name: "Create release package" runs-on: ubuntu-20.04 container: - image: skaut/lebeda:8.0 + image: skaut/lebeda:8.1 steps: - uses: actions/checkout@v2 # Copy & paste from https://github.com/actions/cache/blob/master/examples.md#php---composer diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c2fcad0aa..f20b44cb0 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,7 @@ jobs: name: "Build" runs-on: ubuntu-20.04 container: - image: skaut/lebeda:8.0 + image: skaut/lebeda:8.1 steps: - uses: actions/checkout@v2 # Copy & paste from https://github.com/actions/cache/blob/master/examples.md#php---composer @@ -46,7 +46,7 @@ jobs: name: "Unit tests" runs-on: ubuntu-20.04 container: - image: skaut/lebeda:8.0 + image: skaut/lebeda:8.1 needs: workdir steps: - name: Download workdir @@ -102,7 +102,7 @@ jobs: name: "PHPStan analysis" runs-on: ubuntu-20.04 container: - image: skaut/lebeda:8.0 + image: skaut/lebeda:8.1 needs: workdir steps: - name: Download workdir @@ -118,7 +118,7 @@ jobs: name: "Coding standard" runs-on: ubuntu-20.04 container: - image: skaut/lebeda:8.0 + image: skaut/lebeda:8.1 needs: workdir steps: - name: Download workdir @@ -134,7 +134,7 @@ jobs: name: "Doctrine checks" runs-on: ubuntu-20.04 container: - image: skaut/lebeda:8.0 + image: skaut/lebeda:8.1 services: mysql-test: image: mysql:8.0 diff --git a/composer.json b/composer.json index ae29dedaa..e76c10671 100644 --- a/composer.json +++ b/composer.json @@ -9,7 +9,7 @@ ], "require": { - "php": ">=8.0", + "php": ">=8.1", "ext-bcmath": "*", "ext-fileinfo": "*", "ext-iconv": "*", diff --git a/docker-compose.yml b/docker-compose.yml index 78548ad6d..162c4d3eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.4' services: app: container_name: srs.app - image: skaut/lebeda:8.0 + image: skaut/lebeda:8.1 volumes: - www:/var/www - .:/var/www/html From 5ba78412dd4f880387701ccb64f166d71f130082 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Sun, 13 Mar 2022 21:11:50 +0100 Subject: [PATCH 2/8] skautis lib update --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index e76c10671..ffe0e73c8 100644 --- a/composer.json +++ b/composer.json @@ -59,8 +59,8 @@ "eluceo/ical": "^2.5", "endroid/qr-code": "^4.0", - "skautis/skautis": "^2.2", - "skautis/nette": "^2.2", + "skautis/skautis": "3.0.0-alpha.2", + "skautis/nette": "3.0.0-alpha.1", "pear/numbers_words": "^0.18", "azuyalabs/yasumi": "^2.5", From 183e65d8fc51aecc4fb426a82d3216c060c836b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Fri, 16 Sep 2022 20:46:35 +0200 Subject: [PATCH 3/8] skautis library version --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index ffe0e73c8..cc3147ad1 100644 --- a/composer.json +++ b/composer.json @@ -59,8 +59,8 @@ "eluceo/ical": "^2.5", "endroid/qr-code": "^4.0", - "skautis/skautis": "3.0.0-alpha.2", - "skautis/nette": "3.0.0-alpha.1", + "skautis/skautis": "3.0.0-alpha.4", + "skautis/nette": "3.0.0-alpha.2", "pear/numbers_words": "^0.18", "azuyalabs/yasumi": "^2.5", From 757220877f30280b4dbc6e446810fdabbb3c55b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Tue, 20 Sep 2022 22:54:21 +0200 Subject: [PATCH 4/8] update nette skautis --- composer.lock | 324 +++++++++++++++++++++++++++++++------------------- 1 file changed, 204 insertions(+), 120 deletions(-) diff --git a/composer.lock b/composer.lock index a65ee3808..83a8f4932 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": "078cea69d9306549d76b5e04797bdc47", + "content-hash": "30d9b27ff15d7d03b243593c82d89d1d", "packages": [ { "name": "azuyalabs/yasumi", @@ -2153,20 +2153,30 @@ }, { "name": "ezyang/htmlpurifier", - "version": "v4.14.0", + "version": "v4.16.0", "source": { "type": "git", "url": "https://github.com/ezyang/htmlpurifier.git", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75" + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/12ab42bd6e742c70c0a52f7b82477fcd44e64b75", - "reference": "12ab42bd6e742c70c0a52f7b82477fcd44e64b75", + "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/523407fb06eb9e5f3d59889b3978d5bfe94299c8", + "reference": "523407fb06eb9e5f3d59889b3978d5bfe94299c8", "shasum": "" }, "require": { - "php": ">=5.2" + "php": "~5.6.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0 || ~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0" + }, + "require-dev": { + "cerdic/css-tidy": "^1.7 || ^2.0", + "simpletest/simpletest": "dev-master" + }, + "suggest": { + "cerdic/css-tidy": "If you want to use the filter 'Filter.ExtractStyleBlocks'.", + "ext-bcmath": "Used for unit conversion and imagecrash protection", + "ext-iconv": "Converts text to and from non-UTF-8 encodings", + "ext-tidy": "Used for pretty-printing HTML" }, "type": "library", "autoload": { @@ -2198,9 +2208,9 @@ ], "support": { "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/v4.14.0" + "source": "https://github.com/ezyang/htmlpurifier/tree/v4.16.0" }, - "time": "2021-12-25T01:21:49+00:00" + "time": "2022-09-18T07:06:19+00:00" }, { "name": "fmasa/messenger", @@ -5987,25 +5997,25 @@ }, { "name": "psr/simple-cache", - "version": "2.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/simple-cache.git", - "reference": "8707bf3cea6f710bf6ef05491234e3ab06f6432a" + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/8707bf3cea6f710bf6ef05491234e3ab06f6432a", - "reference": "8707bf3cea6f710bf6ef05491234e3ab06f6432a", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": ">=5.3.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { @@ -6020,7 +6030,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" + "homepage": "http://www.php-fig.org/" } ], "description": "Common interfaces for simple caching", @@ -6032,9 +6042,9 @@ "simple-cache" ], "support": { - "source": "https://github.com/php-fig/simple-cache/tree/2.0.0" + "source": "https://github.com/php-fig/simple-cache/tree/master" }, - "time": "2021-10-29T13:22:09+00:00" + "time": "2017-10-23T01:57:42+00:00" }, { "name": "ralouphie/getallheaders", @@ -6154,30 +6164,30 @@ }, { "name": "skautis/nette", - "version": "v2.2.0", + "version": "v3.0.0-alpha.2", "source": { "type": "git", "url": "https://github.com/skaut/SkautisNette.git", - "reference": "a962a18fac109c5882e92b7840074de17a89fd65" + "reference": "248cf53331650c66063c5bae07e44ed1dd62d26f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/skaut/SkautisNette/zipball/a962a18fac109c5882e92b7840074de17a89fd65", - "reference": "a962a18fac109c5882e92b7840074de17a89fd65", + "url": "https://api.github.com/repos/skaut/SkautisNette/zipball/248cf53331650c66063c5bae07e44ed1dd62d26f", + "reference": "248cf53331650c66063c5bae07e44ed1dd62d26f", "shasum": "" }, "require": { - "nette/di": "^2.4.6 || ^3.0.1", - "nette/http": "^2.4.7 || ^3.0", - "nette/utils": "^2.5.4 || ^3.0", - "php": ">=5.6", - "skautis/skautis": "^2.0" + "nette/di": "^3.0", + "nette/http": "^3.0", + "nette/utils": "^3.0", + "php": ">=7.2", + "skautis/skautis": "3.0.0-alpha.4" }, "require-dev": { - "nette/bootstrap": "^2.4 || ^3.0", - "nette/caching": "^2.5 || ^3.0", - "nette/finder": "^2.4", - "nette/tester": "^2.3.1", + "nette/bootstrap": "^3.0", + "nette/caching": "^3.0", + "nette/tester": "^2.0", + "phpstan/phpstan": "^0.12", "tracy/tracy": "^2.5" }, "suggest": { @@ -6212,39 +6222,45 @@ "source": "https://github.com/skaut/SkautisNette", "wiki": "http://is.skaut.cz/napoveda/" }, - "time": "2020-02-14T11:45:16+00:00" + "time": "2022-09-20T20:29:00+00:00" }, { "name": "skautis/skautis", - "version": "v2.2.0", + "version": "v3.0.0-alpha.4", "source": { "type": "git", "url": "https://github.com/skaut/Skautis.git", - "reference": "e770502c4478bf6255b94cadfe83e9b5cb2ce0c2" + "reference": "15deee9ce5ac13db9a552fc4b81012bb2018c392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/skaut/Skautis/zipball/e770502c4478bf6255b94cadfe83e9b5cb2ce0c2", - "reference": "e770502c4478bf6255b94cadfe83e9b5cb2ce0c2", + "url": "https://api.github.com/repos/skaut/Skautis/zipball/15deee9ce5ac13db9a552fc4b81012bb2018c392", + "reference": "15deee9ce5ac13db9a552fc4b81012bb2018c392", "shasum": "" }, "require": { "ext-soap": "*", - "php": ">=5.6" + "php": ">=7.3", + "psr/event-dispatcher": "1.0.*", + "psr/simple-cache": "1.0.*" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.15", "mockery/mockery": "^1.2", - "phpunit/phpunit": "^5.7" + "php-parallel-lint/php-parallel-lint": "^1.2", + "phpstan/phpstan": "^0.12", + "phpunit/phpunit": "^9.5", + "symfony/cache": "^4.3" }, "suggest": { + "crell/tukio": "Samostatná implmenetace PSR-14 EventDispatcher", "skautis/nette": "Integrace Skautis do Nette", "skautis/skautis-bundle": "Integrace Skautis do Symfony" }, "type": "library", "autoload": { "psr-4": { - "Skautis\\": "src/" + "Skaut\\Skautis\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -6275,7 +6291,7 @@ "source": "https://github.com/skaut/Skautis", "wiki": "http://is.skaut.cz/napoveda/" }, - "time": "2019-09-12T12:19:19+00:00" + "time": "2022-09-20T17:51:19+00:00" }, { "name": "swejzi/qr-platba", @@ -6575,25 +6591,25 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.0.2", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c" + "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", - "reference": "26954b3d62a6c5fd0ea8a2a00c0353a14978d05c", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918", + "reference": "07f1b9cc2ffee6aaafcf4b710fbc38ff736bd918", "shasum": "" }, "require": { - "php": ">=8.0.2" + "php": ">=8.1" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.1-dev" }, "thanks": { "name": "symfony/contracts", @@ -6622,7 +6638,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.0.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.1.1" }, "funding": [ { @@ -6638,25 +6654,25 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-02-25T11:15:52+00:00" }, { "name": "symfony/doctrine-messenger", - "version": "v6.0.12", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-messenger.git", - "reference": "d1ee96c9b765da63a0f422b17a038dba974176ec" + "reference": "b7587ed78b788a65958592ec5dccd226a0f6fd8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-messenger/zipball/d1ee96c9b765da63a0f422b17a038dba974176ec", - "reference": "d1ee96c9b765da63a0f422b17a038dba974176ec", + "url": "https://api.github.com/repos/symfony/doctrine-messenger/zipball/b7587ed78b788a65958592ec5dccd226a0f6fd8e", + "reference": "b7587ed78b788a65958592ec5dccd226a0f6fd8e", "shasum": "" }, "require": { "doctrine/dbal": "^2.13|^3.0", - "php": ">=8.0.2", + "php": ">=8.1", "symfony/messenger": "^5.4|^6.0", "symfony/service-contracts": "^1.1|^2|^3" }, @@ -6694,7 +6710,7 @@ "description": "Symfony Doctrine Messenger Bridge", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/doctrine-messenger/tree/v6.0.12" + "source": "https://github.com/symfony/doctrine-messenger/tree/v6.1.4" }, "funding": [ { @@ -6710,7 +6726,7 @@ "type": "tidelift" } ], - "time": "2022-08-12T13:08:57+00:00" + "time": "2022-08-12T13:09:07+00:00" }, { "name": "symfony/event-dispatcher", @@ -6799,20 +6815,20 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.0.2", + "version": "v3.1.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "7bc61cc2db649b4637d331240c5346dcc7708051" + "reference": "02ff5eea2f453731cfbc6bc215e456b781480448" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7bc61cc2db649b4637d331240c5346dcc7708051", - "reference": "7bc61cc2db649b4637d331240c5346dcc7708051", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/02ff5eea2f453731cfbc6bc215e456b781480448", + "reference": "02ff5eea2f453731cfbc6bc215e456b781480448", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "psr/event-dispatcher": "^1" }, "suggest": { @@ -6821,7 +6837,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "3.1-dev" }, "thanks": { "name": "symfony/contracts", @@ -6858,7 +6874,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.0.2" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.1.1" }, "funding": [ { @@ -6874,24 +6890,24 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:55:41+00:00" + "time": "2022-02-25T11:15:52+00:00" }, { "name": "symfony/filesystem", - "version": "v6.0.12", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "a36b782dc19dce3ab7e47d4b92b13cefb3511da3" + "reference": "3f39c04d2630c34019907b02f85672dac99f8659" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/a36b782dc19dce3ab7e47d4b92b13cefb3511da3", - "reference": "a36b782dc19dce3ab7e47d4b92b13cefb3511da3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/3f39c04d2630c34019907b02f85672dac99f8659", + "reference": "3f39c04d2630c34019907b02f85672dac99f8659", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8" }, @@ -6921,7 +6937,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.0.12" + "source": "https://github.com/symfony/filesystem/tree/v6.1.4" }, "funding": [ { @@ -6937,7 +6953,7 @@ "type": "tidelift" } ], - "time": "2022-08-02T16:01:06+00:00" + "time": "2022-08-02T16:17:38+00:00" }, { "name": "symfony/messenger", @@ -7678,20 +7694,20 @@ }, { "name": "symfony/property-access", - "version": "v6.0.11", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "8299bd756989ef04be53e2099e6b6fd5154a03ed" + "reference": "25108ee9b62d6ef0815007d9c7cf6a7ba40bb7c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/8299bd756989ef04be53e2099e6b6fd5154a03ed", - "reference": "8299bd756989ef04be53e2099e6b6fd5154a03ed", + "url": "https://api.github.com/repos/symfony/property-access/zipball/25108ee9b62d6ef0815007d9c7cf6a7ba40bb7c5", + "reference": "25108ee9b62d6ef0815007d9c7cf6a7ba40bb7c5", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "symfony/property-info": "^5.4|^6.0" }, "require-dev": { @@ -7737,7 +7753,7 @@ "reflection" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v6.0.11" + "source": "https://github.com/symfony/property-access/tree/v6.1.3" }, "funding": [ { @@ -7753,29 +7769,29 @@ "type": "tidelift" } ], - "time": "2022-06-27T17:10:44+00:00" + "time": "2022-06-27T17:24:16+00:00" }, { "name": "symfony/property-info", - "version": "v6.0.11", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "518f172491b9c09afd5d963f783909b80c4b0308" + "reference": "2fc363ed2f2b5d3b231ed0824e066d140d3fd1d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/518f172491b9c09afd5d963f783909b80c4b0308", - "reference": "518f172491b9c09afd5d963f783909b80c4b0308", + "url": "https://api.github.com/repos/symfony/property-info/zipball/2fc363ed2f2b5d3b231ed0824e066d140d3fd1d8", + "reference": "2fc363ed2f2b5d3b231ed0824e066d140d3fd1d8", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "symfony/string": "^5.4|^6.0" }, "conflict": { "phpdocumentor/reflection-docblock": "<5.2", - "phpdocumentor/type-resolver": "<1.4.0", + "phpdocumentor/type-resolver": "<1.5.1", "symfony/dependency-injection": "<5.4" }, "require-dev": { @@ -7826,7 +7842,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v6.0.11" + "source": "https://github.com/symfony/property-info/tree/v6.1.3" }, "funding": [ { @@ -7842,7 +7858,7 @@ "type": "tidelift" } ], - "time": "2022-07-19T08:33:44+00:00" + "time": "2022-07-19T08:34:05+00:00" }, { "name": "symfony/redis-messenger", @@ -8058,20 +8074,20 @@ }, { "name": "symfony/string", - "version": "v6.0.12", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0" + "reference": "290972cad7b364e3befaa74ba0ec729800fb161c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0", - "reference": "3a975ba1a1508ad97df45f4590f55b7cc4c1a0a0", + "url": "https://api.github.com/repos/symfony/string/zipball/290972cad7b364e3befaa74ba0ec729800fb161c", + "reference": "290972cad7b364e3befaa74ba0ec729800fb161c", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-intl-grapheme": "~1.0", "symfony/polyfill-intl-normalizer": "~1.0", @@ -8123,7 +8139,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.0.12" + "source": "https://github.com/symfony/string/tree/v6.1.4" }, "funding": [ { @@ -8139,7 +8155,7 @@ "type": "tidelift" } ], - "time": "2022-08-12T18:05:20+00:00" + "time": "2022-08-12T18:05:43+00:00" }, { "name": "symfony/translation", @@ -9257,6 +9273,75 @@ }, "time": "2020-07-09T08:09:16+00:00" }, + { + "name": "masterminds/html5", + "version": "2.7.6", + "source": { + "type": "git", + "url": "https://github.com/Masterminds/html5-php.git", + "reference": "897eb517a343a2281f11bc5556d6548db7d93947" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/897eb517a343a2281f11bc5556d6548db7d93947", + "reference": "897eb517a343a2281f11bc5556d6548db7d93947", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-dom": "*", + "ext-libxml": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Masterminds\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Butcher", + "email": "technosophos@gmail.com" + }, + { + "name": "Matt Farina", + "email": "matt@mattfarina.com" + }, + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + } + ], + "description": "An HTML5 parser and serializer.", + "homepage": "http://masterminds.github.io/html5-php", + "keywords": [ + "HTML5", + "dom", + "html", + "parser", + "querypath", + "serializer", + "xml" + ], + "support": { + "issues": "https://github.com/Masterminds/html5-php/issues", + "source": "https://github.com/Masterminds/html5-php/tree/2.7.6" + }, + "time": "2022-08-18T16:18:26+00:00" + }, { "name": "mockery/mockery", "version": "1.5.1", @@ -10361,12 +10446,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "051f54b05e9ea4ab4b4cab604b7d58f3c8f6dac7" + "reference": "8bcd37ce39f3ef1e9d5206223b3cf693b48f9cf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/051f54b05e9ea4ab4b4cab604b7d58f3c8f6dac7", - "reference": "051f54b05e9ea4ab4b4cab604b7d58f3c8f6dac7", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8bcd37ce39f3ef1e9d5206223b3cf693b48f9cf9", + "reference": "8bcd37ce39f3ef1e9d5206223b3cf693b48f9cf9", "shasum": "" }, "conflict": { @@ -10428,7 +10513,7 @@ "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", "contao/managed-edition": "<=1.5", - "craftcms/cms": "<3.7.36", + "craftcms/cms": "<4.2.1", "croogo/croogo": "<3.0.7", "cuyz/valinor": "<0.12", "czproject/git-php": "<4.0.3", @@ -10564,7 +10649,7 @@ "league/commonmark": "<0.18.3", "league/flysystem": "<1.1.4|>=2,<2.1.1", "lexik/jwt-authentication-bundle": "<2.10.7|>=2.11,<2.11.3", - "librenms/librenms": "<22.4", + "librenms/librenms": "<=22.8", "limesurvey/limesurvey": "<3.27.19", "livehelperchat/livehelperchat": "<=3.91", "livewire/livewire": ">2.2.4,<2.2.6", @@ -10643,7 +10728,7 @@ "phpwhois/phpwhois": "<=4.2.5", "phpxmlrpc/extras": "<0.6.1", "pimcore/data-hub": "<1.2.4", - "pimcore/pimcore": "<10.4.4", + "pimcore/pimcore": "<10.5.6", "pocketmine/bedrock-protocol": "<8.0.2", "pocketmine/pocketmine-mp": "<4.7.2|>= 4.0.0-BETA5, < 4.4.2", "pressbooks/pressbooks": "<5.18", @@ -10680,7 +10765,7 @@ "shopware/core": "<=6.4.9", "shopware/platform": "<=6.4.9", "shopware/production": "<=6.3.5.2", - "shopware/shopware": "<=5.7.13", + "shopware/shopware": "<=5.7.14", "shopware/storefront": "<=6.4.8.1", "shopxo/shopxo": "<2.2.6", "showdoc/showdoc": "<2.10.4", @@ -10704,7 +10789,7 @@ "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "simplito/elliptic-php": "<1.0.6", "slim/slim": "<2.6", - "smarty/smarty": "<3.1.45|>=4,<4.1.1", + "smarty/smarty": "<3.1.47|>=4,<4.2.1", "snipe/snipe-it": "<6.0.11|>= 6.0.0-RC-1, <= 6.0.0-RC-5", "socalnick/scn-social-auth": "<1.15.2", "socialiteproviders/steam": "<1.1", @@ -10767,7 +10852,7 @@ "thinkcmf/thinkcmf": "<=5.1.7", "tinymce/tinymce": "<5.10", "titon/framework": ">=0,<9.9.99", - "topthink/framework": "<=6.0.12", + "topthink/framework": "<=6.0.13", "topthink/think": "<=6.0.9", "topthink/thinkphp": "<=3.2.3", "tribalsystems/zenario": "<9.2.55826", @@ -10876,7 +10961,7 @@ "type": "tidelift" } ], - "time": "2022-09-16T19:06:10+00:00" + "time": "2022-09-20T19:05:22+00:00" }, { "name": "sebastian/cli-parser", @@ -11961,20 +12046,20 @@ }, { "name": "symfony/browser-kit", - "version": "v6.0.11", + "version": "v6.1.3", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "92e4b59bf2ef0f7a01d2620c4c87108e5c143d36" + "reference": "2e3b6a4406c2af963c634d7bd0457402b67dcc56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/92e4b59bf2ef0f7a01d2620c4c87108e5c143d36", - "reference": "92e4b59bf2ef0f7a01d2620c4c87108e5c143d36", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2e3b6a4406c2af963c634d7bd0457402b67dcc56", + "reference": "2e3b6a4406c2af963c634d7bd0457402b67dcc56", "shasum": "" }, "require": { - "php": ">=8.0.2", + "php": ">=8.1", "symfony/dom-crawler": "^5.4|^6.0" }, "require-dev": { @@ -12012,7 +12097,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.0.11" + "source": "https://github.com/symfony/browser-kit/tree/v6.1.3" }, "funding": [ { @@ -12028,7 +12113,7 @@ "type": "tidelift" } ], - "time": "2022-07-27T15:50:26+00:00" + "time": "2022-07-27T15:50:51+00:00" }, { "name": "symfony/css-selector", @@ -12098,28 +12183,25 @@ }, { "name": "symfony/dom-crawler", - "version": "v6.0.12", + "version": "v6.1.4", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "c69331ec49913a91f32737e29ed451ecee8cbea2" + "reference": "8cb4c6e6c8d30c26f70529ed5e50d79a09576c0c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c69331ec49913a91f32737e29ed451ecee8cbea2", - "reference": "c69331ec49913a91f32737e29ed451ecee8cbea2", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8cb4c6e6c8d30c26f70529ed5e50d79a09576c0c", + "reference": "8cb4c6e6c8d30c26f70529ed5e50d79a09576c0c", "shasum": "" }, "require": { - "php": ">=8.0.2", + "masterminds/html5": "^2.6", + "php": ">=8.1", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, - "conflict": { - "masterminds/html5": "<2.6" - }, "require-dev": { - "masterminds/html5": "^2.6", "symfony/css-selector": "^5.4|^6.0" }, "suggest": { @@ -12151,7 +12233,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.0.12" + "source": "https://github.com/symfony/dom-crawler/tree/v6.1.4" }, "funding": [ { @@ -12167,7 +12249,7 @@ "type": "tidelift" } ], - "time": "2022-08-04T19:18:27+00:00" + "time": "2022-08-04T19:19:00+00:00" }, { "name": "symfony/finder", @@ -12362,12 +12444,14 @@ "minimum-stability": "stable", "stability-flags": { "vojtys/nette-forms-gpspicker": 20, + "skautis/skautis": 15, + "skautis/nette": 15, "roave/security-advisories": 20 }, "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=8.0", + "php": ">=8.1", "ext-bcmath": "*", "ext-fileinfo": "*", "ext-iconv": "*", From e46c709775395984ee17f2279cd9311ce3526ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Thu, 22 Sep 2022 17:07:20 +0200 Subject: [PATCH 5/8] update skautis library --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index cc3147ad1..42919abf1 100644 --- a/composer.json +++ b/composer.json @@ -59,8 +59,8 @@ "eluceo/ical": "^2.5", "endroid/qr-code": "^4.0", - "skautis/skautis": "3.0.0-alpha.4", - "skautis/nette": "3.0.0-alpha.2", + "skautis/skautis": "3.0.0-alpha.5", + "skautis/nette": "3.0.0-alpha.3", "pear/numbers_words": "^0.18", "azuyalabs/yasumi": "^2.5", From 270161a5acf3c14a3e5123feed6a790332d56823 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Thu, 22 Sep 2022 18:49:44 +0200 Subject: [PATCH 6/8] namespace fix --- app/InstallModule/Presenters/InstallPresenter.php | 4 ++-- app/Services/SkautIsEventEducationService.php | 4 ++-- app/Services/SkautIsEventGeneralService.php | 2 +- app/Services/SkautIsEventService.php | 4 ++-- app/Services/SkautIsService.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/InstallModule/Presenters/InstallPresenter.php b/app/InstallModule/Presenters/InstallPresenter.php index ceba2b5df..c6934c9fb 100644 --- a/app/InstallModule/Presenters/InstallPresenter.php +++ b/app/InstallModule/Presenters/InstallPresenter.php @@ -21,8 +21,8 @@ use Exception; use Nette\Application\AbortException; use Nette\DI\Attributes\Inject; -use Skautis\Skautis; -use Skautis\Wsdl\WsdlException; +use Skaut\Skautis\Skautis; +use Skaut\Skautis\Wsdl\WsdlException; use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Messenger\Exception\HandlerFailedException; use Throwable; diff --git a/app/Services/SkautIsEventEducationService.php b/app/Services/SkautIsEventEducationService.php index 60a0219c9..24fda921b 100644 --- a/app/Services/SkautIsEventEducationService.php +++ b/app/Services/SkautIsEventEducationService.php @@ -8,8 +8,8 @@ use App\Model\Structure\Repositories\SubeventRepository; use App\Model\User\User; use Doctrine\Common\Collections\Collection; -use Skautis\Skautis; -use Skautis\Wsdl\WsdlException; +use Skaut\Skautis\Skautis; +use Skaut\Skautis\Wsdl\WsdlException; use stdClass; use Tracy\Debugger; use Tracy\ILogger; diff --git a/app/Services/SkautIsEventGeneralService.php b/app/Services/SkautIsEventGeneralService.php index b17beb233..3f50c6cfe 100644 --- a/app/Services/SkautIsEventGeneralService.php +++ b/app/Services/SkautIsEventGeneralService.php @@ -6,7 +6,7 @@ use App\Model\User\User; use Doctrine\Common\Collections\Collection; -use Skautis\Wsdl\WsdlException; +use Skaut\Skautis\Wsdl\WsdlException; use stdClass; use Tracy\Debugger; use Tracy\ILogger; diff --git a/app/Services/SkautIsEventService.php b/app/Services/SkautIsEventService.php index b7d42e47d..d0d7102d7 100644 --- a/app/Services/SkautIsEventService.php +++ b/app/Services/SkautIsEventService.php @@ -7,8 +7,8 @@ use App\Model\User\User; use Doctrine\Common\Collections\Collection; use Nette; -use Skautis\Skautis; -use Skautis\Wsdl\WsdlException; +use Skaut\Skautis\Skautis; +use Skaut\Skautis\Wsdl\WsdlException; use stdClass; use Tracy\Debugger; use Tracy\ILogger; diff --git a/app/Services/SkautIsService.php b/app/Services/SkautIsService.php index 577e027c3..1993acd36 100644 --- a/app/Services/SkautIsService.php +++ b/app/Services/SkautIsService.php @@ -8,7 +8,7 @@ use Nette; use Nette\Caching\Cache; use Nette\Caching\Storage; -use Skautis\Skautis; +use Skaut\Skautis\Skautis; use stdClass; use Throwable; From c75ee48c9b077339b93e0f3d7aa3d80747b10528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Thu, 22 Sep 2022 18:50:07 +0200 Subject: [PATCH 7/8] skautis lib update --- composer.lock | 91 +++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 47 deletions(-) diff --git a/composer.lock b/composer.lock index 83a8f4932..0a9e326b5 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": "30d9b27ff15d7d03b243593c82d89d1d", + "content-hash": "33c9efd7384121b1561d73bc8a705fc9", "packages": [ { "name": "azuyalabs/yasumi", @@ -1817,16 +1817,16 @@ }, { "name": "doctrine/orm", - "version": "2.13.1", + "version": "2.13.2", "source": { "type": "git", "url": "https://github.com/doctrine/orm.git", - "reference": "35c44a56677adb3ce796138b6e4934ce93ec6811" + "reference": "a8b02fd70fa777ca8278b9604fdef75c15c6a12f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/orm/zipball/35c44a56677adb3ce796138b6e4934ce93ec6811", - "reference": "35c44a56677adb3ce796138b6e4934ce93ec6811", + "url": "https://api.github.com/repos/doctrine/orm/zipball/a8b02fd70fa777ca8278b9604fdef75c15c6a12f", + "reference": "a8b02fd70fa777ca8278b9604fdef75c15c6a12f", "shasum": "" }, "require": { @@ -1853,15 +1853,15 @@ }, "require-dev": { "doctrine/annotations": "^1.13", - "doctrine/coding-standard": "^9.0", + "doctrine/coding-standard": "^9.0.2 || ^10.0", "phpbench/phpbench": "^0.16.10 || ^1.0", - "phpstan/phpstan": "~1.4.10 || 1.8.2", + "phpstan/phpstan": "~1.4.10 || 1.8.5", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", "psr/log": "^1 || ^2 || ^3", "squizlabs/php_codesniffer": "3.7.1", "symfony/cache": "^4.4 || ^5.4 || ^6.0", "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0", - "vimeo/psalm": "4.26.0" + "vimeo/psalm": "4.27.0" }, "suggest": { "ext-dom": "Provides support for XSD validation for XML mapping files", @@ -1911,9 +1911,9 @@ ], "support": { "issues": "https://github.com/doctrine/orm/issues", - "source": "https://github.com/doctrine/orm/tree/2.13.1" + "source": "https://github.com/doctrine/orm/tree/2.13.2" }, - "time": "2022-08-08T09:00:16+00:00" + "time": "2022-09-22T13:36:43+00:00" }, { "name": "doctrine/persistence", @@ -6164,16 +6164,16 @@ }, { "name": "skautis/nette", - "version": "v3.0.0-alpha.2", + "version": "v3.0.0-alpha.3", "source": { "type": "git", "url": "https://github.com/skaut/SkautisNette.git", - "reference": "248cf53331650c66063c5bae07e44ed1dd62d26f" + "reference": "4ed6954fb417917ed76de68b0aa7a7976e606dbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/skaut/SkautisNette/zipball/248cf53331650c66063c5bae07e44ed1dd62d26f", - "reference": "248cf53331650c66063c5bae07e44ed1dd62d26f", + "url": "https://api.github.com/repos/skaut/SkautisNette/zipball/4ed6954fb417917ed76de68b0aa7a7976e606dbd", + "reference": "4ed6954fb417917ed76de68b0aa7a7976e606dbd", "shasum": "" }, "require": { @@ -6181,7 +6181,7 @@ "nette/http": "^3.0", "nette/utils": "^3.0", "php": ">=7.2", - "skautis/skautis": "3.0.0-alpha.4" + "skautis/skautis": "3.0.0-alpha.5" }, "require-dev": { "nette/bootstrap": "^3.0", @@ -6222,20 +6222,20 @@ "source": "https://github.com/skaut/SkautisNette", "wiki": "http://is.skaut.cz/napoveda/" }, - "time": "2022-09-20T20:29:00+00:00" + "time": "2022-09-22T15:04:29+00:00" }, { "name": "skautis/skautis", - "version": "v3.0.0-alpha.4", + "version": "v3.0.0-alpha.5", "source": { "type": "git", "url": "https://github.com/skaut/Skautis.git", - "reference": "15deee9ce5ac13db9a552fc4b81012bb2018c392" + "reference": "f90c8e4e17acb68bd0524f30f73ba9db5aeef393" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/skaut/Skautis/zipball/15deee9ce5ac13db9a552fc4b81012bb2018c392", - "reference": "15deee9ce5ac13db9a552fc4b81012bb2018c392", + "url": "https://api.github.com/repos/skaut/Skautis/zipball/f90c8e4e17acb68bd0524f30f73ba9db5aeef393", + "reference": "f90c8e4e17acb68bd0524f30f73ba9db5aeef393", "shasum": "" }, "require": { @@ -6291,7 +6291,7 @@ "source": "https://github.com/skaut/Skautis", "wiki": "http://is.skaut.cz/napoveda/" }, - "time": "2022-09-20T17:51:19+00:00" + "time": "2022-09-22T14:58:06+00:00" }, { "name": "swejzi/qr-platba", @@ -9833,16 +9833,16 @@ }, { "name": "phpstan/phpstan-doctrine", - "version": "1.3.13", + "version": "1.3.14", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-doctrine.git", - "reference": "62a3b4252d502f0ead9c145055947b38b8568498" + "reference": "bfefffeee7ea770090c99934509f29ced1b29c3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/62a3b4252d502f0ead9c145055947b38b8568498", - "reference": "62a3b4252d502f0ead9c145055947b38b8568498", + "url": "https://api.github.com/repos/phpstan/phpstan-doctrine/zipball/bfefffeee7ea770090c99934509f29ced1b29c3f", + "reference": "bfefffeee7ea770090c99934509f29ced1b29c3f", "shasum": "" }, "require": { @@ -9896,27 +9896,27 @@ "description": "Doctrine extensions for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-doctrine/issues", - "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.13" + "source": "https://github.com/phpstan/phpstan-doctrine/tree/1.3.14" }, - "time": "2022-09-06T14:54:00+00:00" + "time": "2022-09-21T13:08:55+00:00" }, { "name": "phpstan/phpstan-nette", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-nette.git", - "reference": "f4654b27b107241e052755ec187a0b1964541ba6" + "reference": "8dddb884521d282b85af7d4a8221e21827df426a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-nette/zipball/f4654b27b107241e052755ec187a0b1964541ba6", - "reference": "f4654b27b107241e052755ec187a0b1964541ba6", + "url": "https://api.github.com/repos/phpstan/phpstan-nette/zipball/8dddb884521d282b85af7d4a8221e21827df426a", + "reference": "8dddb884521d282b85af7d4a8221e21827df426a", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0", - "phpstan/phpstan": "^1.0" + "php": "^7.2 || ^8.0", + "phpstan/phpstan": "^1.7" }, "conflict": { "nette/application": "<2.3.0", @@ -9929,18 +9929,15 @@ "require-dev": { "nette/forms": "^3.0", "nette/utils": "^2.3.0 || ^3.0.0", - "nikic/php-parser": "^4.13.0", + "nikic/php-parser": "^4.13.2", "php-parallel-lint/php-parallel-lint": "^1.2", - "phpstan/phpstan-php-parser": "^1.0", + "phpstan/phpstan-php-parser": "^1.1", "phpstan/phpstan-phpunit": "^1.0", "phpstan/phpstan-strict-rules": "^1.0", "phpunit/phpunit": "^9.5" }, "type": "phpstan-extension", "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - }, "phpstan": { "includes": [ "extension.neon", @@ -9960,9 +9957,9 @@ "description": "Nette Framework class reflection extension for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-nette/issues", - "source": "https://github.com/phpstan/phpstan-nette/tree/1.0.0" + "source": "https://github.com/phpstan/phpstan-nette/tree/1.1.0" }, - "time": "2021-09-20T16:12:57+00:00" + "time": "2022-09-21T14:29:42+00:00" }, { "name": "phpunit/php-code-coverage", @@ -10446,12 +10443,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "8bcd37ce39f3ef1e9d5206223b3cf693b48f9cf9" + "reference": "ecbc17ac0817caed746a243e3805dd256be9fcdb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/8bcd37ce39f3ef1e9d5206223b3cf693b48f9cf9", - "reference": "8bcd37ce39f3ef1e9d5206223b3cf693b48f9cf9", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/ecbc17ac0817caed746a243e3805dd256be9fcdb", + "reference": "ecbc17ac0817caed746a243e3805dd256be9fcdb", "shasum": "" }, "conflict": { @@ -10513,7 +10510,7 @@ "contao/core-bundle": "<4.9.18|>=4.10,<4.11.7|>=4.13,<4.13.3|= 4.10.0", "contao/listing-bundle": ">=4,<4.4.8", "contao/managed-edition": "<=1.5", - "craftcms/cms": "<4.2.1", + "craftcms/cms": ">= 4.0.0-RC1, < 4.2.1|<3.7.55.2", "croogo/croogo": "<3.0.7", "cuyz/valinor": "<0.12", "czproject/git-php": "<4.0.3", @@ -10665,7 +10662,7 @@ "mautic/core": "<4.3|= 2.13.1", "mediawiki/core": ">=1.27,<1.27.6|>=1.29,<1.29.3|>=1.30,<1.30.2|>=1.31,<1.31.9|>=1.32,<1.32.6|>=1.32.99,<1.33.3|>=1.33.99,<1.34.3|>=1.34.99,<1.35", "mezzio/mezzio-swoole": "<3.7|>=4,<4.3", - "microweber/microweber": "<1.3.1", + "microweber/microweber": "<=1.3.1", "miniorange/miniorange-saml": "<1.4.3", "mittwald/typo3_forum": "<1.2.1", "modx/revolution": "<= 2.8.3-pl|<2.8", @@ -10888,7 +10885,7 @@ "wpanel/wpanel4-cms": "<=4.3.1", "wwbn/avideo": "<=11.6", "yeswiki/yeswiki": "<4.1", - "yetiforce/yetiforce-crm": "<6.4", + "yetiforce/yetiforce-crm": "<=6.4", "yidashi/yii2cmf": "<=2", "yii2mod/yii2-cms": "<1.9.2", "yiisoft/yii": ">=1.1.14,<1.1.15", @@ -10961,7 +10958,7 @@ "type": "tidelift" } ], - "time": "2022-09-20T19:05:22+00:00" + "time": "2022-09-22T16:04:41+00:00" }, { "name": "sebastian/cli-parser", From 1a0ba7eb7a66a8ef4a4f34c9015bb5934151176e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Stan=C4=9Bk?= Date: Thu, 22 Sep 2022 18:56:22 +0200 Subject: [PATCH 8/8] namespace fix --- app/WebModule/Forms/ApplicationFormFactory.php | 2 +- app/WebModule/Forms/PersonalDetailsFormFactory.php | 2 +- code-quality/SkautisAliasesExtension.php | 4 ++-- code-quality/SkautisWebserviceMagicMethodsExtension.php | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/WebModule/Forms/ApplicationFormFactory.php b/app/WebModule/Forms/ApplicationFormFactory.php index 2e65ed6be..2e4a1f122 100644 --- a/app/WebModule/Forms/ApplicationFormFactory.php +++ b/app/WebModule/Forms/ApplicationFormFactory.php @@ -50,7 +50,7 @@ use Nette\Localization\Translator; use Nextras\FormComponents\Controls\DateControl; use Nextras\FormComponents\Controls\DateTimeControl; -use Skautis\Wsdl\WsdlException; +use Skaut\Skautis\Wsdl\WsdlException; use stdClass; use Throwable; use Tracy\Debugger; diff --git a/app/WebModule/Forms/PersonalDetailsFormFactory.php b/app/WebModule/Forms/PersonalDetailsFormFactory.php index 4087af0f2..f35d0c630 100644 --- a/app/WebModule/Forms/PersonalDetailsFormFactory.php +++ b/app/WebModule/Forms/PersonalDetailsFormFactory.php @@ -12,7 +12,7 @@ use Nette; use Nette\Application\UI\Form; use Nextras\FormComponents\Controls\DateControl; -use Skautis\Wsdl\WsdlException; +use Skaut\Skautis\Wsdl\WsdlException; use stdClass; use Tracy\Debugger; use Tracy\ILogger; diff --git a/code-quality/SkautisAliasesExtension.php b/code-quality/SkautisAliasesExtension.php index c8ff640b4..fa24df8df 100644 --- a/code-quality/SkautisAliasesExtension.php +++ b/code-quality/SkautisAliasesExtension.php @@ -5,8 +5,8 @@ use PHPStan\Reflection\PropertiesClassReflectionExtension; use PHPStan\Reflection\PropertyReflection; use PHPStan\Type\ObjectType; -use Skautis\Skautis; -use Skautis\Wsdl\WebServiceInterface; +use Skaut\Skautis\Skautis; +use Skaut\Skautis\Wsdl\WebServiceInterface; class SkautisAliasesExtension implements PropertiesClassReflectionExtension { diff --git a/code-quality/SkautisWebserviceMagicMethodsExtension.php b/code-quality/SkautisWebserviceMagicMethodsExtension.php index 0d2471bc8..d3f322db4 100644 --- a/code-quality/SkautisWebserviceMagicMethodsExtension.php +++ b/code-quality/SkautisWebserviceMagicMethodsExtension.php @@ -6,7 +6,7 @@ use PHPStan\Reflection\Dummy\DummyMethodReflection; use PHPStan\Reflection\MethodReflection; use PHPStan\Reflection\MethodsClassReflectionExtension; -use Skautis\Wsdl\WebServiceInterface; +use Skaut\Skautis\Wsdl\WebServiceInterface; class SkautisWebserviceMagicMethodsExtension implements MethodsClassReflectionExtension {