diff --git a/Dockerfile b/Dockerfile index f5c766129..56372991b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk update && \ npm install -g npm-check-updates && \ npm install -g eslint -RUN npm install -g npm@10.2.0 +RUN npm install -g npm@10.2.3 #avoid permission error on github actions: #Your cache folder contains root-owned files, due to a bug in diff --git a/composer.lock b/composer.lock index e702b7bee..75c9e9ded 100644 --- a/composer.lock +++ b/composer.lock @@ -142,20 +142,20 @@ }, { "name": "cakephp/cakephp", - "version": "4.4.18", + "version": "4.5.0", "source": { "type": "git", "url": "https://github.com/cakephp/cakephp.git", - "reference": "34b4920bc8c13f8897434003e8aaaa605153d051" + "reference": "95e39ec60f78895d217c35c6f840f24f1f9ca3b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cakephp/zipball/34b4920bc8c13f8897434003e8aaaa605153d051", - "reference": "34b4920bc8c13f8897434003e8aaaa605153d051", + "url": "https://api.github.com/repos/cakephp/cakephp/zipball/95e39ec60f78895d217c35c6f840f24f1f9ca3b5", + "reference": "95e39ec60f78895d217c35c6f840f24f1f9ca3b5", "shasum": "" }, "require": { - "cakephp/chronos": "^2.2", + "cakephp/chronos": "^2.4.0-RC2", "composer/ca-bundle": "^1.2", "ext-intl": "*", "ext-json": "*", @@ -163,7 +163,7 @@ "laminas/laminas-diactoros": "^2.2.2", "laminas/laminas-httphandlerrunner": "^1.1 || ^2.0", "league/container": "^4.2.0", - "php": ">=7.4.0", + "php": ">=7.4.0,<9", "psr/container": "^1.1 || ^2.0", "psr/http-client": "^1.0", "psr/http-server-handler": "^1.0", @@ -212,6 +212,7 @@ "autoload": { "files": [ "src/Core/functions.php", + "src/Error/functions.php", "src/Collection/functions.php", "src/I18n/functions.php", "src/Routing/functions.php", @@ -250,20 +251,20 @@ "issues": "https://github.com/cakephp/cakephp/issues", "source": "https://github.com/cakephp/cakephp" }, - "time": "2023-09-22T07:53:48+00:00" + "time": "2023-10-15T02:25:20+00:00" }, { "name": "cakephp/chronos", - "version": "2.4.1", + "version": "2.4.3", "source": { "type": "git", "url": "https://github.com/cakephp/chronos.git", - "reference": "dd583900b26971e84d56c482d6c5fc16961bd103" + "reference": "96f28ddfceba2ff56e0d2405c28d789bd546ff55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/chronos/zipball/dd583900b26971e84d56c482d6c5fc16961bd103", - "reference": "dd583900b26971e84d56c482d6c5fc16961bd103", + "url": "https://api.github.com/repos/cakephp/chronos/zipball/96f28ddfceba2ff56e0d2405c28d789bd546ff55", + "reference": "96f28ddfceba2ff56e0d2405c28d789bd546ff55", "shasum": "" }, "require": { @@ -308,7 +309,7 @@ "issues": "https://github.com/cakephp/chronos/issues", "source": "https://github.com/cakephp/chronos" }, - "time": "2023-09-12T03:12:29+00:00" + "time": "2023-10-17T08:00:24+00:00" }, { "name": "cakephp/migrations", @@ -552,16 +553,16 @@ }, { "name": "druidfi/mysqldump-php", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/druidfi/mysqldump-php.git", - "reference": "15da1dd26e638674bc73fd963b33b26282c14c96" + "reference": "f8d881a7ddb5f023c30a0da76d5178cf2e7066ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/druidfi/mysqldump-php/zipball/15da1dd26e638674bc73fd963b33b26282c14c96", - "reference": "15da1dd26e638674bc73fd963b33b26282c14c96", + "url": "https://api.github.com/repos/druidfi/mysqldump-php/zipball/f8d881a7ddb5f023c30a0da76d5178cf2e7066ee", + "reference": "f8d881a7ddb5f023c30a0da76d5178cf2e7066ee", "shasum": "" }, "require": { @@ -586,7 +587,7 @@ "authors": [ { "name": "Druid.fi", - "email": "info@druid.fi" + "homepage": "https://github.com/druidfi" }, { "name": "Diego Torres", @@ -610,9 +611,9 @@ ], "support": { "issues": "https://github.com/druidfi/mysqldump-php/issues", - "source": "https://github.com/druidfi/mysqldump-php/tree/1.0.2" + "source": "https://github.com/druidfi/mysqldump-php/tree/1.0.3" }, - "time": "2022-12-31T09:51:45+00:00" + "time": "2023-05-20T06:09:59+00:00" }, { "name": "eluceo/ical", @@ -998,20 +999,20 @@ }, { "name": "laminas/laminas-diactoros", - "version": "2.25.2", + "version": "2.26.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-diactoros.git", - "reference": "9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e" + "reference": "6584d44eb8e477e89d453313b858daac6183cddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e", - "reference": "9f3f4bf5b99c9538b6f1dbcc20f6fec357914f9e", + "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/6584d44eb8e477e89d453313b858daac6183cddc", + "reference": "6584d44eb8e477e89d453313b858daac6183cddc", "shasum": "" }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "psr/http-factory": "^1.0", "psr/http-message": "^1.1" }, @@ -1091,7 +1092,7 @@ "type": "community_bridge" } ], - "time": "2023-04-17T15:44:17+00:00" + "time": "2023-10-29T16:17:44+00:00" }, { "name": "laminas/laminas-httphandlerrunner", @@ -1531,25 +1532,25 @@ }, { "name": "mobiledetect/mobiledetectlib", - "version": "3.74.0", + "version": "3.74.3", "source": { "type": "git", "url": "https://github.com/serbanghita/Mobile-Detect.git", - "reference": "812a4aa4605c63fc33d7fe32ca82f29275940b9d" + "reference": "39582ab62f86b40e4edb698159f895929a29c346" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/812a4aa4605c63fc33d7fe32ca82f29275940b9d", - "reference": "812a4aa4605c63fc33d7fe32ca82f29275940b9d", + "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/39582ab62f86b40e4edb698159f895929a29c346", + "reference": "39582ab62f86b40e4edb698159f895929a29c346", "shasum": "" }, "require": { "php": ">=7.4" }, "require-dev": { - "friendsofphp/php-cs-fixer": "v2.19.3", - "phpunit/phpunit": "^7.0.0", - "squizlabs/php_codesniffer": "3.*" + "friendsofphp/php-cs-fixer": "^3.14", + "phpunit/phpunit": "^9.6", + "squizlabs/php_codesniffer": "^3.7" }, "type": "library", "autoload": { @@ -1568,7 +1569,7 @@ { "name": "Serban Ghita", "email": "serbanghita@gmail.com", - "homepage": "http://mobiledetect.net", + "homepage": "https://mobiledetect.net", "role": "Developer" } ], @@ -1583,9 +1584,15 @@ ], "support": { "issues": "https://github.com/serbanghita/Mobile-Detect/issues", - "source": "https://github.com/serbanghita/Mobile-Detect/tree/3.74.0" + "source": "https://github.com/serbanghita/Mobile-Detect/tree/3.74.3" }, - "time": "2022-12-04T15:37:32+00:00" + "funding": [ + { + "url": "https://github.com/serbanghita", + "type": "github" + } + ], + "time": "2023-10-27T16:28:04+00:00" }, { "name": "psr/container", @@ -3188,23 +3195,23 @@ "packages-dev": [ { "name": "cakephp/debug_kit", - "version": "4.9.4", + "version": "4.10.0", "source": { "type": "git", "url": "https://github.com/cakephp/debug_kit.git", - "reference": "663491edec4a6b9111f1cf4733ebd471450df71e" + "reference": "65918d04944af4c923d15c31ea60f941207788de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/663491edec4a6b9111f1cf4733ebd471450df71e", - "reference": "663491edec4a6b9111f1cf4733ebd471450df71e", + "url": "https://api.github.com/repos/cakephp/debug_kit/zipball/65918d04944af4c923d15c31ea60f941207788de", + "reference": "65918d04944af4c923d15c31ea60f941207788de", "shasum": "" }, "require": { - "cakephp/cakephp": "^4.4.0", + "cakephp/cakephp": "^4.5.0", "cakephp/chronos": "^2.0", "composer/composer": "^1.3 | ^2.0", - "jdorn/sql-formatter": "^1.2", + "doctrine/sql-formatter": "^1.1.3", "php": ">=7.4" }, "require-dev": { @@ -3242,6 +3249,7 @@ "keywords": [ "cakephp", "debug", + "dev", "kit" ], "support": { @@ -3250,7 +3258,7 @@ "issues": "https://github.com/cakephp/debug_kit/issues", "source": "https://github.com/cakephp/debug_kit" }, - "time": "2023-07-05T16:04:04+00:00" + "time": "2023-10-23T16:03:16+00:00" }, { "name": "composer/class-map-generator", @@ -3510,16 +3518,16 @@ }, { "name": "composer/pcre", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2" + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", - "reference": "4bff79ddd77851fe3cdd11616ed3f92841ba5bd2", + "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", "shasum": "" }, "require": { @@ -3561,7 +3569,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.0" + "source": "https://github.com/composer/pcre/tree/3.1.1" }, "funding": [ { @@ -3577,7 +3585,7 @@ "type": "tidelift" } ], - "time": "2022-11-17T09:50:14+00:00" + "time": "2023-10-11T07:11:09+00:00" }, { "name": "composer/semver", @@ -3877,35 +3885,33 @@ "time": "2022-12-30T00:23:10+00:00" }, { - "name": "jdorn/sql-formatter", - "version": "v1.2.17", + "name": "doctrine/sql-formatter", + "version": "1.1.3", "source": { "type": "git", - "url": "https://github.com/jdorn/sql-formatter.git", - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc" + "url": "https://github.com/doctrine/sql-formatter.git", + "reference": "25a06c7bf4c6b8218f47928654252863ffc890a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc", - "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc", + "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/25a06c7bf4c6b8218f47928654252863ffc890a5", + "reference": "25a06c7bf4c6b8218f47928654252863ffc890a5", "shasum": "" }, "require": { - "php": ">=5.2.4" + "php": "^7.1 || ^8.0" }, "require-dev": { - "phpunit/phpunit": "3.7.*" + "bamarni/composer-bin-plugin": "^1.4" }, + "bin": [ + "bin/sql-formatter" + ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, "autoload": { - "classmap": [ - "lib" - ] + "psr-4": { + "Doctrine\\SqlFormatter\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3915,20 +3921,20 @@ { "name": "Jeremy Dorn", "email": "jeremy@jeremydorn.com", - "homepage": "http://jeremydorn.com/" + "homepage": "https://jeremydorn.com/" } ], "description": "a PHP SQL highlighting library", - "homepage": "https://github.com/jdorn/sql-formatter/", + "homepage": "https://github.com/doctrine/sql-formatter/", "keywords": [ "highlight", "sql" ], "support": { - "issues": "https://github.com/jdorn/sql-formatter/issues", - "source": "https://github.com/jdorn/sql-formatter/tree/v1.2.17" + "issues": "https://github.com/doctrine/sql-formatter/issues", + "source": "https://github.com/doctrine/sql-formatter/tree/1.1.3" }, - "time": "2014-01-12T16:20:24+00:00" + "time": "2022-05-23T21:33:49+00:00" }, { "name": "justinrainbow/json-schema", @@ -4228,16 +4234,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.38", + "version": "1.10.41", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691" + "reference": "c6174523c2a69231df55bdc65b61655e72876d76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5302bb402c57f00fb3c2c015bac86e0827e4b691", - "reference": "5302bb402c57f00fb3c2c015bac86e0827e4b691", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", + "reference": "c6174523c2a69231df55bdc65b61655e72876d76", "shasum": "" }, "require": { @@ -4286,7 +4292,7 @@ "type": "tidelift" } ], - "time": "2023-10-06T14:19:14+00:00" + "time": "2023-11-05T12:57:57+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/src/Controller/EventsController.php b/src/Controller/EventsController.php index a9782606f..5bfcfa600 100644 --- a/src/Controller/EventsController.php +++ b/src/Controller/EventsController.php @@ -697,28 +697,20 @@ public function all() } $query->distinct($this->Events->getListFields()); - - $events = $this->paginate($query, [ - 'fields' => $this->Event->getListFields(), - 'order' => $this->Event->getListOrder(), - 'contain' => [ - 'Workshops', - 'Categories' - ] + $query->select($this->Events->getListFields()); + $query->order($this->Events->getListOrder()); + $query->contain([ + 'Workshops', + 'Categories' ]); + $events = $this->paginate($query); $this->set('events', $events); // $events needs to be cloned, because unset($e['workshop']); in combineEventsForMap would also remove it from $events // $events cannot be cloned because it is a resultset // so call $this->pagniate twice - no performance problem! - $newEvents = $this->paginate($query, [ - 'fields' => $this->Event->getListFields(), - 'order' => $this->Event->getListOrder(), - 'contain' => [ - 'Workshops' - ] - ]); + $newEvents = $this->paginate($query); $eventsForMap = $this->combineEventsForMap($newEvents); $this->set('eventsForMap', $eventsForMap); diff --git a/webroot/package-lock.json b/webroot/package-lock.json index d6226cea2..adc70ee13 100644 --- a/webroot/package-lock.json +++ b/webroot/package-lock.json @@ -29,7 +29,7 @@ "select2": "^4.0.13", "slidebars": "^2.0.2", "speakingurl": "^14.0.1", - "swiper": "^10.3.1" + "swiper": "^11.0.4" } }, "node_modules/@fortawesome/fontawesome-free": { @@ -309,9 +309,9 @@ } }, "node_modules/swiper": { - "version": "10.3.1", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-10.3.1.tgz", - "integrity": "sha512-24Wk3YUdZHxjc9faID97GTu6xnLNia+adMt6qMTZG/HgdSUt4fS0REsGUXJOgpTED0Amh/j+gRGQxsLayJUlBQ==", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.4.tgz", + "integrity": "sha512-qtUxILrD4aD++rpKzGrkz3IAWL92f9uTrDwjb6HaNLmPvJhZCE/83DL+9w4kIgDDJeF6QKalV47rMBN77UOVYQ==", "funding": [ { "type": "patreon", @@ -566,9 +566,9 @@ "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==" }, "swiper": { - "version": "10.3.1", - "resolved": "https://registry.npmjs.org/swiper/-/swiper-10.3.1.tgz", - "integrity": "sha512-24Wk3YUdZHxjc9faID97GTu6xnLNia+adMt6qMTZG/HgdSUt4fS0REsGUXJOgpTED0Amh/j+gRGQxsLayJUlBQ==" + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.4.tgz", + "integrity": "sha512-qtUxILrD4aD++rpKzGrkz3IAWL92f9uTrDwjb6HaNLmPvJhZCE/83DL+9w4kIgDDJeF6QKalV47rMBN77UOVYQ==" }, "tiny-emitter": { "version": "2.1.0", diff --git a/webroot/package.json b/webroot/package.json index 9bf8b6c5a..f33143407 100644 --- a/webroot/package.json +++ b/webroot/package.json @@ -35,6 +35,6 @@ "select2": "^4.0.13", "slidebars": "^2.0.2", "speakingurl": "^14.0.1", - "swiper": "^10.3.1" + "swiper": "^11.0.4" } }