From 529996fe0fb46202cc054cfc89a653e9ea9a7902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81ngel=20Guzm=C3=A1n=20Maeso?= Date: Sun, 17 Sep 2017 06:39:19 +0200 Subject: [PATCH] Apply PSR2 no_extra_consecutive_blank_lines php cs fixer --- Command/BuildAssetsCommand.php | 9 --------- Command/CompactVendorCommand.php | 13 ------------- Command/FetchVendorCommand.php | 3 --- Command/InitializeCommand.php | 5 ----- Controller/BreadcrumbController.php | 3 --- Controller/ExceptionController.php | 3 --- Controller/NavbarController.php | 5 ----- Controller/SidebarController.php | 4 ---- Controller/WidgetController.php | 3 --- DependencyInjection/AvanzuAdminThemeExtension.php | 4 ---- DependencyInjection/Compiler/TwigPass.php | 1 - Event/MessageListEvent.php | 2 -- Event/SidebarMenuEvent.php | 1 - Event/ThemeEvents.php | 1 - EventListener/ContextListener.php | 2 -- EventListener/DemoKnpMenuListener.php | 2 -- EventListener/NavbarMessageListDemoListener.php | 1 - .../NavbarNotificationListDemoListener.php | 2 -- EventListener/NavbarShowUserDemoListener.php | 1 - EventListener/NavbarTaskListDemoListener.php | 3 --- EventListener/SetupThemeListener.php | 2 -- EventListener/SidebarSetupMenuDemoListener.php | 3 --- Menu/MenuBuilder.php | 2 -- Model/TaskModel.php | 1 - Resources/config/assets.php | 2 -- Theme/ThemeManager.php | 3 --- Twig/AvanzuAdminExtension.php | 1 - Twig/WidgetExtension.php | 1 - Util/DependencyResolver.php | 4 ---- 29 files changed, 87 deletions(-) diff --git a/Command/BuildAssetsCommand.php b/Command/BuildAssetsCommand.php index 4b67f8c5..58d17e1f 100644 --- a/Command/BuildAssetsCommand.php +++ b/Command/BuildAssetsCommand.php @@ -63,7 +63,6 @@ protected function execute(InputInterface $input, OutputInterface $output) $assets = $this->partition($this->resolveAll(include($this->resdir . '/config/assets.php'))); $fs = new Filesystem(); - foreach($assets['scripts'] as $group => $files) { $this->processScript($group, $files, $fs, $input, $output); } @@ -78,7 +77,6 @@ protected function execute(InputInterface $input, OutputInterface $output) foreach($this->findFonts() as $name => $path) { $fs->copy($path, "$fontsdir/$name"); } - } protected function findFonts() @@ -104,7 +102,6 @@ protected function findFonts() */ protected function processScript($name, $files, $fs, $in, $out) { - $dir = $this->builddir . '/scripts/'; $file = $dir . $this->group2file($name, '.js'); @@ -119,7 +116,6 @@ protected function processScript($name, $files, $fs, $in, $out) $command[] = "-o $file"; $command[] = implode(' ', $files); - $proc = new Process(implode(' ', $command)); $out->writeln($proc->getCommandLine()); @@ -158,7 +154,6 @@ protected function processStyle($name, $files, $fs, $in, $out) protected function group2file($name, $extension) { return str_replace('_', '-', preg_replace('!(_js|_css)$!', '', $name)) . $extension; - } protected function endsWith($extension, $file) @@ -175,9 +170,7 @@ protected function resolveAll($assets) { $resolved = array(); - foreach ($assets as $name => $inputs) { - if (!isset($resolved[$name])) { $resolved[$name] = array(); } @@ -248,10 +241,8 @@ protected function resolve($groups, $input) array_push($resolved, $it->getRealPath()); } } - } return $resolved; - } } diff --git a/Command/CompactVendorCommand.php b/Command/CompactVendorCommand.php index 5dd577cc..d662438d 100644 --- a/Command/CompactVendorCommand.php +++ b/Command/CompactVendorCommand.php @@ -32,7 +32,6 @@ protected function configure() { } protected function execute(InputInterface $input, OutputInterface $output) { - $kernel = $this->getContainer()->get('kernel'); /** @var $kernel Kernel */ $helper = $this->getHelperSet()->get('formatter'); @@ -54,7 +53,6 @@ protected function execute(InputInterface $input, OutputInterface $output) { $this->copyFonts($input, $output); $this->copyImages($input, $output); - } protected function getThemePath($type, InputInterface $input, $kernel) { @@ -81,15 +79,12 @@ protected function copyFonts(InputInterface $input, OutputInterface $output) { $output->writeln($helper->formatSection('Executing', $process->getCommandLine(), 'comment')); $process->run(); - $process = new Process(sprintf('cp -R %s/* %s', $vendors, $target)); $output->writeln($helper->formatSection('Executing', $process->getCommandLine(), 'comment')); $process->run(); - } protected function copyImages(InputInterface $input, OutputInterface $output) { - $kernel = $this->getContainer()->get('kernel'); /** @var $kernel Kernel */ $helper = $this->getHelperSet()->get('formatter'); @@ -101,15 +96,12 @@ protected function copyImages(InputInterface $input, OutputInterface $output) { $output->writeln($helper->formatSection('Executing', $process->getCommandLine(), 'comment')); $process->run(); - $process = new Process(sprintf('cp -R %s/* %s', $vendors, $target)); $output->writeln($helper->formatSection('Executing', $process->getCommandLine(), 'comment')); $process->run(); - } protected function compressThemeCss(InputInterface $input, OutputInterface $output) { - $kernel = $this->getContainer()->get('kernel'); /** @var $kernel Kernel */ $helper = $this->getHelperSet()->get('formatter'); @@ -138,7 +130,6 @@ protected function compressThemeCss(InputInterface $input, OutputInterface $outp $output->write($helper->formatSection('Progress', $buffer, 'info')); } }); - } protected function compressThemeJs(InputInterface $input, OutputInterface $output) { @@ -151,7 +142,6 @@ protected function compressThemeJs(InputInterface $input, OutputInterface $outpu $public = dirname(dirname(dirname($vendors))) . '/public'; $script = $public . '/js/theme.min.js'; - $files = array( 'bootstrap.js' ,'jquery.icheck.js' @@ -169,11 +159,9 @@ protected function compressThemeJs(InputInterface $input, OutputInterface $outpu $output->write($helper->formatSection('Progress', $buffer, 'info')); } }); - } protected function compressVendorJs(OutputInterface $output) { - $kernel = $this->getContainer()->get('kernel'); /** @var $kernel Kernel */ $helper = $this->getHelperSet()->get('formatter'); @@ -213,6 +201,5 @@ protected function compressVendorJs(OutputInterface $output) { $output->write($helper->formatSection('Progress', $buffer, 'info')); } }); - } } diff --git a/Command/FetchVendorCommand.php b/Command/FetchVendorCommand.php index ad050930..e543f779 100644 --- a/Command/FetchVendorCommand.php +++ b/Command/FetchVendorCommand.php @@ -32,7 +32,6 @@ protected function configure() protected function execute(InputInterface $input, OutputInterface $output) { - $kernel = $this->getContainer()->get('kernel'); /** @var $kernel Kernel */ $res = $kernel->locateResource('@AvanzuAdminThemeBundle/Resources/bower'); $helper = $this->getHelperSet()->get('formatter'); /** @var $helper FormatterHelper */ @@ -52,8 +51,6 @@ protected function execute(InputInterface $input, OutputInterface $output) } }); - - // no more pulling/cloning directly from master in favor of a bower installation with specific version constraint /* diff --git a/Command/InitializeCommand.php b/Command/InitializeCommand.php index 444d99df..05c2f4ea 100644 --- a/Command/InitializeCommand.php +++ b/Command/InitializeCommand.php @@ -86,7 +86,6 @@ protected function getDirectorySetup(ContainerInterface $dic, InputInterface $in 'self' => $self, 'public' => $input->getOption('web-dir') ]; - } /** @@ -109,7 +108,6 @@ protected function establishLink($originDir, $targetDir, $expectedMethod) } return $method; - } /** @@ -126,7 +124,6 @@ protected function execute(InputInterface $input, OutputInterface $output) $io = new SymfonyStyle($input, $output); $this->filesystem = $fs; - if ($input->getOption('relative')) { $expectedMethod = self::METHOD_RELATIVE_SYMLINK; $io->text('Trying to install theme assets as relative symbolic links.'); @@ -138,11 +135,9 @@ protected function execute(InputInterface $input, OutputInterface $output) $io->text('Installing theme assets as hard copies.'); } - $fs->mkdir($folders->public . '/theme'); foreach (['bootstrap','dist','plugins','documentation', 'starter.html'] as $directory) { - $io->text("installing $directory"); $lnFrom = sprintf('%s/%s', $folders->theme, $directory); diff --git a/Controller/BreadcrumbController.php b/Controller/BreadcrumbController.php index 47039551..f8bfa551 100644 --- a/Controller/BreadcrumbController.php +++ b/Controller/BreadcrumbController.php @@ -33,7 +33,6 @@ class BreadcrumbController extends Controller * */ public function breadcrumbAction(Request $request, $title = '') { - if (!$this->getDispatcher()->hasListeners(ThemeEvents::THEME_BREADCRUMB)) { return new Response(); } @@ -42,7 +41,6 @@ public function breadcrumbAction(Request $request, $title = '') { /** @var $active MenuItemInterface */ $list = array(); if($active) { - $list[] = $active; while(null !== ($item = $active->getActiveChild())) { $list[] = $item; @@ -50,7 +48,6 @@ public function breadcrumbAction(Request $request, $title = '') { } } - return $this->render('AvanzuAdminThemeBundle:Breadcrumb:breadcrumb.html.twig', array( 'active' => $list, 'title' => $title diff --git a/Controller/ExceptionController.php b/Controller/ExceptionController.php index 8f76ab84..c86333fe 100644 --- a/Controller/ExceptionController.php +++ b/Controller/ExceptionController.php @@ -7,7 +7,6 @@ namespace Avanzu\AdminThemeBundle\Controller; use Symfony\Bundle\FrameworkBundle\Templating\TemplateReference; - use Symfony\Component\HttpFoundation\Request; class ExceptionController extends \Symfony\Bundle\TwigBundle\Controller\ExceptionController @@ -22,7 +21,6 @@ class ExceptionController extends \Symfony\Bundle\TwigBundle\Controller\Exceptio */ protected function findTemplate(Request $request, $format, $code, $debug) { - if(strpos($request->getPathInfo(), '/admin') !== 0) { return parent::findTemplate($request, $format, $code, $debug); } @@ -55,6 +53,5 @@ protected function findTemplate(Request $request, $format, $code, $debug) } return parent::findTemplate($request, $format, $code, $debug); - } } diff --git a/Controller/NavbarController.php b/Controller/NavbarController.php index 924a641c..de5039a7 100644 --- a/Controller/NavbarController.php +++ b/Controller/NavbarController.php @@ -27,7 +27,6 @@ protected function getDispatcher() public function notificationsAction($max = 5) { - if (!$this->getDispatcher()->hasListeners(ThemeEvents::THEME_NOTIFICATIONS)) { return new Response(); } @@ -41,7 +40,6 @@ public function notificationsAction($max = 5) 'total' => $listEvent->getTotal() ) ); - } /** @@ -51,7 +49,6 @@ public function notificationsAction($max = 5) */ public function messagesAction($max = 5) { - if (!$this->getDispatcher()->hasListeners(ThemeEvents::THEME_MESSAGES)) { return new Response(); } @@ -74,7 +71,6 @@ public function messagesAction($max = 5) */ public function tasksAction($max = 5) { - if (!$this->getDispatcher()->hasListeners(ThemeEvents::THEME_TASKS)) { return new Response(); } @@ -94,7 +90,6 @@ public function tasksAction($max = 5) */ public function userAction() { - if (!$this->getDispatcher()->hasListeners(ThemeEvents::THEME_NAVBAR_USER)) { return new Response(); } diff --git a/Controller/SidebarController.php b/Controller/SidebarController.php index 2f299f3e..3170171d 100644 --- a/Controller/SidebarController.php +++ b/Controller/SidebarController.php @@ -17,7 +17,6 @@ class SidebarController extends Controller { public function userPanelAction() { - if (!$this->getDispatcher()->hasListeners(ThemeEvents::THEME_SIDEBAR_USER)) { return new Response(); } @@ -41,14 +40,11 @@ protected function getDispatcher() public function searchFormAction() { - - return $this->render('AvanzuAdminThemeBundle:Sidebar:search-form.html.twig', array()); } public function menuAction(Request $request) { - if (!$this->getDispatcher()->hasListeners(ThemeEvents::THEME_SIDEBAR_SETUP_MENU)) { return new Response(); } diff --git a/Controller/WidgetController.php b/Controller/WidgetController.php index b73fb4d1..3998a6ad 100644 --- a/Controller/WidgetController.php +++ b/Controller/WidgetController.php @@ -13,9 +13,6 @@ class WidgetController extends Controller { public function defaultBoxAction() { - - - } public function solidBoxAction() {} diff --git a/DependencyInjection/AvanzuAdminThemeExtension.php b/DependencyInjection/AvanzuAdminThemeExtension.php index 24b94e23..2d45fecd 100644 --- a/DependencyInjection/AvanzuAdminThemeExtension.php +++ b/DependencyInjection/AvanzuAdminThemeExtension.php @@ -27,7 +27,6 @@ public function load(array $configs, ContainerBuilder $container) $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); $loader->load('services.xml'); - } /** @@ -57,7 +56,6 @@ public function prepend(ContainerBuilder $container) $config = $this->processConfiguration(new Configuration(), $configs); if ($config['use_assetic'] && isset($bundles['AsseticBundle'])) { - $assets = include dirname(__FILE__) . '/../Resources/config/assets.php'; $container->prependExtensionConfig( @@ -67,10 +65,8 @@ public function prepend(ContainerBuilder $container) 'bundles' => array( 'AvanzuAdminThemeBundle' ) - ) ); - } } } diff --git a/DependencyInjection/Compiler/TwigPass.php b/DependencyInjection/Compiler/TwigPass.php index 7a1e4b5a..e7a60471 100644 --- a/DependencyInjection/Compiler/TwigPass.php +++ b/DependencyInjection/Compiler/TwigPass.php @@ -49,6 +49,5 @@ public function process(ContainerBuilder $container) new Reference('avanzu_admin_theme.context_helper') ) ); - } } diff --git a/Event/MessageListEvent.php b/Event/MessageListEvent.php index 17a8bafd..1a5a1d18 100644 --- a/Event/MessageListEvent.php +++ b/Event/MessageListEvent.php @@ -66,11 +66,9 @@ public function getMessages() */ public function addMessage(MessageInterface $messageInterface) { - $this->messages[] = $messageInterface; return $this; - } /** diff --git a/Event/SidebarMenuEvent.php b/Event/SidebarMenuEvent.php index 8a6d2809..4b84c69c 100644 --- a/Event/SidebarMenuEvent.php +++ b/Event/SidebarMenuEvent.php @@ -70,7 +70,6 @@ public function getRootItem($id) * @return MenuItemInterface|null */ public function getActive() { - foreach($this->getItems() as $item) { /** @var $item MenuItemInterface */ if($item->isActive()) return $item; } diff --git a/Event/ThemeEvents.php b/Event/ThemeEvents.php index 70f4c5f7..82415d9b 100644 --- a/Event/ThemeEvents.php +++ b/Event/ThemeEvents.php @@ -49,5 +49,4 @@ class ThemeEvents const THEME_SIDEBAR_SETUP_KNP_MENU = 'theme.sidebar_setup_knp_menu'; const THEME_SIDEBAR_ACTIVATE_MENU = 'theme.sidebar_activate_menu'; - } diff --git a/EventListener/ContextListener.php b/EventListener/ContextListener.php index a80629be..27a1d68d 100644 --- a/EventListener/ContextListener.php +++ b/EventListener/ContextListener.php @@ -32,7 +32,6 @@ public function onRequest(GetResponseEvent $event) if(false == ($user = $this->getUser())){ return; } - } public function getUser() @@ -54,6 +53,5 @@ public function getUser() public function onController(FilterControllerEvent $event) { - } } diff --git a/EventListener/DemoKnpMenuListener.php b/EventListener/DemoKnpMenuListener.php index 86f3fc3c..58434e0f 100644 --- a/EventListener/DemoKnpMenuListener.php +++ b/EventListener/DemoKnpMenuListener.php @@ -15,7 +15,6 @@ class DemoKnpMenuListener */ public function onSetupKnpMenu(KnpMenuEvent $event) { - $menu = $event->getMenu(); $factory = $event->getFactory(); $childOptions = $event->getChildOptions(); @@ -32,6 +31,5 @@ public function onSetupKnpMenu(KnpMenuEvent $event) $ui = $menu->addChild('Widgets', $childOptions)->setLabelAttribute('icon', 'fa fa-th'); $ui->addChild('General', ['route' => 'avanzu_admin_ui_gen_demo' , 'labelAttributes' => $labelAttributes]); $ui->addChild('icons', ['route' => 'avanzu_admin_ui_icon_demo', 'labelAttributes' => $labelAttributes]); - } } diff --git a/EventListener/NavbarMessageListDemoListener.php b/EventListener/NavbarMessageListDemoListener.php index 3899663a..b272bb25 100644 --- a/EventListener/NavbarMessageListDemoListener.php +++ b/EventListener/NavbarMessageListDemoListener.php @@ -13,7 +13,6 @@ class NavbarMessageListDemoListener { public function onListMessages(MessageListEvent $event) { - foreach($this->getMessages() as $msg) { $event->addMessage($msg); } diff --git a/EventListener/NavbarNotificationListDemoListener.php b/EventListener/NavbarNotificationListDemoListener.php index 3b307cf5..c7a8b0a7 100644 --- a/EventListener/NavbarNotificationListDemoListener.php +++ b/EventListener/NavbarNotificationListDemoListener.php @@ -12,11 +12,9 @@ class NavbarNotificationListDemoListener { public function onListNotifications(NotificationListEvent $event) { - foreach($this->getNotifications() as $notify){ $event->addNotification($notify); } - } protected function getNotifications() { diff --git a/EventListener/NavbarShowUserDemoListener.php b/EventListener/NavbarShowUserDemoListener.php index 1921d589..a8857b5e 100644 --- a/EventListener/NavbarShowUserDemoListener.php +++ b/EventListener/NavbarShowUserDemoListener.php @@ -12,7 +12,6 @@ class NavbarShowUserDemoListener { public function onShowUser(ShowUserEvent $event) { - $user = new UserModel(); $user->setAvatar('')->setIsOnline(true)->setMemberSince(new \DateTime())->setUsername('Demo User'); diff --git a/EventListener/NavbarTaskListDemoListener.php b/EventListener/NavbarTaskListDemoListener.php index 5328d8a3..fb54f09e 100644 --- a/EventListener/NavbarTaskListDemoListener.php +++ b/EventListener/NavbarTaskListDemoListener.php @@ -13,11 +13,9 @@ class NavbarTaskListDemoListener { public function onListTasks(TaskListEvent $event) { - foreach($this->getTasks() as $task) { $event->addTask($task); } - } protected function getTasks() @@ -27,6 +25,5 @@ protected function getTasks() new TaskModel('make more stuff', 60), new TaskModel('some more tasks to do', 10, TaskModel::COLOR_RED) ); - } } diff --git a/EventListener/SetupThemeListener.php b/EventListener/SetupThemeListener.php index b0bb143a..8fda002c 100644 --- a/EventListener/SetupThemeListener.php +++ b/EventListener/SetupThemeListener.php @@ -28,7 +28,6 @@ public function __construct($manager, $cssBase = null, $lteAdmin = null) } public function onKernelController(FilterControllerEvent $event) { - $css = rtrim($this->cssBase, '/') . '/' . trim($this->lteAdmin, '/'); $mng = $this->manager; @@ -43,6 +42,5 @@ public function onKernelController(FilterControllerEvent $event) { $mng->registerStyle('daterangepicker', $css . '/daterangepicker/daterangepicker.css', array('admin-lte')); $mng->registerStyle('timepicker', $css . '/timepicker/bootstrap-timepicker.css', array('admin-lte')); $mng->registerStyle('wysiwyg', $css . '/bootstrap-wysihtml5/bootstrap3-wysihtml5.css', array('admin-lte')); - } } diff --git a/EventListener/SidebarSetupMenuDemoListener.php b/EventListener/SidebarSetupMenuDemoListener.php index fd12c224..e56b67bd 100644 --- a/EventListener/SidebarSetupMenuDemoListener.php +++ b/EventListener/SidebarSetupMenuDemoListener.php @@ -19,7 +19,6 @@ public function onSetupMenu(SidebarMenuEvent $event) foreach ($this->getMenu($request) as $item) { $event->addItem($item); } - } protected function getMenu(Request $request) @@ -36,11 +35,9 @@ protected function getMenu(Request $request) ->addChild($icons = new MenuItemModel('ui-elements-icons', 'Icons', 'avanzu_admin_ui_icon_demo', $earg)); return $this->activateByRoute($request->get('_route'), $rootItems); - } protected function activateByRoute($route, $items) { - foreach($items as $item) { /** @var $item MenuItemModel */ if($item->hasChildren()) { $this->activateByRoute($route, $item->getChildren()); diff --git a/Menu/MenuBuilder.php b/Menu/MenuBuilder.php index e1fb255d..48c50335 100644 --- a/Menu/MenuBuilder.php +++ b/Menu/MenuBuilder.php @@ -48,7 +48,6 @@ public function __construct( public function createMainMenu(array $options) { - $menu = $this->factory->createItem('root', array( 'childrenAttributes' => array('class' => 'sidebar-menu') )); @@ -64,7 +63,6 @@ public function createMainMenu(array $options) new KnpMenuEvent($menu, $this->factory, $options, $childOptions) ); - return $menu; } } diff --git a/Model/TaskModel.php b/Model/TaskModel.php index a1a01ff9..8f24989c 100644 --- a/Model/TaskModel.php +++ b/Model/TaskModel.php @@ -21,7 +21,6 @@ class TaskModel implements TaskInterface const COLOR_YELLOW = 'yellow'; - /** * @var int */ diff --git a/Resources/config/assets.php b/Resources/config/assets.php index 449d5ca5..55249b87 100644 --- a/Resources/config/assets.php +++ b/Resources/config/assets.php @@ -48,7 +48,6 @@ function () { ), 'admin_lte_css' => array( 'inputs' => array( - $lteCssBase . 'bootstrap/css/bootstrap.min.css', $lteCssBase . 'plugins/bootstrap-slider/slider.css', $lteCssBase . 'plugins/datatables/dataTables.bootstrap.css', @@ -136,7 +135,6 @@ function () { '@admin_lte_morris_css', ) ) - ); } ); diff --git a/Theme/ThemeManager.php b/Theme/ThemeManager.php index f3a09395..b1382539 100644 --- a/Theme/ThemeManager.php +++ b/Theme/ThemeManager.php @@ -38,7 +38,6 @@ public function __construct($container, $resolverClass = null) public function registerScript($id, $src, $deps = array(), $location = "bottom") { - if (!isset($this->javascripts[$id])) { $this->javascripts[$id] = array( 'src' => $src, @@ -46,7 +45,6 @@ public function registerScript($id, $src, $deps = array(), $location = "bottom") 'location' => $location ); } - } public function registerStyle($id, $src, $deps = array()) { @@ -59,7 +57,6 @@ public function registerStyle($id, $src, $deps = array()) { } public function getScripts($location = 'bottom') { - $unsorted = array(); $srcList = array(); diff --git a/Twig/AvanzuAdminExtension.php b/Twig/AvanzuAdminExtension.php index 555db3e6..60127502 100644 --- a/Twig/AvanzuAdminExtension.php +++ b/Twig/AvanzuAdminExtension.php @@ -52,7 +52,6 @@ public function bodyClass($classes = "") if($options['mini_sidebar']) $classList[] = 'sidebar-mini'; return implode(' ', array_filter($classList)); - } public function getName() diff --git a/Twig/WidgetExtension.php b/Twig/WidgetExtension.php index ac6a8ec7..ed4ce1eb 100644 --- a/Twig/WidgetExtension.php +++ b/Twig/WidgetExtension.php @@ -11,7 +11,6 @@ class WidgetExtension extends \Twig_Extension { public function renderWidget() { - } public function getFunctions() diff --git a/Util/DependencyResolver.php b/Util/DependencyResolver.php index 1f8b07ae..2b3f3bd7 100644 --- a/Util/DependencyResolver.php +++ b/Util/DependencyResolver.php @@ -85,7 +85,6 @@ protected function resolve($ids) continue; } } - } /** @@ -150,7 +149,6 @@ protected function failOnCircularDependencies() $ids = array_keys($this->registered); foreach ($ids as $id) { - if (!$this->hasDependencies($id)) { continue; } @@ -168,7 +166,5 @@ protected function failOnCircularDependencies() } } } - - } }