diff --git a/src/Controller/EventController.php b/src/Controller/EventController.php index 80fd2af7..5a0b871d 100644 --- a/src/Controller/EventController.php +++ b/src/Controller/EventController.php @@ -1,7 +1,7 @@ content .= $content; + return $this; } } diff --git a/src/EventSubscriber/ThemeOptionsSubscriber.php b/src/EventSubscriber/ThemeOptionsSubscriber.php index 4e22bfd2..24375726 100644 --- a/src/EventSubscriber/ThemeOptionsSubscriber.php +++ b/src/EventSubscriber/ThemeOptionsSubscriber.php @@ -66,7 +66,6 @@ class ThemeOptionsSubscriber implements EventSubscriberInterface $skin = ''; foreach ($user->getPreferences() as $ref) { - $name = $ref->getName(); switch ($name) { case UserPreference::SKIN: diff --git a/src/Kernel.php b/src/Kernel.php index 6dde12cc..290c300d 100644 --- a/src/Kernel.php +++ b/src/Kernel.php @@ -88,7 +88,7 @@ class Kernel extends BaseKernel continue; } - yield new $pluginClass; + yield new $pluginClass(); } } @@ -135,7 +135,7 @@ class Kernel extends BaseKernel // load plugin routes $pluginsDir = $this->getProjectDir() . '/var/plugins'; - $routes->import($pluginsDir . '/*Bundle/Resources/config/routes'. self::CONFIG_EXTS, '/', 'glob'); + $routes->import($pluginsDir . '/*Bundle/Resources/config/routes' . self::CONFIG_EXTS, '/', 'glob'); } protected function configureFosUserRoutes(RouteCollectionBuilder $routes) diff --git a/src/Migrations/Version20190219200020.php b/src/Migrations/Version20190219200020.php index 8724561f..4279a54e 100644 --- a/src/Migrations/Version20190219200020.php +++ b/src/Migrations/Version20190219200020.php @@ -29,9 +29,9 @@ final class Version20190219200020 extends AbstractMigration $userPrefs = $this->getTableName('user_preferences'); - $this->addSql('DELETE FROM ' . $userPrefs. ' WHERE name = "theme.fixed_layout"'); - $this->addSql('DELETE FROM ' . $userPrefs. ' WHERE name = "theme.boxed_layout"'); - $this->addSql('DELETE FROM ' . $userPrefs. ' WHERE name = "theme.mini_sidebar"'); + $this->addSql('DELETE FROM ' . $userPrefs . ' WHERE name = "theme.fixed_layout"'); + $this->addSql('DELETE FROM ' . $userPrefs . ' WHERE name = "theme.boxed_layout"'); + $this->addSql('DELETE FROM ' . $userPrefs . ' WHERE name = "theme.mini_sidebar"'); } public function down(Schema $schema): void diff --git a/templates/macros/datatables.html.twig b/templates/macros/datatables.html.twig index 17f364ba..82511ad1 100644 --- a/templates/macros/datatables.html.twig +++ b/templates/macros/datatables.html.twig @@ -4,8 +4,8 @@