Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-10-31 02:15:55 +01:00
Code Issues Packages Projects Releases Activity

Updated to Symfony 4.3, use Symfony EventDispatcher directly and not rockettheme/toolbox wrapper

Browse Source
This commit is contained in:
Matias Griese
2019-10-29 20:56:31 +02:00
parent a93ef3f752
commit 2fd5492286
13 changed files with 102 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -6,6 +6,7 @@
* Added `Utils::simpleTemplate()` method for very simple variable templating * Added `Utils::simpleTemplate()` method for very simple variable templating
* Added `array_diff()` twig function * Added `array_diff()` twig function
* Added `template_from_string()` twig function * Added `template_from_string()` twig function
* Updated Symfony Components to 4.3
1. [](#improved) 1. [](#improved)
* Improved `Scheduler` cron command check and more useful CLI information * Improved `Scheduler` cron command check and more useful CLI information
* Improved `Flex Users`: obey blueprints and allow Flex to be used in admin only * Improved `Flex Users`: obey blueprints and allow Flex to be used in admin only
@@ -14,6 +15,7 @@
* Added mime support for file formatters * Added mime support for file formatters
* Updated built-in `composer.phar` to latest `1.9.0` * Updated built-in `composer.phar` to latest `1.9.0`
* Updated vendor libraries * Updated vendor libraries
* Use `Symfony EventDispatcher` directly and not rockettheme/toolbox wrapper
1. [](#bugfix) 1. [](#bugfix)
* Fixed `Page::untranslatedLanguages()` not being symmetrical to `Page::translatedLanguages()` * Fixed `Page::untranslatedLanguages()` not being symmetrical to `Page::translatedLanguages()`
* Fixed `Flex Pages` not calling `onPageProcessed` event when cached * Fixed `Flex Pages` not calling `onPageProcessed` event when cached

10
composer.json
View File

@@ -30,11 +30,11 @@
"twig/twig": "~1.0", "twig/twig": "~1.0",
"erusev/parsedown": "1.6.4", "erusev/parsedown": "1.6.4",
"erusev/parsedown-extra": "~0.7", "erusev/parsedown-extra": "~0.7",
"symfony/yaml": "~4.2", "symfony/yaml": "~4.3.0",
"symfony/console": "~4.2.0", "symfony/console": "~4.3.0",
"symfony/event-dispatcher": "~4.2.0", "symfony/event-dispatcher": "~4.3.0",
"symfony/var-dumper": "~4.2.0", "symfony/var-dumper": "~4.3.0",
"symfony/process": "~4.2.0", "symfony/process": "~4.3.0",
"doctrine/cache": "^1.8", "doctrine/cache": "^1.8",
"doctrine/collections": "^1.5", "doctrine/collections": "^1.5",
"guzzlehttp/psr7": "^1.4", "guzzlehttp/psr7": "^1.4",

120
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "651a29a09418144e8b0d47bade1e807f", "content-hash": "451ad4d98f131fac0ea734eb5070afee",
"packages": [ "packages": [
{ {
"name": "antoligy/dom-string-iterators", "name": "antoligy/dom-string-iterators",
@@ -108,16 +108,16 @@
}, },
{ {
"name": "doctrine/cache", "name": "doctrine/cache",
"version": "v1.8.0", "version": "v1.8.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/cache.git", "url": "https://github.com/doctrine/cache.git",
"reference": "d768d58baee9a4862ca783840eca1b9add7a7f57" "reference": "d4374ae95b36062d02ef310100ed33d78738d76c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/d768d58baee9a4862ca783840eca1b9add7a7f57", "url": "https://api.github.com/repos/doctrine/cache/zipball/d4374ae95b36062d02ef310100ed33d78738d76c",
"reference": "d768d58baee9a4862ca783840eca1b9add7a7f57", "reference": "d4374ae95b36062d02ef310100ed33d78738d76c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -152,6 +152,10 @@
"MIT" "MIT"
], ],
"authors": [ "authors": [
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Roman Borschel", "name": "Roman Borschel",
"email": "roman@code-factory.org" "email": "roman@code-factory.org"
@@ -160,10 +164,6 @@
"name": "Benjamin Eberlei", "name": "Benjamin Eberlei",
"email": "kontakt@beberlei.de" "email": "kontakt@beberlei.de"
}, },
{
"name": "Guilherme Blanco",
"email": "guilhermeblanco@gmail.com"
},
{ {
"name": "Jonathan Wage", "name": "Jonathan Wage",
"email": "jonwage@gmail.com" "email": "jonwage@gmail.com"
@@ -179,7 +179,7 @@
"cache", "cache",
"caching" "caching"
], ],
"time": "2018-08-21T18:01:43+00:00" "time": "2019-10-28T09:31:32+00:00"
}, },
{ {
"name": "doctrine/collections", "name": "doctrine/collections",
@@ -1690,16 +1690,16 @@
}, },
{ {
"name": "psr/log", "name": "psr/log",
"version": "1.1.0", "version": "1.1.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/php-fig/log.git", "url": "https://github.com/php-fig/log.git",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd" "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "url": "https://api.github.com/repos/php-fig/log/zipball/bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd", "reference": "bf73deb2b3b896a9d9c75f3f0d88185d2faa27e2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -1708,7 +1708,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.0.x-dev" "dev-master": "1.1.x-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1733,7 +1733,7 @@
"psr", "psr",
"psr-3" "psr-3"
], ],
"time": "2018-11-20T15:27:04+00:00" "time": "2019-10-25T08:06:51+00:00"
}, },
{ {
"name": "psr/simple-cache", "name": "psr/simple-cache",
@@ -1923,25 +1923,27 @@
}, },
{ {
"name": "symfony/console", "name": "symfony/console",
"version": "v4.2.11", "version": "v4.3.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/console.git", "url": "https://github.com/symfony/console.git",
"reference": "fc2e274aade6567a750551942094b2145ade9b6c" "reference": "929ddf360d401b958f611d44e726094ab46a7369"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/fc2e274aade6567a750551942094b2145ade9b6c", "url": "https://api.github.com/repos/symfony/console/zipball/929ddf360d401b958f611d44e726094ab46a7369",
"reference": "fc2e274aade6567a750551942094b2145ade9b6c", "reference": "929ddf360d401b958f611d44e726094ab46a7369",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"symfony/contracts": "^1.0", "symfony/polyfill-mbstring": "~1.0",
"symfony/polyfill-mbstring": "~1.0" "symfony/polyfill-php73": "^1.8",
"symfony/service-contracts": "^1.1"
}, },
"conflict": { "conflict": {
"symfony/dependency-injection": "<3.4", "symfony/dependency-injection": "<3.4",
"symfony/event-dispatcher": "<4.3",
"symfony/process": "<3.3" "symfony/process": "<3.3"
}, },
"provide": { "provide": {
@@ -1951,9 +1953,10 @@
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0",
"symfony/event-dispatcher": "~3.4|~4.0", "symfony/event-dispatcher": "^4.3",
"symfony/lock": "~3.4|~4.0", "symfony/lock": "~3.4|~4.0",
"symfony/process": "~3.4|~4.0" "symfony/process": "~3.4|~4.0",
"symfony/var-dumper": "^4.3"
}, },
"suggest": { "suggest": {
"psr/log": "For using the console logger", "psr/log": "For using the console logger",
@@ -1964,7 +1967,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.2-dev" "dev-master": "4.3-dev"
} }
}, },
"autoload": { "autoload": {
@@ -1991,7 +1994,7 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2019-07-24T17:13:20+00:00" "time": "2019-10-07T12:36:49+00:00"
}, },
{ {
"name": "symfony/contracts", "name": "symfony/contracts",
@@ -2072,30 +2075,36 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v4.2.11", "version": "v4.3.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/event-dispatcher.git", "url": "https://github.com/symfony/event-dispatcher.git",
"reference": "852548c7c704f14d2f6700c8d872a05bd2028732" "reference": "6229f58993e5a157f6096fc7145c0717d0be8807"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/852548c7c704f14d2f6700c8d872a05bd2028732", "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/6229f58993e5a157f6096fc7145c0717d0be8807",
"reference": "852548c7c704f14d2f6700c8d872a05bd2028732", "reference": "6229f58993e5a157f6096fc7145c0717d0be8807",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"symfony/contracts": "^1.0" "symfony/event-dispatcher-contracts": "^1.1"
}, },
"conflict": { "conflict": {
"symfony/dependency-injection": "<3.4" "symfony/dependency-injection": "<3.4"
}, },
"provide": {
"psr/event-dispatcher-implementation": "1.0",
"symfony/event-dispatcher-implementation": "1.1"
},
"require-dev": { "require-dev": {
"psr/log": "~1.0", "psr/log": "~1.0",
"symfony/config": "~3.4|~4.0", "symfony/config": "~3.4|~4.0",
"symfony/dependency-injection": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0",
"symfony/expression-language": "~3.4|~4.0", "symfony/expression-language": "~3.4|~4.0",
"symfony/http-foundation": "^3.4|^4.0",
"symfony/service-contracts": "^1.1",
"symfony/stopwatch": "~3.4|~4.0" "symfony/stopwatch": "~3.4|~4.0"
}, },
"suggest": { "suggest": {
@@ -2105,7 +2114,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.2-dev" "dev-master": "4.3-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2132,7 +2141,7 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2019-06-26T06:46:55+00:00" "time": "2019-10-01T16:40:32+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
@@ -2425,16 +2434,16 @@
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
"version": "v4.2.11", "version": "v4.3.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/process.git", "url": "https://github.com/symfony/process.git",
"reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2" "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2", "url": "https://api.github.com/repos/symfony/process/zipball/50556892f3cc47d4200bfd1075314139c4c9ff4b",
"reference": "808a4be7e0dd7fcb6a2b1ed2ba22dd581402c5e2", "reference": "50556892f3cc47d4200bfd1075314139c4c9ff4b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2443,7 +2452,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.2-dev" "dev-master": "4.3-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2470,20 +2479,20 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"time": "2019-05-30T16:06:08+00:00" "time": "2019-09-26T21:17:10+00:00"
}, },
{ {
"name": "symfony/var-dumper", "name": "symfony/var-dumper",
"version": "v4.2.11", "version": "v4.3.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/var-dumper.git", "url": "https://github.com/symfony/var-dumper.git",
"reference": "4e18e041a477edbb8c54e053f179672f9413816c" "reference": "bde8957fc415fdc6964f33916a3755737744ff05"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/4e18e041a477edbb8c54e053f179672f9413816c", "url": "https://api.github.com/repos/symfony/var-dumper/zipball/bde8957fc415fdc6964f33916a3755737744ff05",
"reference": "4e18e041a477edbb8c54e053f179672f9413816c", "reference": "bde8957fc415fdc6964f33916a3755737744ff05",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -2512,7 +2521,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "4.2-dev" "dev-master": "4.3-dev"
} }
}, },
"autoload": { "autoload": {
@@ -2546,7 +2555,7 @@
"debug", "debug",
"dump" "dump"
], ],
"time": "2019-07-27T06:42:33+00:00" "time": "2019-10-04T19:48:13+00:00"
}, },
{ {
"name": "symfony/yaml", "name": "symfony/yaml",
@@ -3906,16 +3915,16 @@
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
"version": "v4.2.4", "version": "v4.2.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/nikic/PHP-Parser.git", "url": "https://github.com/nikic/PHP-Parser.git",
"reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4" "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/97e59c7a16464196a8b9c77c47df68e4a39a45c4", "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
"reference": "97e59c7a16464196a8b9c77c47df68e4a39a45c4", "reference": "b76bbc3c51f22c570648de48e8c2d941ed5e2cf2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -3923,6 +3932,7 @@
"php": ">=7.0" "php": ">=7.0"
}, },
"require-dev": { "require-dev": {
"ircmaxell/php-yacc": "0.0.4",
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0" "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
}, },
"bin": [ "bin": [
@@ -3953,7 +3963,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2019-09-01T07:51:21+00:00" "time": "2019-10-25T18:33:07+00:00"
}, },
{ {
"name": "ocramius/package-versions", "name": "ocramius/package-versions",
@@ -4747,16 +4757,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "7.5.16", "version": "7.5.17",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661" "reference": "4c92a15296e58191a4cd74cff3b34fc8e374174a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/316afa6888d2562e04aeb67ea7f2017a0eb41661", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4c92a15296e58191a4cd74cff3b34fc8e374174a",
"reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661", "reference": "4c92a15296e58191a4cd74cff3b34fc8e374174a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@@ -4827,7 +4837,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2019-09-14T09:08:39+00:00" "time": "2019-10-28T10:37:36+00:00"
}, },
{ {
"name": "sebastian/code-unit-reverse-lookup", "name": "sebastian/code-unit-reverse-lookup",

2
system/src/Grav/Common/Backup/Backups.php
View File

@@ -17,9 +17,9 @@ use Grav\Common\Scheduler\Scheduler;
use Grav\Common\Utils; use Grav\Common\Utils;
use Grav\Common\Grav; use Grav\Common\Grav;
use RocketTheme\Toolbox\Event\Event; use RocketTheme\Toolbox\Event\Event;
use RocketTheme\Toolbox\Event\EventDispatcher;
use RocketTheme\Toolbox\File\JsonFile; use RocketTheme\Toolbox\File\JsonFile;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator; use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
use Symfony\Component\EventDispatcher\EventDispatcher;
class Backups class Backups
{ {

2
system/src/Grav/Common/Cache.php
View File

@@ -15,7 +15,7 @@ use Grav\Common\Filesystem\Folder;
use Grav\Common\Scheduler\Scheduler; use Grav\Common\Scheduler\Scheduler;
use Psr\SimpleCache\CacheInterface; use Psr\SimpleCache\CacheInterface;
use RocketTheme\Toolbox\Event\Event; use RocketTheme\Toolbox\Event\Event;
use RocketTheme\Toolbox\Event\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcher;
/** /**
* The GravCache object is used throughout Grav to store and retrieve cached data. * The GravCache object is used throughout Grav to store and retrieve cached data.

2
system/src/Grav/Common/Debugger.php
View File

@@ -11,7 +11,6 @@ namespace Grav\Common;
use Clockwork\Clockwork; use Clockwork\Clockwork;
use Clockwork\DataSource\MonologDataSource; use Clockwork\DataSource\MonologDataSource;
use Clockwork\DataSource\PhpDataSource;
use Clockwork\DataSource\PsrMessageDataSource; use Clockwork\DataSource\PsrMessageDataSource;
use Clockwork\DataSource\XdebugDataSource; use Clockwork\DataSource\XdebugDataSource;
use Clockwork\Helpers\ServerTiming; use Clockwork\Helpers\ServerTiming;
@@ -38,7 +37,6 @@ use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use RocketTheme\Toolbox\Event\Event; use RocketTheme\Toolbox\Event\Event;
use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Twig\Environment;
use Twig\Template; use Twig\Template;
use Twig\TemplateWrapper; use Twig\TemplateWrapper;

35
system/src/Grav/Common/Grav.php
View File

@@ -11,6 +11,7 @@ namespace Grav\Common;
use Grav\Common\Config\Config; use Grav\Common\Config\Config;
use Grav\Common\Config\Setup; use Grav\Common\Config\Setup;
use Grav\Common\Helpers\Exif;
use Grav\Common\Page\Interfaces\PageInterface; use Grav\Common\Page\Interfaces\PageInterface;
use Grav\Common\Page\Medium\ImageMedium; use Grav\Common\Page\Medium\ImageMedium;
use Grav\Common\Page\Medium\Medium; use Grav\Common\Page\Medium\Medium;
@@ -26,13 +27,16 @@ use Grav\Common\Processors\SchedulerProcessor;
use Grav\Common\Processors\TasksProcessor; use Grav\Common\Processors\TasksProcessor;
use Grav\Common\Processors\ThemesProcessor; use Grav\Common\Processors\ThemesProcessor;
use Grav\Common\Processors\TwigProcessor; use Grav\Common\Processors\TwigProcessor;
use Grav\Common\Scheduler\Scheduler;
use Grav\Common\Twig\Twig;
use Grav\Framework\DI\Container; use Grav\Framework\DI\Container;
use Grav\Framework\Psr7\Response; use Grav\Framework\Psr7\Response;
use Grav\Framework\RequestHandler\RequestHandler; use Grav\Framework\RequestHandler\RequestHandler;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use RocketTheme\Toolbox\Event\Event; use RocketTheme\Toolbox\Event\Event;
use RocketTheme\Toolbox\Event\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcher;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
/** /**
* Grav container is the heart of Grav. * Grav container is the heart of Grav.
@@ -70,16 +74,16 @@ class Grav extends Container
'Grav\Common\Service\SessionServiceProvider', 'Grav\Common\Service\SessionServiceProvider',
'Grav\Common\Service\StreamsServiceProvider', 'Grav\Common\Service\StreamsServiceProvider',
'Grav\Common\Service\TaskServiceProvider', 'Grav\Common\Service\TaskServiceProvider',
'browser' => 'Grav\Common\Browser', 'browser' => Browser::class,
'cache' => 'Grav\Common\Cache', 'cache' => Cache::class,
'events' => 'RocketTheme\Toolbox\Event\EventDispatcher', 'events' => EventDispatcher::class,
'exif' => 'Grav\Common\Helpers\Exif', 'exif' => Exif::class,
'plugins' => 'Grav\Common\Plugins', 'plugins' => Plugins::class,
'scheduler' => 'Grav\Common\Scheduler\Scheduler', 'scheduler' => Scheduler::class,
'taxonomy' => 'Grav\Common\Taxonomy', 'taxonomy' => Taxonomy::class,
'themes' => 'Grav\Common\Themes', 'themes' => Themes::class,
'twig' => 'Grav\Common\Twig\Twig', 'twig' => Twig::class,
'uri' => 'Grav\Common\Uri', 'uri' => Uri::class,
]; ];
/** /**
@@ -407,14 +411,19 @@ class Grav extends Container
*/ */
public function fireEvent($eventName, Event $event = null) public function fireEvent($eventName, Event $event = null)
{ {
/** @var EventDispatcher $events */ /** @var EventDispatcherInterface $events */
$events = $this['events']; $events = $this['events'];
if (null === $event) {
$event = new Event();
}
/** @var Debugger $debugger */ /** @var Debugger $debugger */
$debugger = $this['debugger']; $debugger = $this['debugger'];
$debugger->addEvent($eventName, $event, $events); $debugger->addEvent($eventName, $event, $events);
return $events->dispatch($eventName, $event); $events->dispatch($event, $eventName);
return $event;
} }
/** /**

1
system/src/Grav/Common/Page/Flex/PageIndex.php
View File

@@ -16,6 +16,7 @@ use Grav\Common\Grav;
use Grav\Common\Page\Interfaces\PageInterface; use Grav\Common\Page\Interfaces\PageInterface;
use Grav\Common\Utils; use Grav\Common\Utils;
use Grav\Framework\Flex\FlexDirectory; use Grav\Framework\Flex\FlexDirectory;
use Grav\Framework\Flex\Interfaces\FlexCollectionInterface;
use Grav\Framework\Flex\Interfaces\FlexObjectInterface; use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
use Grav\Framework\Flex\Interfaces\FlexStorageInterface; use Grav\Framework\Flex\Interfaces\FlexStorageInterface;
use Grav\Framework\Flex\Pages\FlexPageIndex; use Grav\Framework\Flex\Pages\FlexPageIndex;

2
system/src/Grav/Common/Page/Pages.php
View File

@@ -28,8 +28,8 @@ use Grav\Framework\Flex\Interfaces\FlexTranslateInterface;
use Grav\Framework\Flex\Pages\FlexPageObject; use Grav\Framework\Flex\Pages\FlexPageObject;
use Grav\Plugin\Admin; use Grav\Plugin\Admin;
use RocketTheme\Toolbox\Event\Event; use RocketTheme\Toolbox\Event\Event;
use RocketTheme\Toolbox\Event\EventDispatcher;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator; use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
use Symfony\Component\EventDispatcher\EventDispatcher;
use Whoops\Exception\ErrorException; use Whoops\Exception\ErrorException;
use Collator; use Collator;

2
system/src/Grav/Common/Plugin.php
View File

@@ -13,9 +13,9 @@ use Grav\Common\Data\Blueprint;
use Grav\Common\Data\Data; use Grav\Common\Data\Data;
use Grav\Common\Page\Interfaces\PageInterface; use Grav\Common\Page\Interfaces\PageInterface;
use Grav\Common\Config\Config; use Grav\Common\Config\Config;
use RocketTheme\Toolbox\Event\EventDispatcher;
use RocketTheme\Toolbox\Event\EventSubscriberInterface; use RocketTheme\Toolbox\Event\EventSubscriberInterface;
use RocketTheme\Toolbox\File\YamlFile; use RocketTheme\Toolbox\File\YamlFile;
use Symfony\Component\EventDispatcher\EventDispatcher;
class Plugin implements EventSubscriberInterface, \ArrayAccess class Plugin implements EventSubscriberInterface, \ArrayAccess
{ {

2
system/src/Grav/Common/Plugins.php
View File

@@ -13,8 +13,8 @@ use Grav\Common\Config\Config;
use Grav\Common\Data\Blueprints; use Grav\Common\Data\Blueprints;
use Grav\Common\Data\Data; use Grav\Common\Data\Data;
use Grav\Common\File\CompiledYamlFile; use Grav\Common\File\CompiledYamlFile;
use RocketTheme\Toolbox\Event\EventDispatcher;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator; use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
use Symfony\Component\EventDispatcher\EventDispatcher;
class Plugins extends Iterator class Plugins extends Iterator
{ {

2
system/src/Grav/Common/Service/AccountsServiceProvider.php
View File

@@ -19,7 +19,7 @@ use Grav\Framework\Flex\FlexDirectory;
use Pimple\Container; use Pimple\Container;
use Pimple\ServiceProviderInterface; use Pimple\ServiceProviderInterface;
use RocketTheme\Toolbox\Event\Event; use RocketTheme\Toolbox\Event\Event;
use RocketTheme\Toolbox\Event\EventDispatcher; use Symfony\Component\EventDispatcher\EventDispatcher;
class AccountsServiceProvider implements ServiceProviderInterface class AccountsServiceProvider implements ServiceProviderInterface
{ {

2
system/src/Grav/Common/Themes.php
View File

@@ -14,9 +14,9 @@ use Grav\Common\File\CompiledYamlFile;
use Grav\Common\Data\Blueprints; use Grav\Common\Data\Blueprints;
use Grav\Common\Data\Data; use Grav\Common\Data\Data;
use Grav\Framework\Psr7\Response; use Grav\Framework\Psr7\Response;
use RocketTheme\Toolbox\Event\EventDispatcher;
use RocketTheme\Toolbox\Event\EventSubscriberInterface; use RocketTheme\Toolbox\Event\EventSubscriberInterface;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator; use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
use Symfony\Component\EventDispatcher\EventDispatcher;
class Themes extends Iterator class Themes extends Iterator
{ {