zikula / core

src/lib/Zikula/Bundle/CoreBundle/DependencyInjection/Configuration.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
      */
     public function __construct($debug)
     {
-        $this->debug = (bool) $debug;
+        $this->debug = (bool)$debug;
     }
 
     /**
@@ -56,7 +56,7 @@ 
         ->fixXmlConfig('fallback')
         ->children()
         ->arrayNode('fallbacks')
-        ->beforeNormalization()->ifString()->then(function ($v) {
+        ->beforeNormalization()->ifString()->then(function($v) {
             return [$v];
         })->end()
         ->prototype('scalar')->end()

src/lib/Zikula/Bundle/CoreBundle/Tests/Twig/Node/SwitchNodeTest.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -63,7 +63,7 @@ 
     case 0:
         echo "case 0";
 }
-EOF
+eof
         ];
 
         // #2 switch with two cases, second with break
@@ -89,7 +89,7 @@ 
         echo "case 1";
         break;
 }
-EOF
+eof
         ];
 
         // #3 switch with two cases (second with break) and default
@@ -117,7 +117,7 @@ 
     default:
         echo "default case";
 }
-EOF
+eof
         ];
 
         // #4 switch with two cases (first without body, second with break) and default
@@ -144,7 +144,7 @@ 
     default:
         echo "default case";
 }
-EOF
+eof
         ];
 
         return $tests;

src/lib/Zikula/Bundle/CoreBundle/Tests/Functional/AppKernel.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
         $fs = new Filesystem();
         if (!$fs->isAbsolutePath($config)) {
-            $config = __DIR__.'/config/'.$config;
+            $config = __DIR__ . '/config/' . $config;
         }
 
         if (!file_exists($config)) {

src/lib/Zikula/Bundle/CoreBundle/Tests/Bundle/MetaDataTest.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -118,7 +118,7 @@
         }
     }
 }
-EOF
+eof
         ;
 
         return json_decode($json, true);

src/lib/Zikula/Bundle/CoreBundle/Command/BootstrapBundlesCommand.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             ->setDescription('Loads bundles into persistences')
             ->setHelp(<<<'EOT'
 The <info>scan:bundles</info> command loads bundle table.
-EOT
+eot
             )
             ->setDefinition([
                 new InputArgument('create', InputArgument::OPTIONAL, 'Create schema'),

src/lib/Zikula/Bundle/HookBundle/Tests/Dispatcher/SubscriberBundleTest.php

Indentation +8 added lines, -8 removed lines

@@ -50,7 +50,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -62,7 +62,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -74,7 +74,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -86,7 +86,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -98,7 +98,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -110,7 +110,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -122,7 +122,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -134,7 +134,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 }

src/lib/Zikula/Bundle/HookBundle/Tests/Dispatcher/HookTest.php

Indentation +5 added lines, -5 removed lines

@@ -49,7 +49,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -61,7 +61,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -73,7 +73,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -85,7 +85,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -97,7 +97,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 }

src/lib/Zikula/Bundle/HookBundle/Tests/Dispatcher/ProviderBundleTest.php

Indentation +9 added lines, -9 removed lines

@@ -50,7 +50,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -62,7 +62,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -74,7 +74,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -86,7 +86,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -98,7 +98,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -110,7 +110,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -122,7 +122,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -134,7 +134,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 
@@ -146,7 +146,7 @@ 
     {
         // Remove the following lines when you implement this test.
         $this->markTestIncomplete(
-          'This test has not been implemented yet.'
+            'This test has not been implemented yet.'
         );
     }
 }

src/lib/Zikula/Bundle/HookBundle/Dispatcher/Storage/Doctrine/DoctrineStorage.php

Indentation +69 added lines, -69 removed lines

@@ -72,10 +72,10 @@ 
     public function getSubscriberByEventName($eventName)
     {
         return $this->em->createQueryBuilder()->select('t')
-                 ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
-                 ->where('t.eventname = ?1')
-                 ->getQuery()->setParameter(1, $eventName)
-                 ->getArrayResult();
+                    ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
+                    ->where('t.eventname = ?1')
+                    ->getQuery()->setParameter(1, $eventName)
+                    ->getArrayResult();
     }
 
     public function unregisterSubscriberByArea($areaName)
@@ -88,24 +88,24 @@ 
 
         // delete subscriber entry
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
-                 ->where('t.sareaid = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
+                    ->where('t.sareaid = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         // remove bindings
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->where('t.sareaid = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->where('t.sareaid = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         // clean areas
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity', 't')
-                 ->where('t.id = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity', 't')
+                    ->where('t.id = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         $this->generateRuntimeHandlers();
     }
@@ -164,24 +164,24 @@ 
 
         // delete provider entry
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookProviderEntity', 't')
-                 ->where('t.pareaid = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookProviderEntity', 't')
+                    ->where('t.pareaid = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         // remove bindings
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->where('t.pareaid = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->where('t.pareaid = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         // clean area
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity', 't')
-                 ->where('t.id = ?1')
-                 ->getQuery()->setParameter(1, $areaId)
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity', 't')
+                    ->where('t.id = ?1')
+                    ->getQuery()->setParameter(1, $areaId)
+                    ->execute();
 
         $this->generateRuntimeHandlers();
     }
@@ -239,9 +239,9 @@ 
     {
         // truncate runtime
         $this->em->createQueryBuilder()
-             ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookRuntimeEntity')
-             ->getQuery()
-             ->execute();
+                ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookRuntimeEntity')
+                ->getQuery()
+                ->execute();
 
         foreach ($this->getBindings() as $binding) {
             $this->addRuntimeHandlers($binding['sareaid'], $binding['pareaid']);
@@ -251,9 +251,9 @@ 
     private function addRuntimeHandlers($subscriberAreaId, $providerAreaId)
     {
         $sa = $this->em->find('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity',
-                              $subscriberAreaId);
+                                $subscriberAreaId);
         $pa = $this->em->find('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity',
-                              $providerAreaId);
+                                $providerAreaId);
 
         $subscribers = $this->em->createQueryBuilder()->select('t')
                             ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity', 't')
@@ -267,10 +267,10 @@ 
 
         foreach ($subscribers as $subscriber) {
             $provider = $this->em->createQueryBuilder()->select('t')
-                             ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookProviderEntity', 't')
-                             ->where('t.pareaid = ?1 AND t.hooktype = ?2')
-                             ->getQuery()->setParameters([1 => $providerAreaId, 2 => $subscriber['hooktype']])
-                             ->getArrayResult();
+                                ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookProviderEntity', 't')
+                                ->where('t.pareaid = ?1 AND t.hooktype = ?2')
+                                ->getQuery()->setParameters([1 => $providerAreaId, 2 => $subscriber['hooktype']])
+                                ->getArrayResult();
 
             if ($provider) {
                 $provider = $provider[0];
@@ -298,9 +298,9 @@ 
     {
         $this->runtimeHandlers =
             $this->em->createQueryBuilder()->select('t')
-                 ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookRuntimeEntity', 't')
-                 ->getQuery()
-                 ->getArrayResult();
+                    ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookRuntimeEntity', 't')
+                    ->getQuery()
+                    ->getArrayResult();
 
         return $this->runtimeHandlers;
     }
@@ -308,9 +308,9 @@ 
     public function bindSubscriber($subscriberArea, $providerArea)
     {
         $sa = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $subscriberArea]);
+                    ->findOneBy(['areaname' => $subscriberArea]);
         $pa = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $providerArea]);
+                    ->findOneBy(['areaname' => $providerArea]);
 
         if ($sa->getCategory() != $pa->getCategory()) {
             throw new \LogicException('Cannot bind areas from different categories.');
@@ -334,18 +334,18 @@ 
     public function unbindSubscriber($subscriberArea, $providerArea)
     {
         $sa = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $subscriberArea]);
+                    ->findOneBy(['areaname' => $subscriberArea]);
         $pa = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $providerArea]);
+                    ->findOneBy(['areaname' => $providerArea]);
 
         $subscriberAreaId = $sa->getId();
         $providerAreaId = $pa->getId();
 
         $this->em->createQueryBuilder()
-                 ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->where('t.pareaid = ?1 AND t.sareaid = ?2')
-                 ->getQuery()->setParameters([1 => $providerAreaId, 2 => $subscriberAreaId])
-                 ->execute();
+                    ->delete('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->where('t.pareaid = ?1 AND t.sareaid = ?2')
+                    ->getQuery()->setParameters([1 => $providerAreaId, 2 => $subscriberAreaId])
+                    ->execute();
 
         $this->generateRuntimeHandlers();
     }
@@ -357,16 +357,16 @@ 
         $order->add('t.sortorder', 'ASC');
 
         return $this->em->createQueryBuilder()->select('t')
-                 ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->orderBy($order)
-                 ->getQuery()
-                 ->getArrayResult();
+                    ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->orderBy($order)
+                    ->getQuery()
+                    ->getArrayResult();
     }
 
     public function getBindingsFor($areaName)
     {
         $area = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                     ->findOneBy(['areaname' => $areaName]);
+                        ->findOneBy(['areaname' => $areaName]);
 
         if (!$area) {
             return [];
@@ -382,11 +382,11 @@ 
         $order->add('t.sortorder', 'ASC');
         $order->add('t.sareaid', 'ASC');
         $results = $this->em->createQueryBuilder()->select('t')
-                         ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                         ->where("t.$areaIdField = ?1")
-                         ->orderBy($order)
-                         ->getQuery()->setParameter(1, $area->getId())
-                         ->getArrayResult();
+                            ->from('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                            ->where("t.$areaIdField = ?1")
+                            ->orderBy($order)
+                            ->getQuery()->setParameter(1, $area->getId())
+                            ->getArrayResult();
 
         // this could be an area where related entities would help CAH - 23 Oct 2013
         $areas = [];
@@ -413,18 +413,18 @@ 
         foreach ($providerAreaNames as $name) {
             $providerAreaIds[] =
                 $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                     ->findOneBy(['areaname' => $name])
-                     ->getId();
+                        ->findOneBy(['areaname' => $name])
+                        ->getId();
         }
 
         // sort bindings in order of appearance from $providerAreaIds
         $counter = 1;
         foreach ($providerAreaIds as $id) {
             $this->em->createQueryBuilder()
-                 ->update('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
-                 ->set('t.sortorder', $counter)
-                 ->where('t.sareaid = ?1 AND t.pareaid = ?2')
-                 ->getQuery()->setParameters([1 => $sareaId, 2 => $id])
+                    ->update('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookBindingEntity', 't')
+                    ->set('t.sortorder', $counter)
+                    ->where('t.sareaid = ?1 AND t.pareaid = ?2')
+                    ->getQuery()->setParameters([1 => $sareaId, 2 => $id])
                 ->execute();
             $counter++;
         }
@@ -471,7 +471,7 @@ 
 
         $subscribers =
             $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookSubscriberEntity')
-                 ->findBy(['sareaid' => $sareaId]);
+                    ->findBy(['sareaid' => $sareaId]);
 
         if (!$subscribers) {
             return false;
@@ -482,8 +482,8 @@ 
         foreach ($subscribers as $subscriber) {
             $pareaId =
                 $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                     ->findOneBy(['areaname' => $providerArea])
-                     ->getId();
+                        ->findOneBy(['areaname' => $providerArea])
+                        ->getId();
 
             $hookprovider =
                 $this->em->createQueryBuilder()->select('t')
@@ -494,7 +494,7 @@ 
                         2 => $subscriber->getHooktype(),
                         3 => $subscriber->getCategory()
                     ])
-                     ->getArrayResult();
+                        ->getArrayResult();
 
             if ($hookprovider) {
                 $allow = true;
@@ -542,7 +542,7 @@ 
     public function getAreaId($areaName)
     {
         $hookArea = $this->em->getRepository('Zikula\Bundle\HookBundle\Dispatcher\Storage\Doctrine\Entity\HookAreaEntity')
-                   ->findOneBy(['areaname' => $areaName]);
+                    ->findOneBy(['areaname' => $areaName]);
 
         if (!$hookArea) {
             return false;

Braces +2 added lines, -1 removed lines

@@ -374,7 +374,8 @@
 
         if ($area->getAreatype() == self::PROVIDER) {
             $areaIdField = 'pareaid';
-        } else { // $area->getAreatype() == self::SUBSCRIBER
+        } else {
+// $area->getAreatype() == self::SUBSCRIBER
             $areaIdField = 'sareaid';
         }