From 53f50ba49e91af9f4ed3b28505d6a7c19081fb73 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:39:02 +0200 Subject: [PATCH 01/24] Composer: update to phalcon >= 4.0.0 and php >=7.4.0 --- composer.json | 5 +- composer.lock | 1598 ++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 1315 insertions(+), 288 deletions(-) diff --git a/composer.json b/composer.json index 6ff7331..562cb44 100644 --- a/composer.json +++ b/composer.json @@ -2,8 +2,9 @@ "name" : "pnx/httpcb", "description" : "", "require": { - "php": ">=7.0.0", - "ext-phalcon": ">=3.4.0", + "php": ">=7.4.0", + "ext-phalcon": ">=4.0.0", + "ext-psr": "*", "ext-redis": "*", "ext-yaml": "*", "robmorgan/phinx": "^0.10.6", diff --git a/composer.lock b/composer.lock index aa61a55..2db37ef 100644 --- a/composer.lock +++ b/composer.lock @@ -4,25 +4,26 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e9420f4e7b8eb38710e9d04447806214", + "content-hash": "f02f4b8d54eb8c9e6f905db47f08688e", "packages": [ { "name": "cakephp/cache", - "version": "3.6.10", + "version": "3.10.4", "source": { "type": "git", "url": "https://github.com/cakephp/cache.git", - "reference": "bbaf1f3d1e615f7af1889053ff503a086f9f7671" + "reference": "0e95a17b118d900f362de07bff902fa147e51fb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/cache/zipball/bbaf1f3d1e615f7af1889053ff503a086f9f7671", - "reference": "bbaf1f3d1e615f7af1889053ff503a086f9f7671", + "url": "https://api.github.com/repos/cakephp/cache/zipball/0e95a17b118d900f362de07bff902fa147e51fb2", + "reference": "0e95a17b118d900f362de07bff902fa147e51fb2", "shasum": "" }, "require": { "cakephp/core": "^3.6.0", - "php": ">=5.6.0" + "php": ">=5.6.0,<8.0.0", + "psr/simple-cache": "^1.0.0" }, "type": "library", "autoload": { @@ -47,33 +48,39 @@ "caching", "cakephp" ], - "time": "2018-07-19T10:51:03+00:00" + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/cakephp/issues", + "source": "https://github.com/cakephp/cache" + }, + "time": "2021-06-20T01:13:19+00:00" }, { "name": "cakephp/collection", - "version": "3.6.10", + "version": "3.10.4", "source": { "type": "git", "url": "https://github.com/cakephp/collection.git", - "reference": "c5b3a3561eb92a5c25ffcc90ad3a1f193962065f" + "reference": "5667e755cfafe4b186f5f2a54121cf44cb86159e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/collection/zipball/c5b3a3561eb92a5c25ffcc90ad3a1f193962065f", - "reference": "c5b3a3561eb92a5c25ffcc90ad3a1f193962065f", + "url": "https://api.github.com/repos/cakephp/collection/zipball/5667e755cfafe4b186f5f2a54121cf44cb86159e", + "reference": "5667e755cfafe4b186f5f2a54121cf44cb86159e", "shasum": "" }, "require": { - "php": ">=5.6.0" + "php": ">=5.6.0,<8.0.0" }, "type": "library", "autoload": { - "psr-4": { - "Cake\\Collection\\": "." - }, "files": [ "functions.php" - ] + ], + "psr-4": { + "Cake\\Collection\\": "." + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -93,37 +100,44 @@ "collections", "iterators" ], - "time": "2018-07-26T19:56:06+00:00" + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/cakephp/issues", + "source": "https://github.com/cakephp/collection" + }, + "time": "2021-03-26T00:40:07+00:00" }, { "name": "cakephp/core", - "version": "3.6.10", + "version": "3.10.4", "source": { "type": "git", "url": "https://github.com/cakephp/core.git", - "reference": "82741aeb90ca2fbbf9fbbd507d56d53b081db237" + "reference": "716300a55ac86b7456e52258d3f50545545d2d6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/core/zipball/82741aeb90ca2fbbf9fbbd507d56d53b081db237", - "reference": "82741aeb90ca2fbbf9fbbd507d56d53b081db237", + "url": "https://api.github.com/repos/cakephp/core/zipball/716300a55ac86b7456e52258d3f50545545d2d6b", + "reference": "716300a55ac86b7456e52258d3f50545545d2d6b", "shasum": "" }, "require": { "cakephp/utility": "^3.6.0", - "php": ">=5.6.0" + "php": ">=5.6.0,<8.0.0" }, "suggest": { + "cakephp/cache": "To use Configure::store() and restore().", "cakephp/event": "To use PluginApplicationInterface or plugin applications." }, "type": "library", "autoload": { - "psr-4": { - "Cake\\Core\\": "." - }, "files": [ "functions.php" - ] + ], + "psr-4": { + "Cake\\Core\\": "." + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -142,30 +156,34 @@ "core", "framework" ], - "time": "2018-07-26T19:56:06+00:00" + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/cakephp/issues", + "source": "https://github.com/cakephp/core" + }, + "time": "2021-06-18T07:33:08+00:00" }, { "name": "cakephp/database", - "version": "3.6.10", + "version": "3.10.4", "source": { "type": "git", "url": "https://github.com/cakephp/database.git", - "reference": "12234e6f6f6d69692849b16f496767a15fbc7b64" + "reference": "e16dae97cfe00b1de9c210bd49f71ad5c2de199a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/database/zipball/12234e6f6f6d69692849b16f496767a15fbc7b64", - "reference": "12234e6f6f6d69692849b16f496767a15fbc7b64", + "url": "https://api.github.com/repos/cakephp/database/zipball/e16dae97cfe00b1de9c210bd49f71ad5c2de199a", + "reference": "e16dae97cfe00b1de9c210bd49f71ad5c2de199a", "shasum": "" }, "require": { "cakephp/cache": "^3.6.0", "cakephp/core": "^3.6.0", "cakephp/datasource": "^3.6.0", - "php": ">=5.6.0" - }, - "suggest": { - "cakephp/log": "Require this if you want to use the built-in query logger" + "cakephp/log": "^3.6.0", + "php": ">=5.6.0,<8.0.0" }, "type": "library", "autoload": { @@ -192,25 +210,31 @@ "database abstraction", "pdo" ], - "time": "2018-07-19T10:51:03+00:00" + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/cakephp/issues", + "source": "https://github.com/cakephp/database" + }, + "time": "2021-10-23T07:22:45+00:00" }, { "name": "cakephp/datasource", - "version": "3.6.10", + "version": "3.10.4", "source": { "type": "git", "url": "https://github.com/cakephp/datasource.git", - "reference": "05fb1bfa34fad9385b6500857e9da432f5c45abe" + "reference": "accbe0c85552f384e587d73abdba1618c604b54d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/datasource/zipball/05fb1bfa34fad9385b6500857e9da432f5c45abe", - "reference": "05fb1bfa34fad9385b6500857e9da432f5c45abe", + "url": "https://api.github.com/repos/cakephp/datasource/zipball/accbe0c85552f384e587d73abdba1618c604b54d", + "reference": "accbe0c85552f384e587d73abdba1618c604b54d", "shasum": "" }, "require": { "cakephp/core": "^3.6.0", - "php": ">=5.6.0" + "php": ">=5.6.0,<8.0.0" }, "suggest": { "cakephp/cache": "If you decide to use Query caching.", @@ -242,25 +266,82 @@ "entity", "query" ], - "time": "2018-07-26T19:56:06+00:00" + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/cakephp/issues", + "source": "https://github.com/cakephp/datasource" + }, + "time": "2021-04-07T13:23:38+00:00" }, { - "name": "cakephp/utility", - "version": "3.6.10", + "name": "cakephp/log", + "version": "3.10.4", "source": { "type": "git", - "url": "https://github.com/cakephp/utility.git", - "reference": "93b37e7747c95a10d6638d39d0e1f867d98c9ef9" + "url": "https://github.com/cakephp/log.git", + "reference": "cf10bdcce4e78430a780edb2cc5b4b2b4719a65d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/utility/zipball/93b37e7747c95a10d6638d39d0e1f867d98c9ef9", - "reference": "93b37e7747c95a10d6638d39d0e1f867d98c9ef9", + "url": "https://api.github.com/repos/cakephp/log/zipball/cf10bdcce4e78430a780edb2cc5b4b2b4719a65d", + "reference": "cf10bdcce4e78430a780edb2cc5b4b2b4719a65d", "shasum": "" }, "require": { "cakephp/core": "^3.6.0", - "php": ">=5.6.0" + "php": ">=5.6.0,<8.0.0", + "psr/log": "^1.0.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Cake\\Log\\": "." + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "CakePHP Community", + "homepage": "https://github.com/cakephp/log/graphs/contributors" + } + ], + "description": "CakePHP logging library with support for multiple different streams", + "homepage": "https://cakephp.org", + "keywords": [ + "Streams", + "cakephp", + "log", + "logging" + ], + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/cakephp/issues", + "source": "https://github.com/cakephp/log" + }, + "time": "2020-10-28T18:13:14+00:00" + }, + { + "name": "cakephp/utility", + "version": "3.10.4", + "source": { + "type": "git", + "url": "https://github.com/cakephp/utility.git", + "reference": "51b0af31af3239f6141006bbd7cbc7b16aba40d6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cakephp/utility/zipball/51b0af31af3239f6141006bbd7cbc7b16aba40d6", + "reference": "51b0af31af3239f6141006bbd7cbc7b16aba40d6", + "shasum": "" + }, + "require": { + "cakephp/core": "^3.6.0", + "php": ">=5.6.0,<8.0.0" }, "suggest": { "ext-intl": "To use Text::transliterate() or Text::slug()", @@ -268,12 +349,12 @@ }, "type": "library", "autoload": { - "psr-4": { - "Cake\\Utility\\": "." - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Cake\\Utility\\": "." + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -295,39 +376,55 @@ "string", "utility" ], - "time": "2018-07-26T19:56:06+00:00" + "support": { + "forum": "https://stackoverflow.com/tags/cakephp", + "irc": "irc://irc.freenode.org/cakephp", + "issues": "https://github.com/cakephp/cakephp/issues", + "source": "https://github.com/cakephp/utility" + }, + "time": "2020-12-09T02:43:02+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "6.3.3", + "version": "7.4.5", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba" + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/407b0cb880ace85c9b63c5f9551db498cb2d50ba", - "reference": "407b0cb880ace85c9b63c5f9551db498cb2d50ba", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", + "reference": "1dd98b0564cb3f6bd16ce683cb755f94c10fbd82", "shasum": "" }, "require": { - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.4", - "php": ">=5.5" + "ext-json": "*", + "guzzlehttp/promises": "^1.5", + "guzzlehttp/psr7": "^1.9 || ^2.4", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0", + "symfony/deprecation-contracts": "^2.2 || ^3.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { + "bamarni/composer-bin-plugin": "^1.4.1", "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", - "psr/log": "^1.0" + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.5.5 || ^9.3.5", + "psr/log": "^1.1 || ^2.0 || ^3.0" }, "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.3-dev" + "dev-master": "7.4-dev" } }, "autoload": { @@ -343,166 +440,297 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Jeremy Lindblom", + "email": "jeremeamia@gmail.com", + "homepage": "https://github.com/jeremeamia" + }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle is a PHP HTTP client library", - "homepage": "http://guzzlephp.org/", "keywords": [ "client", "curl", "framework", "http", "http client", + "psr-18", + "psr-7", "rest", "web service" ], - "time": "2018-04-22T15:46:56+00:00" + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/7.4.5" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle", + "type": "tidelift" + } + ], + "time": "2022-06-20T22:16:13+00:00" }, { "name": "guzzlehttp/promises", - "version": "v1.3.1", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646" + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/a59da6cf61d80060647ff4d3eb2c03a2bc694646", - "reference": "a59da6cf61d80060647ff4d3eb2c03a2bc694646", + "url": "https://api.github.com/repos/guzzle/promises/zipball/fe752aedc9fd8fcca3fe7ad05d419d32998a06da", + "reference": "fe752aedc9fd8fcca3fe7ad05d419d32998a06da", "shasum": "" }, "require": { - "php": ">=5.5.0" + "php": ">=5.5" }, "require-dev": { - "phpunit/phpunit": "^4.0" + "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Promise\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", + "homepage": "https://github.com/Tobion" } ], "description": "Guzzle promises library", "keywords": [ "promise" ], - "time": "2016-12-20T10:07:11+00:00" + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.5.1" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises", + "type": "tidelift" + } + ], + "time": "2021-10-22T20:56:57+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.4.2", + "version": "2.4.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c" + "reference": "13388f00956b1503577598873fffb5ae994b5737" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/f5b8a8512e2b58b0071a7280e39f14f72e05d87c", - "reference": "f5b8a8512e2b58b0071a7280e39f14f72e05d87c", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/13388f00956b1503577598873fffb5ae994b5737", + "reference": "13388f00956b1503577598873fffb5ae994b5737", "shasum": "" }, "require": { - "php": ">=5.4.0", - "psr/http-message": "~1.0" + "php": "^7.2.5 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0", + "ralouphie/getallheaders": "^3.0" }, "provide": { + "psr/http-factory-implementation": "1.0", "psr/http-message-implementation": "1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "bamarni/composer-bin-plugin": "^1.4.1", + "http-interop/http-factory-tests": "^0.9", + "phpunit/phpunit": "^8.5.8 || ^9.3.10" + }, + "suggest": { + "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "2.4-dev" } }, "autoload": { "psr-4": { "GuzzleHttp\\Psr7\\": "src/" - }, - "files": [ - "src/functions_include.php" - ] + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "PSR-7 message implementation that also provides common utility methods", "keywords": [ "http", "message", + "psr-7", "request", "response", "stream", "uri", "url" ], - "time": "2017-03-20T17:10:46+00:00" + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/2.4.0" + }, + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2022-06-20T21:43:11+00:00" }, { "name": "league/oauth2-client", - "version": "2.3.0", + "version": "2.6.1", "source": { "type": "git", "url": "https://github.com/thephpleague/oauth2-client.git", - "reference": "aa2e3df188f0bfd87f7880cc880e906e99923580" + "reference": "2334c249907190c132364f5dae0287ab8666aa19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/aa2e3df188f0bfd87f7880cc880e906e99923580", - "reference": "aa2e3df188f0bfd87f7880cc880e906e99923580", + "url": "https://api.github.com/repos/thephpleague/oauth2-client/zipball/2334c249907190c132364f5dae0287ab8666aa19", + "reference": "2334c249907190c132364f5dae0287ab8666aa19", "shasum": "" }, "require": { - "guzzlehttp/guzzle": "^6.0", - "paragonie/random_compat": "^1|^2", - "php": "^5.6|^7.0" + "guzzlehttp/guzzle": "^6.0 || ^7.0", + "paragonie/random_compat": "^1 || ^2 || ^9.99", + "php": "^5.6 || ^7.0 || ^8.0" }, "require-dev": { - "eloquent/liberator": "^2.0", - "eloquent/phony-phpunit": "^1.0|^3.0", - "jakub-onderka/php-parallel-lint": "^0.9.2", - "phpunit/phpunit": "^5.7|^6.0", - "squizlabs/php_codesniffer": "^2.3|^3.0" + "mockery/mockery": "^1.3.5", + "php-parallel-lint/php-parallel-lint": "^1.3.1", + "phpunit/phpunit": "^5.7 || ^6.0 || ^9.5", + "squizlabs/php_codesniffer": "^2.3 || ^3.0" }, "type": "library", "extra": { @@ -543,7 +771,11 @@ "oauth2", "single sign on" ], - "time": "2018-01-13T05:27:58+00:00" + "support": { + "issues": "https://github.com/thephpleague/oauth2-client/issues", + "source": "https://github.com/thephpleague/oauth2-client/tree/2.6.1" + }, + "time": "2021-12-22T16:42:49+00:00" }, { "name": "league/oauth2-github", @@ -598,6 +830,10 @@ "oauth", "oauth2" ], + "support": { + "issues": "https://github.com/thephpleague/oauth2-github/issues", + "source": "https://github.com/thephpleague/oauth2-github/tree/master" + }, "time": "2017-01-26T01:14:51+00:00" }, { @@ -649,6 +885,10 @@ "oauth", "oauth2" ], + "support": { + "issues": "https://github.com/thephpleague/oauth2-google/issues", + "source": "https://github.com/thephpleague/oauth2-google/tree/master" + }, "time": "2018-03-19T17:28:55+00:00" }, { @@ -704,6 +944,10 @@ "oauth", "oauth2" ], + "support": { + "issues": "https://github.com/thephpleague/oauth2-linkedin/issues", + "source": "https://github.com/thephpleague/oauth2-linkedin/tree/master" + }, "time": "2018-07-23T15:43:54+00:00" }, { @@ -753,32 +997,39 @@ "json", "printer" ], + "support": { + "issues": "https://github.com/localheinz/json-printer/issues", + "source": "https://github.com/localheinz/json-printer" + }, + "abandoned": "ergebnis/json-printer", "time": "2018-08-11T23:54:50+00:00" }, { "name": "omines/oauth2-gitlab", - "version": "3.1.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/omines/oauth2-gitlab.git", - "reference": "e9cf370897b42edeffc6946123a1bd22d6006c33" + "reference": "0c37361c54fae71a85350c445bda1834db5859af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/omines/oauth2-gitlab/zipball/e9cf370897b42edeffc6946123a1bd22d6006c33", - "reference": "e9cf370897b42edeffc6946123a1bd22d6006c33", + "url": "https://api.github.com/repos/omines/oauth2-gitlab/zipball/0c37361c54fae71a85350c445bda1834db5859af", + "reference": "0c37361c54fae71a85350c445bda1834db5859af", "shasum": "" }, "require": { - "league/oauth2-client": "^2.2", - "php": ">=5.6" + "league/oauth2-client": "^2.4.1", + "php": ">=7.2" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.0", - "m4tthumphrey/php-gitlab-api": "^9.0.0", + "guzzlehttp/psr7": "^1.6", + "http-interop/http-factory-guzzle": "^1.0", + "m4tthumphrey/php-gitlab-api": "^10.0|^11.0", "mockery/mockery": "^1.0", - "php-http/guzzle6-adapter": "^1.1.1", - "phpunit/phpunit": "^5.7 || ^6.0" + "php-http/guzzle7-adapter": "^0.1", + "phpunit/phpunit": "^8.0|^9.0" }, "suggest": { "m4tthumphrey/php-gitlab-api": "For further API usage using the acquired OAuth2 token" @@ -786,7 +1037,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { @@ -814,37 +1065,37 @@ "oauth", "oauth2" ], - "time": "2017-11-01T21:46:33+00:00" + "support": { + "issues": "https://github.com/omines/oauth2-gitlab/issues", + "source": "https://github.com/omines/oauth2-gitlab/tree/3.4.0" + }, + "time": "2021-02-08T12:15:55+00:00" }, { "name": "paragonie/random_compat", - "version": "v2.0.17", + "version": "v9.99.100", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d" + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/29af24f25bab834fcbb38ad2a69fa93b867e070d", - "reference": "29af24f25bab834fcbb38ad2a69fa93b867e070d", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": ">= 7" }, "require-dev": { - "phpunit/phpunit": "4.*|5.*" + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" }, "suggest": { "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, "type": "library", - "autoload": { - "files": [ - "lib/random.php" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -863,7 +1114,167 @@ "pseudorandom", "random" ], - "time": "2018-07-04T16:31:37+00:00" + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, + "time": "2020-10-15T08:29:30+00:00" + }, + { + "name": "psr/container", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.2" + }, + "time": "2021-11-05T16:50:12+00:00" + }, + { + "name": "psr/http-client", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client/tree/master" + }, + "time": "2020-06-29T06:28:15+00:00" + }, + { + "name": "psr/http-factory", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-factory.git", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "reference": "12ac7fcd07e5b077433f5f2bee95b3a771bf61be", + "shasum": "" + }, + "require": { + "php": ">=7.0.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for PSR-7 HTTP message factories", + "keywords": [ + "factory", + "http", + "message", + "psr", + "psr-17", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-factory/tree/master" + }, + "time": "2019-04-30T12:38:16+00:00" }, { "name": "psr/http-message", @@ -913,20 +1324,23 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/master" + }, "time": "2016-08-06T14:39:51+00:00" }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { @@ -935,7 +1349,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -950,7 +1364,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", @@ -960,20 +1374,118 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, + "time": "2021-05-03T11:20:27+00:00" }, { - "name": "robmorgan/phinx", - "version": "0.10.6", + "name": "psr/simple-cache", + "version": "1.0.1", "source": { "type": "git", - "url": "https://github.com/cakephp/phinx.git", - "reference": "f28a1c6ab1fa1f0295cddade9aea05eeb303bd2b" + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cakephp/phinx/zipball/f28a1c6ab1fa1f0295cddade9aea05eeb303bd2b", - "reference": "f28a1c6ab1fa1f0295cddade9aea05eeb303bd2b", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "support": { + "source": "https://github.com/php-fig/simple-cache/tree/master" + }, + "time": "2017-10-23T01:57:42+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/getallheaders.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ralph Khattar", + "email": "ralph.khattar@gmail.com" + } + ], + "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, + "time": "2019-03-08T08:55:37+00:00" + }, + { + "name": "robmorgan/phinx", + "version": "0.10.8", + "source": { + "type": "git", + "url": "https://github.com/cakephp/phinx.git", + "reference": "1960e93169707096fdfde04904a204970077f4be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/cakephp/phinx/zipball/1960e93169707096fdfde04904a204970077f4be", + "reference": "1960e93169707096fdfde04904a204970077f4be", "shasum": "" }, "require": { @@ -986,7 +1498,7 @@ }, "require-dev": { "cakephp/cakephp-codesniffer": "^3.0", - "phpunit/phpunit": ">=5.7", + "phpunit/phpunit": ">=5.7,<7.0", "sebastian/comparator": ">=1.2.3" }, "bin": [ @@ -1034,29 +1546,41 @@ "migrations", "phinx" ], - "time": "2018-08-12T17:22:43+00:00" + "support": { + "issues": "https://github.com/cakephp/phinx/issues", + "source": "https://github.com/cakephp/phinx/tree/v0.10.8" + }, + "time": "2019-07-08T16:59:55+00:00" }, { "name": "sendgrid/php-http-client", - "version": "3.9.6", + "version": "3.14.4", "source": { "type": "git", "url": "https://github.com/sendgrid/php-http-client.git", - "reference": "e9a04d949ee2d19938ab83dc100933a3b41a8ec7" + "reference": "6d589564522be290c7d7c18e51bcd8b03aeaf0b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sendgrid/php-http-client/zipball/e9a04d949ee2d19938ab83dc100933a3b41a8ec7", - "reference": "e9a04d949ee2d19938ab83dc100933a3b41a8ec7", + "url": "https://api.github.com/repos/sendgrid/php-http-client/zipball/6d589564522be290c7d7c18e51bcd8b03aeaf0b6", + "reference": "6d589564522be290c7d7c18e51bcd8b03aeaf0b6", "shasum": "" }, "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "~4.4", + "friendsofphp/php-cs-fixer": "^2.16", + "phpunit/phpunit": "^5.7 || ^6.5", + "sebastian/version": "^1.0.6", "squizlabs/php_codesniffer": "~2.0" }, + "suggest": { + "composer/ca-bundle": "Including this library will ensure that a valid CA bundle is available for secure connections" + }, "type": "library", "autoload": { "psr-4": { @@ -1070,11 +1594,11 @@ "authors": [ { "name": "Matt Bernier", - "email": "dx@sendgrid.com" + "email": "mbernier@twilio.com" }, { "name": "Elmer Thomas", - "email": "elmer@thinkingserious.com" + "email": "ethomas@twilio.com" } ], "description": "HTTP REST client, simplified for PHP", @@ -1086,28 +1610,34 @@ "rest", "sendgrid" ], - "time": "2018-04-10T18:06:08+00:00" + "support": { + "issues": "https://github.com/sendgrid/php-http-client/issues", + "source": "https://github.com/sendgrid/php-http-client/tree/3.14.4" + }, + "time": "2022-03-09T20:21:55+00:00" }, { "name": "sendgrid/sendgrid", - "version": "7.0.0", + "version": "7.11.5", "source": { "type": "git", "url": "https://github.com/sendgrid/sendgrid-php.git", - "reference": "b659d96f19f69bcef6807300f88ac7a1b2449328" + "reference": "1d2fd3b72687fe82264853a8888b014f8f99e81f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sendgrid/sendgrid-php/zipball/b659d96f19f69bcef6807300f88ac7a1b2449328", - "reference": "b659d96f19f69bcef6807300f88ac7a1b2449328", + "url": "https://api.github.com/repos/sendgrid/sendgrid-php/zipball/1d2fd3b72687fe82264853a8888b014f8f99e81f", + "reference": "1d2fd3b72687fe82264853a8888b014f8f99e81f", "shasum": "" }, "require": { "ext-curl": "*", "ext-json": "*", "ext-mbstring": "*", + "ext-openssl": "*", "php": ">=5.6", - "sendgrid/php-http-client": "~3.9" + "sendgrid/php-http-client": "~3.10", + "starkbank/ecdsa": "0.*" }, "replace": { "sendgrid/sendgrid-php": "*" @@ -1120,67 +1650,115 @@ "type": "library", "autoload": { "psr-4": { - "SendGrid\\": "lib/", "SendGrid\\Mail\\": "lib/mail/", + "SendGrid\\Stats\\": "lib/stats/", + "SendGrid\\Helper\\": "lib/helper/", "SendGrid\\Contacts\\": "lib/contacts/", - "SendGrid\\Stats\\": "lib/stats/" + "SendGrid\\EventWebhook\\": "lib/eventwebhook/" }, - "files": [ - "lib/SendGrid.php" + "classmap": [ + "lib/BaseSendGridClientInterface.php", + "lib/SendGrid.php", + "lib/TwilioEmail.php" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "This library allows you to quickly and easily send emails through SendGrid using PHP.", + "description": "This library allows you to quickly and easily send emails through Twilio SendGrid using PHP.", "homepage": "http://github.com/sendgrid/sendgrid-php", "keywords": [ "email", "grid", "send", - "sendgrid" + "sendgrid", + "twilio sendgrid" ], - "time": "2018-05-19T16:38:14+00:00" + "support": { + "issues": "https://github.com/sendgrid/sendgrid-php/issues", + "source": "https://github.com/sendgrid/sendgrid-php/tree/7.11.5" + }, + "time": "2022-03-09T20:21:56+00:00" }, { - "name": "symfony/config", - "version": "v3.4.14", + "name": "starkbank/ecdsa", + "version": "0.0.5", "source": { "type": "git", - "url": "https://github.com/symfony/config.git", - "reference": "7b08223b7f6abd859651c56bcabf900d1627d085" + "url": "https://github.com/starkbank/ecdsa-php.git", + "reference": "484bedac47bac4012dc73df91da221f0a66845cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/7b08223b7f6abd859651c56bcabf900d1627d085", - "reference": "7b08223b7f6abd859651c56bcabf900d1627d085", + "url": "https://api.github.com/repos/starkbank/ecdsa-php/zipball/484bedac47bac4012dc73df91da221f0a66845cb", + "reference": "484bedac47bac4012dc73df91da221f0a66845cb", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/filesystem": "~2.8|~3.0|~4.0", - "symfony/polyfill-ctype": "~1.8" + "php": ">=5.5" + }, + "type": "library", + "autoload": { + "files": [ + "src/ellipticcurve.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "StarkBank", + "email": "developers@starkbank.com", + "homepage": "https://starkbank.com", + "role": "Developer" + } + ], + "description": "fast openSSL-compatible implementation of the Elliptic Curve Digital Signature Algorithm (ECDSA)", + "homepage": "https://github.com/starkbank/ecdsa-php", + "support": { + "issues": "https://github.com/starkbank/ecdsa-php/issues", + "source": "https://github.com/starkbank/ecdsa-php/tree/v0.0.5" + }, + "time": "2021-06-06T22:24:49+00:00" + }, + { + "name": "symfony/config", + "version": "v4.4.42", + "source": { + "type": "git", + "url": "https://github.com/symfony/config.git", + "reference": "83cdafd1bd3370de23e3dc2ed01026908863be81" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/config/zipball/83cdafd1bd3370de23e3dc2ed01026908863be81", + "reference": "83cdafd1bd3370de23e3dc2ed01026908863be81", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "symfony/filesystem": "^3.4|^4.0|^5.0", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php80": "^1.16", + "symfony/polyfill-php81": "^1.22" }, "conflict": { - "symfony/dependency-injection": "<3.3", - "symfony/finder": "<3.3" + "symfony/finder": "<3.4" }, "require-dev": { - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/event-dispatcher": "~3.3|~4.0", - "symfony/finder": "~3.3|~4.0", - "symfony/yaml": "~3.0|~4.0" + "symfony/event-dispatcher": "^3.4|^4.0|^5.0", + "symfony/finder": "^3.4|^4.0|^5.0", + "symfony/messenger": "^4.1|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/yaml": "To use the yaml reference dumper" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Config\\": "" @@ -1203,53 +1781,74 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Config Component", + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", - "time": "2018-07-26T11:19:56+00:00" + "support": { + "source": "https://github.com/symfony/config/tree/v4.4.42" + }, + "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-17T07:10:14+00:00" }, { "name": "symfony/console", - "version": "v3.4.14", + "version": "v4.4.43", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73" + "reference": "8a2628d2d5639f35113dc1b833ecd91e1ed1cf46" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/6b217594552b9323bcdcfc14f8a0ce126e84cd73", - "reference": "6b217594552b9323bcdcfc14f8a0ce126e84cd73", + "url": "https://api.github.com/repos/symfony/console/zipball/8a2628d2d5639f35113dc1b833ecd91e1ed1cf46", + "reference": "8a2628d2d5639f35113dc1b833ecd91e1ed1cf46", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/debug": "~2.8|~3.0|~4.0", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=7.1.3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php73": "^1.8", + "symfony/polyfill-php80": "^1.16", + "symfony/service-contracts": "^1.1|^2" }, "conflict": { + "psr/log": ">=3", "symfony/dependency-injection": "<3.4", + "symfony/event-dispatcher": "<4.3|>=5", + "symfony/lock": "<4.4", "symfony/process": "<3.3" }, + "provide": { + "psr/log-implementation": "1.0|2.0" + }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~3.3|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.3|~4.0" + "psr/log": "^1|^2", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/event-dispatcher": "^4.3", + "symfony/lock": "^4.4|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/var-dumper": "^4.3|^5.0" }, "suggest": { - "psr/log-implementation": "For using the console logger", + "psr/log": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Console\\": "" @@ -1272,46 +1871,57 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Console Component", + "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", - "time": "2018-07-26T11:19:56+00:00" + "support": { + "source": "https://github.com/symfony/console/tree/v4.4.43" + }, + "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-06-23T12:22:25+00:00" }, { - "name": "symfony/debug", - "version": "v3.4.14", + "name": "symfony/deprecation-contracts", + "version": "v2.5.2", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc" + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/d5a058ff6ecad26b30c1ba452241306ea34c65cc", - "reference": "d5a058ff6ecad26b30c1ba452241306ea34c65cc", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0" - }, - "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" - }, - "require-dev": { - "symfony/http-kernel": "~2.8|~3.0|~4.0" + "php": ">=7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { - "psr-4": { - "Symfony\\Component\\Debug\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" + "files": [ + "function.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1320,42 +1930,56 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", - "time": "2018-07-26T11:19:56+00:00" + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" }, { "name": "symfony/filesystem", - "version": "v3.4.14", + "version": "v5.4.9", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6" + "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/a59f917e3c5d82332514cb4538387638f5bde2d6", - "reference": "a59f917e3c5d82332514cb4538387638f5bde2d6", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/36a017fa4cce1eff1b8e8129ff53513abcef05ba", + "reference": "36a017fa4cce1eff1b8e8129ff53513abcef05ba", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-ctype": "~1.8" + "php": ">=7.2.5", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8", + "symfony/polyfill-php80": "^1.16" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Filesystem\\": "" @@ -1378,26 +2002,46 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Filesystem Component", + "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", - "time": "2018-07-26T11:19:56+00:00" + "support": { + "source": "https://github.com/symfony/filesystem/tree/v5.4.9" + }, + "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-20T13:55:35+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.9.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" }, "suggest": { "ext-ctype": "For best performance" @@ -1405,29 +2049,33 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-main": "1.26-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - }, { "name": "Gert de Pagter", "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" } ], "description": "Symfony polyfill for ctype functions", @@ -1438,24 +2086,44 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-ctype/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/polyfill-mbstring", - "version": "v1.9.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/d0cd638f4634c16d8df4508e847f14e9e43168b8", - "reference": "d0cd638f4634c16d8df4508e847f14e9e43168b8", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" }, "suggest": { "ext-mbstring": "For best performance" @@ -1463,16 +2131,20 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-main": "1.26-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -1497,41 +2169,377 @@ "portable", "shim" ], - "time": "2018-08-06T14:22:27+00:00" + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/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/yaml", - "version": "v3.4.14", + "name": "symfony/polyfill-php73", + "version": "v1.26.0", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", - "reference": "810af2d35fc72b6cf5c01116806d2b65ccaaf2e2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85", + "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": ">=7.1" + }, + "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\\Php73\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php73/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/polyfill-php80", + "version": "v1.26.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "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\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php80/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-10T07:21:04+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.26.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "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\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/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/service-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1|^3" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "suggest": { + "symfony/service-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v2.5.2" + }, + "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-30T19:17:29+00:00" + }, + { + "name": "symfony/yaml", + "version": "v4.4.43", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "07e392f0ef78376d080d5353c081a5e5704835bd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/07e392f0ef78376d080d5353c081a5e5704835bd", + "reference": "07e392f0ef78376d080d5353c081a5e5704835bd", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", "symfony/polyfill-ctype": "~1.8" }, "conflict": { "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.4-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Yaml\\": "" @@ -1554,9 +2562,26 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Yaml Component", + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", - "time": "2018-07-26T11:19:56+00:00" + "support": { + "source": "https://github.com/symfony/yaml/tree/v4.4.43" + }, + "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-06-20T08:31:17+00:00" } ], "packages-dev": [], @@ -1566,11 +2591,12 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.0.0", - "ext-phalcon": ">=3.4.0", + "php": ">=7.4.0", + "ext-phalcon": ">=4.0.0", + "ext-psr": "*", "ext-redis": "*", "ext-yaml": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.0.0" } From 4bf76f87f155434c439f3f21168aa032cb836283 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:41:21 +0200 Subject: [PATCH 02/24] app/library/Bootstrap.php: require $uri parameter in run() Phalcon/Application::handle() requires it to be passed. --- app/library/Bootstrap.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/library/Bootstrap.php b/app/library/Bootstrap.php index d1eaa63..e6bc471 100644 --- a/app/library/Bootstrap.php +++ b/app/library/Bootstrap.php @@ -57,9 +57,15 @@ class Bootstrap extends Injectable * * @return string */ - public function run() + public function run($uri) { $this->_app->setDI($this->getDI()); - return $this->_app->handle()->getContent(); + + try { + $response = $this->_app->handle($uri); + $response->send(); + } catch(\Exception $ex) { + echo $ex->getMessage(); + } } } From 0508e7cea70d0073d683acef5255415480a01279 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:42:03 +0200 Subject: [PATCH 03/24] public/index.php: pass uri to Httpcb\Bootstrap::run() --- public/index.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/public/index.php b/public/index.php index cb7b01a..bbac697 100644 --- a/public/index.php +++ b/public/index.php @@ -5,8 +5,13 @@ defined('APP_PATH') || define('APP_PATH', realpath('..')); require_once APP_PATH . "/app/library/Bootstrap.php"; require_once APP_PATH . "/app/library/Services.php"; +$serviceContainer = new Httpcb\Services(); + /** * Bootstrap the application. */ -echo (new \Httpcb\Bootstrap(new Httpcb\Services())) - ->prepare()->run(); +$bootstrap = new \Httpcb\Bootstrap($serviceContainer); + +$bootstrap + ->prepare() + ->run($_SERVER["REQUEST_URI"]); From aababdcb12d4e4ee1598fd39629c66fac1d30eb2 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:53:31 +0200 Subject: [PATCH 04/24] Phalcon\DiInterface is renamed to Phalcon\Di\DiInterface --- app/library/Bootstrap.php | 2 +- app/library/ViewHelper/AbstractHelper.php | 12 ++++++------ app/library/ViewHelper/Service.php | 12 ++++++------ app/library/ViewHelper/Volt/Extension.php | 12 ++++++------ app/modules/Base.php | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/library/Bootstrap.php b/app/library/Bootstrap.php index e6bc471..03edaaf 100644 --- a/app/library/Bootstrap.php +++ b/app/library/Bootstrap.php @@ -4,7 +4,7 @@ namespace Httpcb; use Phalcon\Di\FactoryDefault as DiDefault; use Phalcon\Di\Injectable; -use Phalcon\DiInterface; +use Phalcon\Di\DiInterface; use Phalcon\Mvc\Application; class Bootstrap extends Injectable diff --git a/app/library/ViewHelper/AbstractHelper.php b/app/library/ViewHelper/AbstractHelper.php index 916f4a2..ff5fe01 100644 --- a/app/library/ViewHelper/AbstractHelper.php +++ b/app/library/ViewHelper/AbstractHelper.php @@ -2,7 +2,7 @@ namespace Httpcb\ViewHelper; -use Phalcon\DiInterface; +use Phalcon\Di\DiInterface; use Phalcon\Di\InjectionAwareInterface; abstract class AbstractHelper implements InjectionAwareInterface @@ -12,19 +12,19 @@ abstract class AbstractHelper implements InjectionAwareInterface /** * Sets the dependency injector * - * @param mixed $dependencyInjector + * @param DiInterface $container */ - public function setDI(DiInterface $dependencyInjector) + public function setDI(DiInterface $container) : void { - $this->_di = $dependencyInjector; + $this->_di = $container; } /** * Returns the internal dependency injector * - * @return \Phalcon\DiInterface + * @return DiInterface */ - public function getDI() + public function getDI() : DiInterface { return $this->_di; } diff --git a/app/library/ViewHelper/Service.php b/app/library/ViewHelper/Service.php index 2a11d2b..1e20f72 100644 --- a/app/library/ViewHelper/Service.php +++ b/app/library/ViewHelper/Service.php @@ -2,7 +2,7 @@ namespace Httpcb\ViewHelper; -use Phalcon\DiInterface, +use Phalcon\Di\DiInterface, Phalcon\Di\InjectionAwareInterface; class Service implements InjectionAwareInterface @@ -14,19 +14,19 @@ class Service implements InjectionAwareInterface /** * Sets the dependency injector * - * @param mixed $dependencyInjector + * @param DiInterface $container */ - public function setDI(DiInterface $dependencyInjector) + public function setDI(DiInterface $container) : void { - $this->_di = $dependencyInjector; + $this->_di = $container; } /** * Returns the internal dependency injector * - * @return \Phalcon\DiInterface + * @return DiInterface */ - public function getDI() + public function getDI() : DiInterface { return $this->_di; } diff --git a/app/library/ViewHelper/Volt/Extension.php b/app/library/ViewHelper/Volt/Extension.php index c9f4550..b38eb34 100644 --- a/app/library/ViewHelper/Volt/Extension.php +++ b/app/library/ViewHelper/Volt/Extension.php @@ -2,7 +2,7 @@ namespace Httpcb\ViewHelper\Volt; -use Phalcon\DiInterface, +use Phalcon\Di\DiInterface, Phalcon\Di\InjectionAwareInterface; class Extension implements InjectionAwareInterface @@ -38,19 +38,19 @@ class Extension implements InjectionAwareInterface /** * Sets the dependency injector * - * @param mixed $dependencyInjector + * @param DiInterface $container */ - public function setDI(DiInterface $dependencyInjector) + public function setDI(DiInterface $container) : void { - $this->_di = $dependencyInjector; + $this->_di = $container; } /** * Returns the internal dependency injector * - * @return \Phalcon\DiInterface + * @return DiInterface */ - public function getDI() + public function getDI() : DiInterface { return $this->_di; } diff --git a/app/modules/Base.php b/app/modules/Base.php index 85e1c69..2e2b5a3 100644 --- a/app/modules/Base.php +++ b/app/modules/Base.php @@ -3,7 +3,7 @@ namespace App\Module; use Phalcon\Loader, - Phalcon\DiInterface, + Phalcon\Di\DiInterface, Phalcon\Mvc\Dispatcher, Phalcon\Mvc\ModuleDefinitionInterface; From 2a2cda0de4807eb1cea4d6414fdfbdcab38c49aa Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:54:31 +0200 Subject: [PATCH 05/24] app/library/Services.php: remove "use Phalcon\DiInterface" as it's not used. --- app/library/Services.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/library/Services.php b/app/library/Services.php index a6157f5..d34b963 100644 --- a/app/library/Services.php +++ b/app/library/Services.php @@ -2,8 +2,7 @@ namespace Httpcb; -use Phalcon\DiInterface, - Phalcon\Di\FactoryDefault as DiDefault, +use Phalcon\Di\FactoryDefault as DiDefault, Phalcon\Config\Adapter\Yaml as Config, Phalcon\Mvc\View, Phalcon\Mvc\View\Simple as SimpleView, From d6aefc502b277200ed0939bd7ffd8a22bbddabb0 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:55:30 +0200 Subject: [PATCH 06/24] app/models/Data/Base.php: make hasChanged() compatible with base class. --- app/models/Data/Base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/Data/Base.php b/app/models/Data/Base.php index 59a92be..ed81300 100644 --- a/app/models/Data/Base.php +++ b/app/models/Data/Base.php @@ -18,7 +18,7 @@ class Base extends Model * @param boolean $allFields * @return bool */ - public function hasChanged($fieldName = null, $allFields = false) + public function hasChanged($fieldName = null, bool $allFields = false) : bool { return $this->hasSnapshotData() === false || parent::hasChanged($fieldName, $allFields); From d03824518d5ad9a716b061a8b5868b3a3565c2be Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:57:13 +0200 Subject: [PATCH 07/24] Change Phalcon\Mvc\User\Plugin to Phalcon\Di\Injectable --- app/listeners/AccessListener.php | 6 +++--- app/listeners/ActivityLog.php | 4 ++-- app/listeners/DispatchListener.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/listeners/AccessListener.php b/app/listeners/AccessListener.php index e51301c..4f6099a 100644 --- a/app/listeners/AccessListener.php +++ b/app/listeners/AccessListener.php @@ -2,14 +2,14 @@ namespace App\Listener; -use Phalcon\Events\Event, +use Phalcon\Di\Injectable, + Phalcon\Events\Event, Phalcon\Mvc\Dispatcher, - Phalcon\Mvc\User\Plugin, Phalcon\Mvc\Dispatcher\Exception as DispatcherException; use Httpcb\Acl; -class AccessListener extends Plugin +class AccessListener extends Injectable { protected $_ignored_resources = [ 'index', diff --git a/app/listeners/ActivityLog.php b/app/listeners/ActivityLog.php index f7f281e..23a9082 100644 --- a/app/listeners/ActivityLog.php +++ b/app/listeners/ActivityLog.php @@ -2,14 +2,14 @@ namespace App\Listener; -use Phalcon\Mvc\User\Plugin, +use Phalcon\Di\Injectable, Phalcon\Events\Event, App\Model\Data\User, App\Model\Data\ActivityLog as ActivityLogger, Httpcb\OAuth\UserData\UserDataInterface as OAuthUserDataInterface, Httpcb\Auth; -class ActivityLog extends Plugin +class ActivityLog extends Injectable { /** * @var ActivityLogger diff --git a/app/listeners/DispatchListener.php b/app/listeners/DispatchListener.php index 1cd9ff1..650c4e3 100644 --- a/app/listeners/DispatchListener.php +++ b/app/listeners/DispatchListener.php @@ -4,7 +4,7 @@ namespace App\Listener; use Exception, Phalcon\Events\Event, - Phalcon\Mvc\User\Plugin, + Phalcon\Di\Injectable, Phalcon\Mvc\Dispatcher, Phalcon\Mvc\Dispatcher\Exception as DispatcherException; @@ -14,7 +14,7 @@ use Exception, * Plugin for forwarding user to 404 (not found) page * if a request could not be dispatched. */ -class DispatchListener extends Plugin +class DispatchListener extends Injectable { protected $_route_notfound = array( 'controller' => 'error', From 1867351716fb5df6473ab01dd362f57691a2bf5b Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:58:26 +0200 Subject: [PATCH 08/24] app/models/Data/Callback.php: Cant override getSource() anymore as it is marked final, set source in "initialize()" instead. --- app/models/Data/Callback.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/models/Data/Callback.php b/app/models/Data/Callback.php index e739302..d28c44d 100644 --- a/app/models/Data/Callback.php +++ b/app/models/Data/Callback.php @@ -216,6 +216,9 @@ class Callback extends Model */ public function initialize() { + // Set table name mapped in the model. + $this->setSource('callback'); + $this->useDynamicUpdate(true); $this->hasMany('id', RequestMeta::class, 'callbackid', array('foreignKey' => true, 'alias' => 'Requests')); @@ -227,16 +230,6 @@ class Callback extends Model ))); } - /** - * Returns table name mapped in the model. - * - * @return string - */ - public function getSource() - { - return 'callback'; - } - public function getRequestPaginator($page = 1, $limit = 30) { return RequestMeta::getPaginator($this, $page, $limit); From 61bd9eb692bd43f5038b6551fdfcb3e1e9495eb6 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 19:59:28 +0200 Subject: [PATCH 09/24] app/library/Acl.php: use the new Acl api in phalcon. --- app/library/Acl.php | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/app/library/Acl.php b/app/library/Acl.php index f00ac8c..cfaada1 100644 --- a/app/library/Acl.php +++ b/app/library/Acl.php @@ -3,6 +3,7 @@ namespace Httpcb; use Phalcon\Config, + Phalcon\Acl\Enum, Phalcon\Acl\Role, Phalcon\Acl\Adapter\Memory as Adapter; @@ -21,7 +22,7 @@ class Acl $this->_adapter = new Adapter(); // Deny access to everything by default. - $this->_adapter->setDefaultAction(\Phalcon\Acl::DENY); + $this->_adapter->setDefaultAction(Enum::DENY); $this->fromConfig($config); } @@ -46,7 +47,7 @@ class Acl $resource = $wildcard; } } - return $this->_adapter->isAllowed($role, $resource, 'All') == \Phalcon\Acl::ALLOW; + return $this->_adapter->isAllowed($role, $resource, 'All') == Enum::ALLOW; } /** @@ -55,7 +56,7 @@ class Acl */ public function hasResource($resource) { - return $this->_adapter->isResource($resource); + return $this->_adapter->isComponent($resource); } public function fromConfig(Config $config) @@ -84,7 +85,7 @@ class Acl } foreach($resources as $resource) { - $this->_adapter->addResource($resource, 'All'); + $this->_adapter->addComponent($resource, 'All'); } } @@ -98,9 +99,12 @@ class Acl } foreach($zones as $zone) { - $resources = (array) $config->zones->get($zone); + $resources = $config->zones->get($zone); + if (!($resources instanceof Config)) { + $resources = new Config([ $resources ]); + } foreach($resources as $resource) { - $this->_adapter->allow($name, $resource, 'All'); + $this->_adapter->allow($name, $resource, 'All'); } } } From 93daf5f7979a4c5125d4b1ac79573a29861e8ae0 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:04:34 +0200 Subject: [PATCH 10/24] app/library/Auth.php: Change Phalcon\Mvc\User\Component to Phalcon\Di\Injectable --- app/library/Auth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/library/Auth.php b/app/library/Auth.php index ade7a70..7c837d0 100644 --- a/app/library/Auth.php +++ b/app/library/Auth.php @@ -5,9 +5,9 @@ namespace Httpcb; use App\Model\Data\User, Httpcb\OAuth\UserData\UserDataInterface, Httpcb\Auth\Result, - Phalcon\Mvc\User\Component; + Phalcon\Di\Injectable; -class Auth extends Component +class Auth extends Injectable { const SESSION_KEY = 'auth'; From 8029872b13443b2e31044690aabb1ebeb75e8294 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:11:27 +0200 Subject: [PATCH 11/24] app/library/Services.php: Phalcon\Mvc\Url is called Phalcon\Url now. --- app/library/Services.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/library/Services.php b/app/library/Services.php index d34b963..4dbd124 100644 --- a/app/library/Services.php +++ b/app/library/Services.php @@ -7,7 +7,7 @@ use Phalcon\Di\FactoryDefault as DiDefault, Phalcon\Mvc\View, Phalcon\Mvc\View\Simple as SimpleView, Phalcon\Assets\Manager as AssetsManager, - Phalcon\Mvc\Url as UrlResolver, + Phalcon\Url as UrlResolver, Phalcon\Mvc\View\Engine\Volt as VoltEngine, Phalcon\Flash\Direct as FlashDirect, Phalcon\Mvc\Model\Metadata\Memory as MemoryMetaData, From abcbf8759e325604ddd90d01e0dfc168e8306910 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:13:23 +0200 Subject: [PATCH 12/24] app/library/Services.php: Don't need to call setEventsManager() on auth service anymore. --- app/library/Services.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/library/Services.php b/app/library/Services.php index 4dbd124..b3a5af7 100644 --- a/app/library/Services.php +++ b/app/library/Services.php @@ -346,9 +346,7 @@ class Services extends DiDefault protected function _initAuth() { - $auth = new Auth($this->get('config')); - $auth->setEventsManager($this->get('eventsManager')); - return $auth; + return new Auth($this->get('config')); } protected function _initAcl() From 2dd571cd3dce41554c48054a9c0db886cfc252e5 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:17:06 +0200 Subject: [PATCH 13/24] app/library/Services.php: update view initialization --- app/library/Services.php | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/app/library/Services.php b/app/library/Services.php index b3a5af7..556f4b7 100644 --- a/app/library/Services.php +++ b/app/library/Services.php @@ -12,6 +12,7 @@ use Phalcon\Di\FactoryDefault as DiDefault, Phalcon\Flash\Direct as FlashDirect, Phalcon\Mvc\Model\Metadata\Memory as MemoryMetaData, Phalcon\Mvc\Model\MetaData\Apc as ApcMetaData, + Phalcon\Mvc\ViewBaseInterface, Phalcon\Cache\Frontend\Data as FrontendDataCache, Phalcon\Cache\Backend\Apc as BackendApcCache, Phalcon\Translate\Adapter\NativeArray as TranslateAdapter, @@ -227,23 +228,23 @@ class Services extends DiDefault $view->setPartialsDir('_partials/'); $view->registerEngines(array( - '.volt' => function ($view, $di) use ($config) { + '.volt' => function (ViewBaseInterface $view) use ($config) { - $volt = new VoltEngine($view, $di); + $volt = new VoltEngine($view, $this); $volt->setOptions(array( - 'compiledPath' => $config->application->viewCacheDir, - 'compiledSeparator' => '_', - 'compileAlways' => true, + 'path' => $config->application->viewCacheDir, + 'separator' => '_', + 'always' => true, )); // Register view helpers $compiler = $volt->getCompiler(); - $compiler->addExtension(new ViewHelperVoltExtension($di)); + $compiler->addExtension(new ViewHelperVoltExtension($this)); return $volt; }, - '.phtml' => 'Phalcon\Mvc\View\Engine\Php' + '.phtml' => \Phalcon\Mvc\View\Engine\Php::class )); // Set default main layout. @@ -367,17 +368,17 @@ class Services extends DiDefault $view = new SimpleView(); $view->setViewsDir($config->application->templateDir); $view->registerEngines([ - '.volt' => function ($view, $di) use ($config) { - $volt = new VoltEngine($view, $di); + '.volt' => function (ViewBaseInterface $view) use ($config) { + $volt = new VoltEngine($view, $this); $volt->setOptions(array( - 'compiledPath' => $config->application->viewCacheDir, - 'compiledSeparator' => '_', + 'path' => $config->application->viewCacheDir, + 'separator' => '_', )); return $volt; }, - '.phtml' => 'Phalcon\Mvc\View\Engine\Php' + '.phtml' => \Phalcon\Mvc\View\Engine\Php::class, ]); return $view; } From 771cb05b120df304eb090185025c5ac56728e5c3 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:18:07 +0200 Subject: [PATCH 14/24] app/library/Services.php: update session initialization --- app/library/Services.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/app/library/Services.php b/app/library/Services.php index 556f4b7..59b161b 100644 --- a/app/library/Services.php +++ b/app/library/Services.php @@ -18,7 +18,6 @@ use Phalcon\Di\FactoryDefault as DiDefault, Phalcon\Translate\Adapter\NativeArray as TranslateAdapter, Phalcon\Logger, Phalcon\Logger\Adapter\File as FileLogAdapter, - Phalcon\Session\Adapter\Files as SessionAdapter, Phalcon\Mvc\Router; use Httpcb\Auth, @@ -190,25 +189,23 @@ class Services extends DiDefault protected function _initSession() { $config = $this->get('config'); + $session = new \Phalcon\Session\Manager(); if (isset($config->session)) { $data = $config->session->toArray(); - $adapter = isset($data['adapter']) ? $data['adapter'] : 'Files'; + $adapter_name = isset($data['adapter']) ? $data['adapter'] : 'Stream'; $options = $data['options']; - // For "Files": Set session path if defined. - if ($adapter === 'Files' && isset($options['path'])) { - session_save_path($config->application->path); - } - - $class = 'Phalcon\Session\Adapter\\' . $adapter; - $session = new $class($options); + $class = 'Phalcon\Session\Adapter\\' . $adapter_name; + $adapter = new $class($options); } - // Default to File storage + // Default to Stream else { - $session = new \Phalcon\Session\Adapter\Files(); + $adapter = new \Phalcon\Session\Adapter\Stream(); } + $session->setAdapter($adapter); + // Start session. $session->start(); return $session; From 62550f90fabf64cf0ce54722353315e05c9ebfd8 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:20:40 +0200 Subject: [PATCH 15/24] app/library/Services.php: Update logging initialization --- app/library/Services.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/library/Services.php b/app/library/Services.php index 59b161b..470623e 100644 --- a/app/library/Services.php +++ b/app/library/Services.php @@ -17,7 +17,6 @@ use Phalcon\Di\FactoryDefault as DiDefault, Phalcon\Cache\Backend\Apc as BackendApcCache, Phalcon\Translate\Adapter\NativeArray as TranslateAdapter, Phalcon\Logger, - Phalcon\Logger\Adapter\File as FileLogAdapter, Phalcon\Mvc\Router; use Httpcb\Auth, @@ -154,7 +153,7 @@ class Services extends DiDefault $eventsManager->attach('db', function ($event, $connection) use ($logger) { if ($event->getType() == 'beforeQuery') { - $logger->log($connection->getRealSQLStatement(), Logger::INFO); + $logger->info($connection->getRealSQLStatement()); } }); @@ -354,8 +353,10 @@ class Services extends DiDefault protected function _initSharedLogger() { - $path = $this->get('config')->application->logDir; - return new FileLogAdapter($path . "app.txt"); + $path = $this->get('config')->application->logDir; + return new \Phalcon\Logger('default', [ + 'main' => new \Phalcon\Logger\Adapter\Stream($path . 'app.txt') + ]); } protected function _initTemplate() From 05e1a19f47ad2b063de1816a042b26236f10574a Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:34:06 +0200 Subject: [PATCH 16/24] app/listeners/ActivityLog.php: update _log() to phalcon4 model api. --- app/listeners/ActivityLog.php | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/app/listeners/ActivityLog.php b/app/listeners/ActivityLog.php index 23a9082..6bd6a66 100644 --- a/app/listeners/ActivityLog.php +++ b/app/listeners/ActivityLog.php @@ -11,11 +11,6 @@ use Phalcon\Di\Injectable, class ActivityLog extends Injectable { - /** - * @var ActivityLogger - */ - protected $_table = null; - /** * On login event. * @@ -74,20 +69,10 @@ class ActivityLog extends Injectable { $ip = (new \Phalcon\Http\Request())->getClientAddress(); - $data = [ + return (new ActivityLogger())->assign([ 'user_id' => $user->getId(), 'ip' => $ip, 'message' => $message - ]; - - return $this->_getLogger()->create($data); - } - - protected function _getLogger() - { - if ($this->_table === null) { - $this->_table = new ActivityLogger(); - } - return $this->_table; + ])->create(); } } From 0971f8f35e9b923e8586ff0f65e0559058b2ac7e Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:41:47 +0200 Subject: [PATCH 17/24] app/controllers/UserController.php: no need to set event manager anymore. --- app/controllers/UserController.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php index 436f35e..8274167 100644 --- a/app/controllers/UserController.php +++ b/app/controllers/UserController.php @@ -10,13 +10,6 @@ use App\Controller\ControllerBase, class UserController extends ControllerBase { - public function initialize() - { - // We need event manager here from DI. - $eventManager = $this->di->get('eventsManager'); - $this->setEventsManager($eventManager); - } - public function settingsAction() { $user = $this->_getAuth()->getUser(); @@ -156,7 +149,7 @@ class UserController extends ControllerBase $user->{'set' . $provider . 'Id'}(null); $user->save(); - $this->getEventsManager()->fire('user:onOAuthDisconnect', $user, $provider); + $this->eventsManager->fire('user:onOAuthDisconnect', $user, $provider); $this->flash->message('success', "

{$provider} was disconnected

"); From bb12b1a007370b43136fe42943d9fa4071de0f64 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 20:53:00 +0200 Subject: [PATCH 18/24] app/library/Validation/Validator/Alpha.php: update to phalcon4 api. --- app/library/Validation/Validator/Alpha.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/library/Validation/Validator/Alpha.php b/app/library/Validation/Validator/Alpha.php index b15cd0d..540766f 100644 --- a/app/library/Validation/Validator/Alpha.php +++ b/app/library/Validation/Validator/Alpha.php @@ -3,7 +3,7 @@ namespace Httpcb\Validation\Validator; use Phalcon\Validation\Message; -use Phalcon\Validation\Validator as BaseValidator; +use Phalcon\Validation\AbstractValidator; /** * The same as the default Alpha validator shipped with phalcon. @@ -12,16 +12,16 @@ use Phalcon\Validation\Validator as BaseValidator; * * @package Validation\Validator */ -class Alpha extends BaseValidator +class Alpha extends AbstractValidator { /** * Executes the validation * * @param mixed $validation - * @param string $attribute + * @param string $field * @return bool */ - public function validate(\Phalcon\Validation $validation, $attribute) + public function validate(\Phalcon\Validation $validation, $field) : bool { $allowSpace = $this->getOption('allowSpace', false); @@ -30,13 +30,13 @@ class Alpha extends BaseValidator $charlist .= '[:space:]'; } - $value = $validation->getValue($attribute); + $value = $validation->getValue($field); if (preg_match("/[^{$charlist}]/imu", $value)) { $label = $this->getOption('label'); if (empty($label)) { - $label = $validation->getLabel($attribute); + $label = $validation->getLabel($field); } $message = $this->getOption('message'); @@ -48,12 +48,12 @@ class Alpha extends BaseValidator $code = $this->getOption("code"); if (is_array($code)) { - $code = $code[$attribute]; + $code = $code[$field]; } $message = str_replace(array_keys($replace), $replace, $message); - $msg = new Message($message, $attribute, "Alpha", $code); + $msg = new Message($message, $field, "Alpha", $code); $validation->appendMessage($msg); return false; From 863175eb51e34f00e15e0baffdb5d4245607645b Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 21:06:16 +0200 Subject: [PATCH 19/24] app/controllers/AuthController.php: No need to set event manager anymore --- app/controllers/AuthController.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php index 5c20761..0fb0e47 100644 --- a/app/controllers/AuthController.php +++ b/app/controllers/AuthController.php @@ -12,13 +12,6 @@ use App\Controller\ControllerBase, class AuthController extends ControllerBase { - public function initialize() - { - // We need event manager here from DI. - $eventManager = $this->di->get('eventsManager'); - $this->setEventsManager($eventManager); - } - public function indexAction() { $form = new LoginForm(); @@ -74,7 +67,7 @@ class AuthController extends ControllerBase $user->{'set' . $name . 'Id'}($data->getId()); $user->save(); - $this->getEventsManager()->fire('user:onOAuthConnected', $user, $data); + $this->eventsManager->fire('user:onOAuthConnected', $user, $data); $this->flash->message('success', sprintf("OAuth provider %s was connected!", $name)); $this->response->redirect('/settings'); From 376f3dfd1162e6a156ef6b71e90650b192d1daeb Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 21:06:55 +0200 Subject: [PATCH 20/24] app/forms/UserSettings.php: Phalcon\Forms\Element is renamed to Phalcon\Forms\AbstractElement --- app/forms/UserSettings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/forms/UserSettings.php b/app/forms/UserSettings.php index c003f67..91c022a 100644 --- a/app/forms/UserSettings.php +++ b/app/forms/UserSettings.php @@ -11,7 +11,7 @@ use App\Model\Data\User as UserModel; * Phalcon Form */ use Phalcon\Forms\Form as FormBase, - Phalcon\Forms\Element as FormElement; + Phalcon\Forms\Element\AbstractElement; /** * Element types @@ -210,7 +210,7 @@ class UserSettings extends FormBase return $this->_render($ele, $options); } - protected function _render(FormElement $ele, $opt) + protected function _render(AbstractElement $ele, $opt) { $xhtml = ''; From 0d59417636d1fc77ce0f7a87a4e00deccfd43649 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 21:08:25 +0200 Subject: [PATCH 21/24] app/forms/Registration.php: remove unneeded use. --- app/forms/Registration.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/forms/Registration.php b/app/forms/Registration.php index 33cad4c..9e8d292 100644 --- a/app/forms/Registration.php +++ b/app/forms/Registration.php @@ -10,8 +10,7 @@ use App\Model\Data\User; /** * Phalcon Form */ -use Httpcb\Form as FormBase, - Phalcon\Forms\Element as FormElement; +use Httpcb\Form as FormBase; /** * Element types From 191f1c19300e4aef18a68e158bde6df7038148ab Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 21:08:51 +0200 Subject: [PATCH 22/24] app/library/Mvc/Model/Behavior/RandomId.php: "_optoins" property is renamed to "options" --- app/library/Mvc/Model/Behavior/RandomId.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/library/Mvc/Model/Behavior/RandomId.php b/app/library/Mvc/Model/Behavior/RandomId.php index 93d3c2a..185c188 100644 --- a/app/library/Mvc/Model/Behavior/RandomId.php +++ b/app/library/Mvc/Model/Behavior/RandomId.php @@ -57,11 +57,11 @@ class RandomId extends Behavior implements BehaviorInterface */ public function generateId(\Phalcon\Mvc\ModelInterface $model) { - $field = $this->_options['field']; - $len = $this->_options['length']; + $field = $this->options['field']; + $len = $this->options['length']; - if (isset($this->_options['expression'])) { - $expr = 'AND ' . $this->_options['expression']; + if (isset($this->options['expression'])) { + $expr = 'AND ' . $this->options['expression']; } else { $expr = ''; } From 3e34e7293143152f9352ca1f1d9c92afdfe3bd4c Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 21:09:36 +0200 Subject: [PATCH 23/24] Update pagination api. --- app/controllers/CallbackController.php | 6 +++--- app/controllers/UserController.php | 2 +- app/controllers/backend/LogController.php | 2 +- app/controllers/backend/UserController.php | 2 +- app/views/_common/_partials/pagination.volt | 14 +++++++------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/controllers/CallbackController.php b/app/controllers/CallbackController.php index 64354d1..83376ee 100644 --- a/app/controllers/CallbackController.php +++ b/app/controllers/CallbackController.php @@ -25,11 +25,11 @@ class CallbackController extends ControllerBase { $paginator = CallbackModel::getPaginationList($this->_user->getId(), $page, 10); - if ($paginator->getPaginate()->current > $paginator->getPaginate()->total_pages) { + if ($paginator->paginate()->current > $paginator->paginate()->last) { $paginator->setCurrentPage(1); } - $this->view->page = $paginator->getPaginate(); + $this->view->page = $paginator->paginate(); $this->view->pagination_url = '/callback/list/'; } @@ -111,7 +111,7 @@ class CallbackController extends ControllerBase $paginator = $callback->getRequestPaginator($page, 30); $this->view->item = $callback; - $this->view->page = $paginator->getPaginate(); + $this->view->page = $paginator->paginate(); $this->view->pagination_url = '/callback/show/' . $id . '/'; } } diff --git a/app/controllers/UserController.php b/app/controllers/UserController.php index 8274167..3439c00 100644 --- a/app/controllers/UserController.php +++ b/app/controllers/UserController.php @@ -105,7 +105,7 @@ class UserController extends ControllerBase $paginator = ActivityLog::getPaginationList($user->getId(), $page); - $this->view->page = $paginator->getPaginate(); + $this->view->page = $paginator->pageinate(); $this->view->pagination_url = '/user/activity/'; } diff --git a/app/controllers/backend/LogController.php b/app/controllers/backend/LogController.php index dcbe8fb..df0dba9 100644 --- a/app/controllers/backend/LogController.php +++ b/app/controllers/backend/LogController.php @@ -15,7 +15,7 @@ class LogController extends \Phalcon\Mvc\Controller { $paginator = ActivityLog::getAllPaginationList($page); - $this->view->page = $paginator->getPaginate(); + $this->view->page = $paginator->paginate(); $this->view->pagination_url = '/admin/log/'; } } diff --git a/app/controllers/backend/UserController.php b/app/controllers/backend/UserController.php index bde79ac..0bea10c 100644 --- a/app/controllers/backend/UserController.php +++ b/app/controllers/backend/UserController.php @@ -19,6 +19,6 @@ class UserController extends \Phalcon\Mvc\Controller $paginator = User::getPaginationList($page,15); $this->view->pagination_url = '/admin/user/list/'; - $this->view->page = $paginator->getPaginate(); + $this->view->page = $paginator->paginate(); } } diff --git a/app/views/_common/_partials/pagination.volt b/app/views/_common/_partials/pagination.volt index 4720288..1dd6644 100644 --- a/app/views/_common/_partials/pagination.volt +++ b/app/views/_common/_partials/pagination.volt @@ -9,19 +9,19 @@ {% set pagination_slider = 3 %} -{% if (page.total_pages > 1) %} +{% if (page.last > 1) %}
    - {% if page.current !== page.before %} + {% if page.current !== page.previous %}
  • - + {{ icon('solid/arrow-left') }} Previous
    • {% endif %} - {% if page.total_pages > pagination_slider and page.current > (pagination_slider + 1) %} + {% if page.last > pagination_slider and page.current > (pagination_slider + 1) %}
  • 1
    • @@ -30,7 +30,7 @@ {% endif %} - {% for n in max(page.current - pagination_slider, 1)..min(page.current + pagination_slider, page.total_pages) %} + {% for n in max(page.current - pagination_slider, 1)..min(page.current + pagination_slider, page.last) %} {% if (n == page.current) %}
  • {% else %} @@ -40,12 +40,12 @@
    • {% endfor %} - {% if page.total_pages > pagination_slider and page.current < page.total_pages - pagination_slider %} + {% if page.last > pagination_slider and page.current < page.last - pagination_slider %}
  • ...
  • - {{ page.total_pages }} + {{ page.last }}
    • {% endif %} From 9b2e38d9f39ad2026a1b141a0117cdb860293efc Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 26 Jul 2022 21:10:28 +0200 Subject: [PATCH 24/24] app/library/Bootstrap.php: Fix documentation for run() method. --- app/library/Bootstrap.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/library/Bootstrap.php b/app/library/Bootstrap.php index 03edaaf..86b89cd 100644 --- a/app/library/Bootstrap.php +++ b/app/library/Bootstrap.php @@ -54,8 +54,6 @@ class Bootstrap extends Injectable /** * Runs the application. - * - * @return string */ public function run($uri) {