zikula / core

src/system/ExtensionsModule/Helper/BundleSyncHelper.php

Braces +45 added lines, -45 removed lines

@@ -36,8 +36,8 @@ 
 /**

  * Helper functions for the extensions bundle

  */

-class BundleSyncHelper

-{

+class BundleSyncHelper
+{
     /**

      * @var ZikulaHttpKernelInterface

      */

@@ -99,7 +99,7 @@ 
         BundlesSchemaHelper $bundlesSchemaHelper,

         ComposerValidationHelper $composerValidationHelper,

         SessionInterface $session

-    ) {

+    ) {
         $this->kernel = $kernel;

         $this->extensionRepository = $extensionRepository;

         $this->extensionVarRepository = $extensionVarRepository;

@@ -120,7 +120,7 @@ 
         // sync the extensions directory and the bundles table

         $this->bundlesSchemaHelper->load();

         $scanner = $this->bundlesSchemaHelper->getScanner();

-        foreach ($scanner->getInvalid() as $invalidName) {

+        foreach ($scanner->getInvalid() as $invalidName) {
             $this->session->getFlashBag()->add(

                 'warning',

                 $this->translator->trans(

@@ -134,8 +134,8 @@ 
         $bundles = [];

         $srcDir = $this->kernel->getProjectDir() . '/src/';

         /** @var MetaData $bundleMetaData */

-        foreach ($extensions as $name => $bundleMetaData) {

-            foreach ($bundleMetaData->getPsr4() as $ns => $path) {

+        foreach ($extensions as $name => $bundleMetaData) {
+            foreach ($bundleMetaData->getPsr4() as $ns => $path) {
                 $this->kernel->getAutoloader()->addPsr4($ns, $srcDir . $path);

             }

 

@@ -148,13 +148,13 @@ 
 

             $finder = new Finder();

             $finder->files()->in($bundle->getPath())->depth(0)->name('composer.json');

-            foreach ($finder as $splFileInfo) {

+            foreach ($finder as $splFileInfo) {
                 // there will only be one loop here

                 $this->composerValidationHelper->check($splFileInfo);

-                if ($this->composerValidationHelper->isValid()) {

+                if ($this->composerValidationHelper->isValid()) {
                     $bundles[$bundle->getName()] = $bundleVersionArray;

                     $bundles[$bundle->getName()]['oldnames'] = $bundleVersionArray['oldnames'] ?? '';

-                } else {

+                } else {
                     $this->session->getFlashBag()->add(

                         'error',

                         $this->translator->trans(

@@ -162,14 +162,14 @@ 
                             ['%extension%' => $bundle->getName()]

                         )

                     );

-                    foreach ($this->composerValidationHelper->getErrors() as $error) {

+                    foreach ($this->composerValidationHelper->getErrors() as $error) {
                         $this->session->getFlashBag()->add('error', $error);

                     }

                 }

             }

         }

 

-        if ($includeCore) {

+        if ($includeCore) {
             $this->appendCoreExtensionsMetaData($bundles);

         }

         $this->validate($bundles);

@@ -179,9 +179,9 @@ 
 

     private function appendCoreExtensionsMetaData(array &$extensions): void

     {

-        foreach (ZikulaKernel::$coreExtension as $systemModule => $bundleClass) {

+        foreach (ZikulaKernel::$coreExtension as $systemModule => $bundleClass) {
             $bundle = $this->kernel->getBundle($systemModule);

-            if ($bundle instanceof AbstractExtension) {

+            if ($bundle instanceof AbstractExtension) {
                 $extensions[$systemModule] = $bundle->getMetaData()->getFilteredVersionInfoArray();

             }

         }

@@ -202,10 +202,10 @@ 
         ];

 

         // check for duplicate name, display name or url

-        foreach ($extensions as $dir => $modInfo) {

-            foreach ($fieldNames as $fieldName) {

+        foreach ($extensions as $dir => $modInfo) {
+            foreach ($fieldNames as $fieldName) {
                 $key = mb_strtolower($modInfo[$fieldName]);

-                if (!empty($moduleValues[$fieldName][$key]) && !empty($modInfo[$fieldName])) {

+                if (!empty($moduleValues[$fieldName][$key]) && !empty($modInfo[$fieldName])) {
                     $message = $this->translator->trans('Fatal error: Two extensions share the same %field%. [%ext1%] and [%ext2%]', [

                         '%field%' => $fieldName,

                         '%ext1%' => $modInfo['name'],

@@ -256,9 +256,9 @@ 
         array &$extensionsFromDB,

         bool $forceDefaults = false

     ): void {

-        foreach ($extensionsFromFile as $name => $extensionFromFile) {

-            foreach ($extensionsFromDB as $dbname => $extensionFromDB) {

-                if (isset($extensionFromDB['name']) && in_array($extensionFromDB['name'], (array)$extensionFromFile['oldnames'], true)) {

+        foreach ($extensionsFromFile as $name => $extensionFromFile) {
+            foreach ($extensionsFromDB as $dbname => $extensionFromDB) {
+                if (isset($extensionFromDB['name']) && in_array($extensionFromDB['name'], (array)$extensionFromFile['oldnames'], true)) {
                     // migrate its modvars

                     $this->extensionVarRepository->updateName($dbname, $name);

                     // rename the extension register

@@ -270,18 +270,18 @@ 
             }

 

             // If extension was previously determined to be incompatible with the core. return to original state

-            if (isset($extensionsFromDB[$name]) && $extensionsFromDB[$name]['state'] > 10) {

+            if (isset($extensionsFromDB[$name]) && $extensionsFromDB[$name]['state'] > 10) {
                 $extensionsFromDB[$name]['state'] -= Constant::INCOMPATIBLE_CORE_SHIFT;

                 $this->extensionStateHelper->updateState($extensionsFromDB[$name]['id'], $extensionsFromDB[$name]['state']);

             }

 

             // update the DB information for this extension to reflect user settings (e.g. url)

-            if (isset($extensionsFromDB[$name]['id'])) {

+            if (isset($extensionsFromDB[$name]['id'])) {
                 $extensionFromFile['id'] = $extensionsFromDB[$name]['id'];

-                if (Constant::STATE_UNINITIALISED !== $extensionsFromDB[$name]['state'] && Constant::STATE_INVALID !== $extensionsFromDB[$name]['state']) {

+                if (Constant::STATE_UNINITIALISED !== $extensionsFromDB[$name]['state'] && Constant::STATE_INVALID !== $extensionsFromDB[$name]['state']) {
                     unset($extensionFromFile['version']);

                 }

-                if (!$forceDefaults) {

+                if (!$forceDefaults) {
                     unset($extensionFromFile['displayname'], $extensionFromFile['description'], $extensionFromFile['url']);

                 }

 

@@ -290,7 +290,7 @@ 
                 /** @var ExtensionEntity $extension */

                 $extension = $this->extensionRepository->find($extensionFromFile['id']);

                 $extension->merge($extensionFromFile);

-                if (empty($extension->getIcon())) {

+                if (empty($extension->getIcon())) {
                     $extension->setIcon($extensionFromFile['capabilities']['admin']['icon']);

                 }

                 $this->extensionRepository->persistAndFlush($extension);

@@ -298,13 +298,13 @@ 
 

             // check extension core requirement is compatible with current core

             $coreCompatibility = $extensionFromFile['coreCompatibility'];

-            if (isset($extensionsFromDB[$name])) {

-                if (!Semver::satisfies(ZikulaKernel::VERSION, $coreCompatibility)) {

+            if (isset($extensionsFromDB[$name])) {
+                if (!Semver::satisfies(ZikulaKernel::VERSION, $coreCompatibility)) {
                     // extension is incompatible with current core

                     $extensionsFromDB[$name]['state'] += Constant::INCOMPATIBLE_CORE_SHIFT;

                     $this->extensionStateHelper->updateState($extensionsFromDB[$name]['id'], $extensionsFromDB[$name]['state']);

                 }

-                if (isset($extensionsFromDB[$name]['state'])) {

+                if (isset($extensionsFromDB[$name]['state'])) {
                     $extensionFromFile['state'] = $extensionsFromDB[$name]['state'];

                 }

             }

@@ -316,26 +316,26 @@ 
      */

     private function syncLostExtensions(array $extensionsFromFile, array &$extensionsFromDB): void

     {

-        foreach ($extensionsFromDB as $extensionName => $unusedVariable) {

-            if ($this->kernel::isCoreExtension($extensionName) || array_key_exists($extensionName, $extensionsFromFile)) {

+        foreach ($extensionsFromDB as $extensionName => $unusedVariable) {
+            if ($this->kernel::isCoreExtension($extensionName) || array_key_exists($extensionName, $extensionsFromFile)) {
                 continue;

             }

 

             $lostExtension = $this->extensionRepository->get($extensionName); // must obtain Entity because value from $extensionsFromDB is only an array

-            if (!$lostExtension) {

+            if (!$lostExtension) {
                 throw new RuntimeException($this->translator->trans('Error! Could not load data for %extension%.', ['%extension%' => $extensionName]));

             }

             $lostExtensionState = $lostExtension->getState();

             if ((Constant::STATE_INVALID === $lostExtensionState)

-                || ($lostExtensionState === Constant::STATE_INVALID + Constant::INCOMPATIBLE_CORE_SHIFT)) {

+                || ($lostExtensionState === Constant::STATE_INVALID + Constant::INCOMPATIBLE_CORE_SHIFT)) {
                 // extension was invalid and subsequently removed from file system,

                 // or extension was incompatible with core and subsequently removed, delete it

                 $this->extensionRepository->removeAndFlush($lostExtension);

             } elseif ((Constant::STATE_UNINITIALISED === $lostExtensionState)

-                || ($lostExtensionState === Constant::STATE_UNINITIALISED + Constant::INCOMPATIBLE_CORE_SHIFT)) {

+                || ($lostExtensionState === Constant::STATE_UNINITIALISED + Constant::INCOMPATIBLE_CORE_SHIFT)) {
                 // extension was uninitialised and subsequently removed from file system, delete it

                 $this->extensionRepository->removeAndFlush($lostExtension);

-            } else {

+            } else {
                 // Set state of extension to 'missing'

                 // This state cannot be reached in with an ACTIVE bundle. - ACTIVE bundles are part of the pre-compiled Kernel.

                 // extensions that are inactive can be marked as missing.

@@ -357,13 +357,13 @@ 
     {

         $upgradedExtensions = [];

 

-        foreach ($extensionsFromFile as $name => $extensionFromFile) {

-            if (empty($extensionsFromDB[$name])) {

+        foreach ($extensionsFromFile as $name => $extensionFromFile) {
+            if (empty($extensionsFromDB[$name])) {
                 $extensionFromFile['state'] = Constant::STATE_UNINITIALISED;

-                if (!$extensionFromFile['version']) {

+                if (!$extensionFromFile['version']) {
                     // set state to invalid if we can't determine a version

                     $extensionFromFile['state'] = Constant::STATE_INVALID;

-                } else {

+                } else {
                     $coreCompatibility = $extensionFromFile['coreCompatibility'];

                     // shift state if extension is incompatible with core version

                     $extensionFromFile['state'] = Semver::satisfies(ZikulaKernel::VERSION, $coreCompatibility)

@@ -377,33 +377,33 @@ 
                 // insert new extension to db

                 $newExtension = new ExtensionEntity();

                 $newExtension->merge($extensionFromFile);

-                if (empty($newExtension->getIcon())) {

+                if (empty($newExtension->getIcon())) {
                     $newExtension->setIcon($extensionFromFile['capabilities']['admin']['icon']);

                 }

                 $vetoEvent = new GenericEvent($newExtension);

                 $this->dispatcher->dispatch($vetoEvent, ExtensionEvents::INSERT_VETO);

-                if (!$vetoEvent->isPropagationStopped()) {

+                if (!$vetoEvent->isPropagationStopped()) {
                     $this->extensionRepository->persistAndFlush($newExtension);

                 }

-            } else {

+            } else {
                 // extension is in the db already

                 if ((Constant::STATE_MISSING === $extensionsFromDB[$name]['state'])

-                    || ($extensionsFromDB[$name]['state'] === Constant::STATE_MISSING + Constant::INCOMPATIBLE_CORE_SHIFT)) {

+                    || ($extensionsFromDB[$name]['state'] === Constant::STATE_MISSING + Constant::INCOMPATIBLE_CORE_SHIFT)) {
                     // extension was lost, now it is here again

                     $this->extensionStateHelper->updateState($extensionsFromDB[$name]['id'], Constant::STATE_INACTIVE);

                 } elseif (((Constant::STATE_INVALID === $extensionsFromDB[$name]['state'])

                         || ($extensionsFromDB[$name]['state'] === Constant::STATE_INVALID + Constant::INCOMPATIBLE_CORE_SHIFT))

-                    && $extensionFromFile['version']) {

+                    && $extensionFromFile['version']) {
                     $coreCompatibility = $extensionFromFile['coreCompatibility'];

-                    if (Semver::satisfies(ZikulaKernel::VERSION, $coreCompatibility)) {

+                    if (Semver::satisfies(ZikulaKernel::VERSION, $coreCompatibility)) {
                         // extension was invalid, now it is valid

                         $this->extensionStateHelper->updateState($extensionsFromDB[$name]['id'], Constant::STATE_UNINITIALISED);

                     }

                 }

 

-                if ($extensionsFromDB[$name]['version'] !== $extensionFromFile['version']) {

+                if ($extensionsFromDB[$name]['version'] !== $extensionFromFile['version']) {
                     if (Constant::STATE_UNINITIALISED !== $extensionsFromDB[$name]['state'] &&

-                        Constant::STATE_INVALID !== $extensionsFromDB[$name]['state']) {

+                        Constant::STATE_INVALID !== $extensionsFromDB[$name]['state']) {
                         $this->extensionStateHelper->updateState($extensionsFromDB[$name]['id'], Constant::STATE_UPGRADED);

                         $upgradedExtensions[$name] = $extensionFromFile['version'];

                     }

src/system/ExtensionsModule/Helper/ComposerValidationHelper.php

Braces +8 added lines, -8 removed lines

@@ -20,8 +20,8 @@ 
 use Symfony\Contracts\Translation\TranslatorInterface;

 use Zikula\Bundle\CoreBundle\HttpKernel\ZikulaHttpKernelInterface;

 

-class ComposerValidationHelper

-{

+class ComposerValidationHelper
+{
     /**

      * @var ZikulaHttpKernelInterface

      */

@@ -75,8 +75,8 @@ 
      */

     private $errors = [];

 

-    public function __construct(ZikulaHttpKernelInterface $kernel, TranslatorInterface $translator)

-    {

+    public function __construct(ZikulaHttpKernelInterface $kernel, TranslatorInterface $translator)
+    {
         $this->kernel = $kernel;

         $this->translator = $translator;

     }

@@ -98,7 +98,7 @@ 
         $this->filePath = $file->getRelativePath();

         $this->rawContent = $file->getContents();

 

-        if ($this->decodeContent()) {

+        if ($this->decodeContent()) {
             $this->validateAgainstSchema();

         }

     }

@@ -109,7 +109,7 @@ 
     private function decodeContent(): bool

     {

         $this->content = json_decode($this->rawContent); // returns null on failure

-        if (empty($this->content)) {

+        if (empty($this->content)) {
             $error = $this->jsonErrorCodes[json_last_error()];

             $this->errors[] = $this->translator->trans('Unable to decode composer file of %component% (%filePath%): %error%. Ensure the composer.json file has a valid syntax.', [

                 '%component%' => $this->bundleName,

@@ -138,8 +138,8 @@ 
         $validator = new Validator();

         $validator->check($this->content, $schemaFile);

 

-        if (!$validator->isValid()) {

-            foreach ($validator->getErrors() as $errorDetails) {

+        if (!$validator->isValid()) {
+            foreach ($validator->getErrors() as $errorDetails) {
                 $this->errors[] = $this->translator->trans('Error found in composer file of %component% (%filePath%) in property "%property%": %error%.', [

                     '%component%' => $this->bundleName,

                     '%filePath%' => $this->filePath,

src/system/ExtensionsModule/Helper/ExtensionHelper.php

Braces +25 added lines, -25 removed lines

@@ -37,8 +37,8 @@ 
 use Zikula\ExtensionsModule\ExtensionEvents;

 use Zikula\ExtensionsModule\Installer\ExtensionInstallerInterface;

 

-class ExtensionHelper

-{

+class ExtensionHelper
+{
     /**

      * @var ContainerInterface

      */

@@ -82,7 +82,7 @@ 
         ExtensionStateHelper $stateHelper,

         CacheClearer $cacheClearer,

         EventDispatcherInterface $eventDispatcher

-    ) {

+    ) {
         $this->container = $container;

         $this->translator = $translator;

         $this->variableApi = $variableApi;

@@ -97,10 +97,10 @@ 
      */

     public function install(ExtensionEntity $extension): bool

     {

-        if (Constant::STATE_NOTALLOWED === $extension->getState()) {

+        if (Constant::STATE_NOTALLOWED === $extension->getState()) {
             throw new RuntimeException($this->translator->trans('Error! Not allowed to install %extension%.', ['%extension%' => $extension->getName()]));

         }

-        if (10 < $extension->getState()) {

+        if (10 < $extension->getState()) {
             throw new RuntimeException($this->translator->trans('Error! %extension% is not compatible with this version of Zikula.', ['%extension%' => $extension->getName()]));

         }

 

@@ -108,9 +108,9 @@ 
         $extensionBundle = $this->container->get('kernel')->getBundle($extension->getName());

 

         $installer = $this->getExtensionInstallerInstance($extensionBundle);

-        if (null !== $installer) {

+        if (null !== $installer) {
             $result = $installer->install();

-            if (!$result) {

+            if (!$result) {
                 return false;

             }

         }

@@ -129,10 +129,10 @@ 
      */

     public function upgrade(ExtensionEntity $extension): bool

     {

-        if (Constant::STATE_NOTALLOWED === $extension->getState()) {

+        if (Constant::STATE_NOTALLOWED === $extension->getState()) {
             throw new RuntimeException($this->translator->trans('Error! Not allowed to upgrade %extension%.', ['%extension%' => $extension->getDisplayname()]));

         }

-        if (10 < $extension->getState()) {

+        if (10 < $extension->getState()) {
             throw new RuntimeException($this->translator->trans('Error! %extension% is not compatible with this version of Zikula.', ['%extension%' => $extension->getDisplayname()]));

         }

 

@@ -142,10 +142,10 @@ 
         // Check status of Dependencies here to be sure they are met for upgraded extension. #3647

 

         $installer = $this->getExtensionInstallerInstance($extensionBundle);

-        if (null !== $installer) {

+        if (null !== $installer) {
             $result = $installer->upgrade($extension->getVersion());

-            if (is_string($result)) {

-                if ($result !== $extension->getVersion()) {

+            if (is_string($result)) {
+                if ($result !== $extension->getVersion()) {
                     // persist the last successful updated version

                     $extension->setVersion($result);

                     $this->container->get('doctrine')->getManager()->flush();

@@ -153,7 +153,7 @@ 
 

                 return false;

             }

-            if (true !== $result) {

+            if (true !== $result) {
                 return false;

             }

         }

@@ -166,7 +166,7 @@ 
         $this->stateHelper->updateState($extension->getId(), Constant::STATE_ACTIVE);

         $this->cacheClearer->clear('symfony');

 

-        if ($this->container->getParameter('installed')) {

+        if ($this->container->getParameter('installed')) {
             // Upgrade succeeded, issue event.

             $event = new ExtensionStateEvent($extensionBundle, $extension->toArray());

             $this->eventDispatcher->dispatch($event, ExtensionEvents::EXTENSION_UPGRADE);

@@ -181,17 +181,17 @@ 
     public function uninstall(ExtensionEntity $extension): bool

     {

         if (Constant::STATE_NOTALLOWED === $extension->getState()

-            || ZikulaKernel::isCoreExtension($extension->getName())) {

+            || ZikulaKernel::isCoreExtension($extension->getName())) {
             throw new RuntimeException($this->translator->trans('Error! No permission to uninstall %extension%.', ['%extension%' => $extension->getDisplayname()]));

         }

-        if (Constant::STATE_UNINITIALISED === $extension->getState()) {

+        if (Constant::STATE_UNINITIALISED === $extension->getState()) {
             throw new RuntimeException($this->translator->trans('Error! %extension% is not yet installed, therefore it cannot be uninstalled.', ['%extension%' => $extension->getDisplayname()]));

         }

 

         // allow event to prevent extension removal

         $vetoEvent = new GenericEvent($extension);

         $this->eventDispatcher->dispatch($vetoEvent, ExtensionEvents::REMOVE_VETO);

-        if ($vetoEvent->isPropagationStopped()) {

+        if ($vetoEvent->isPropagationStopped()) {
             return false;

         }

 

@@ -199,9 +199,9 @@ 
         $extensionBundle = $this->container->get('kernel')->getBundle($extension->getName());

 

         $installer = $this->getExtensionInstallerInstance($extensionBundle);

-        if (null !== $installer) {

+        if (null !== $installer) {
             $result = $installer->uninstall();

-            if (!$result) {

+            if (!$result) {
                 return false;

             }

         }

@@ -227,12 +227,12 @@ 
      */

     public function uninstallArray(array $extensions): bool

     {

-        foreach ($extensions as $extension) {

-            if (!$extension instanceof ExtensionEntity) {

+        foreach ($extensions as $extension) {
+            if (!$extension instanceof ExtensionEntity) {
                 throw new InvalidArgumentException();

             }

             $result = $this->uninstall($extension);

-            if (!$result) {

+            if (!$result) {
                 return false;

             }

         }

@@ -266,17 +266,17 @@ 
     private function getExtensionInstallerInstance(AbstractExtension $extension): ?ExtensionInstallerInterface

     {

         $className = $extension->getInstallerClass();

-        if (!class_exists($className)) {

+        if (!class_exists($className)) {
             return null;

         }

         $reflectionInstaller = new ReflectionClass($className);

-        if (!$reflectionInstaller->isSubclassOf(ExtensionInstallerInterface::class)) {

+        if (!$reflectionInstaller->isSubclassOf(ExtensionInstallerInterface::class)) {
             throw new RuntimeException($this->translator->trans('%extension% must implement ExtensionInstallerInterface', ['%extension%' => $className]));

         }

         /** @var ExtensionInstallerInterface $installer */

         $installer = $reflectionInstaller->newInstance();

         $installer->setExtension($extension);

-        if ($installer instanceof ContainerAwareInterface) {

+        if ($installer instanceof ContainerAwareInterface) {
             $installer->setContainer($this->container);

         }

 

src/system/PrinterTheme/ZikulaPrinterTheme.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
     {

         $text = preg_replace_callback(

             '/<a [^>]*href\s*=\s*\"?([^>\"]*)\"?[^>]*>(.*?)<\/a.*?>/i',

-            function ($matches) {

+            function($matches) {

                 $this->links[] = html_entity_decode($matches[1]);

                 // return the replaced link

                 return '<strong><em>' . $matches[2] . '</em></strong> <small>[' . count($this->links) . ']</small>';

Braces +6 added lines, -6 removed lines

@@ -17,8 +17,8 @@ 
 use Twig\Environment;

 use Zikula\ExtensionsModule\AbstractCoreTheme;

 

-class ZikulaPrinterTheme extends AbstractCoreTheme

-{

+class ZikulaPrinterTheme extends AbstractCoreTheme
+{
     private $links = [];

 

     /**

@@ -63,19 +63,19 @@ 
     {

         $translator = $this->getContainer()->get('translator');

         $text = '';

-        if (empty($this->links)) {

+        if (empty($this->links)) {
             return $text;

         }

 

         $text .= '<div><strong>' . $translator->trans('Links') . '</strong>';

         $text .= '<ol>';

         $this->links = array_unique($this->links);

-        foreach ($this->links as $key => $link) {

+        foreach ($this->links as $key => $link) {
             // check for an e-mail address

-            if (preg_match("/^([a-z0-9_]|\\-|\\.)+@(([a-z0-9_]|\\-)+\\.)+[a-z]{2,4}$/i", $link)) {

+            if (preg_match("/^([a-z0-9_]|\\-|\\.)+@(([a-z0-9_]|\\-)+\\.)+[a-z]{2,4}$/i", $link)) {
                 $linkText = $link;

                 $link = 'mailto:' . $link;

-            } else {

+            } else {
                 $linkText = $link;

             }

             $linkText = htmlspecialchars($linkText, ENT_QUOTES);

src/system/BootstrapTheme/ZikulaBootstrapTheme.php

Braces +2 added lines, -2 removed lines

@@ -15,6 +15,6 @@
 

 use Zikula\ExtensionsModule\AbstractCoreTheme;

 

-class ZikulaBootstrapTheme extends AbstractCoreTheme

-{

+class ZikulaBootstrapTheme extends AbstractCoreTheme
+{
 }

src/Zikula/CoreInstallerBundle/Helper/BlockHelper.php

Braces +3 added lines, -3 removed lines

@@ -23,8 +23,8 @@ 
 use Zikula\ExtensionsModule\Entity\ExtensionEntity;

 use Zikula\MenuModule\Block\MenuBlock;

 

-class BlockHelper

-{

+class BlockHelper
+{
     /**

      * @var EntityManagerInterface

      */

@@ -44,7 +44,7 @@ 
         EntityManagerInterface $entityManager,

         TranslatorInterface $translator,

         ContainerInterface $container

-    ) {

+    ) {
         $this->entityManager = $entityManager;

         $this->translator = $translator;

         $this->container = $container;

src/Zikula/CoreBundle/Controller/AbstractController.php

Braces +4 added lines, -4 removed lines

@@ -27,8 +27,8 @@ 
 use Zikula\ExtensionsModule\ExtensionVariablesTrait;

 use Zikula\PermissionsModule\Api\ApiInterface\PermissionApiInterface;

 

-abstract class AbstractController extends BaseController

-{

+abstract class AbstractController extends BaseController
+{
     use TranslatorTrait;

     use ExtensionVariablesTrait;

 

@@ -55,7 +55,7 @@ 
         PermissionApiInterface $permissionApi,

         VariableApiInterface $variableApi,

         TranslatorInterface $translator

-    ) {

+    ) {
         $this->extension = $extension;

         $this->name = $extension->getName();

         $this->permissionApi = $permissionApi;

@@ -72,7 +72,7 @@ 
     {

         // load optional bootstrap

         $bootstrap = $extension->getPath() . '/bootstrap.php';

-        if (file_exists($bootstrap)) {

+        if (file_exists($bootstrap)) {
             include_once $bootstrap;

         }

     }

src/Zikula/CoreBundle/HttpKernel/ZikulaKernel.php

Braces +21 added lines, -21 removed lines

@@ -54,8 +54,8 @@ 
 define('ACCESS_DELETE', 700);

 define('ACCESS_ADMIN', 800);

 

-abstract class ZikulaKernel extends Kernel implements ZikulaHttpKernelInterface

-{

+abstract class ZikulaKernel extends Kernel implements ZikulaHttpKernelInterface
+{
     public const VERSION = '3.0.0';

 

     public const PHP_MINIMUM_VERSION = '7.2.5';

@@ -113,18 +113,18 @@ 
      */

     private $autoloader;

 

-    public function boot()

-    {

-        if (null === $this->autoloader) {

+    public function boot()
+    {
+        if (null === $this->autoloader) {
             $this->getAutoloader();

         }

 

         parent::boot();

 

-        foreach ($this->bundles as $name => $bundle) {

-            if ($bundle instanceof AbstractModule && !isset($this->modules[$name])) {

+        foreach ($this->bundles as $name => $bundle) {
+            if ($bundle instanceof AbstractModule && !isset($this->modules[$name])) {
                 $this->modules[$name] = $bundle;

-            } elseif ($bundle instanceof AbstractTheme && !isset($this->themes[$name])) {

+            } elseif ($bundle instanceof AbstractTheme && !isset($this->themes[$name])) {
                 $this->themes[$name] = $bundle;

             }

         }

@@ -132,7 +132,7 @@ 
 

     public function getModule(string $moduleName): AbstractModule

     {

-        if (!isset($this->modules[$moduleName])) {

+        if (!isset($this->modules[$moduleName])) {
             throw new InvalidArgumentException(sprintf('Module "%s" does not exist or it is not enabled.', $moduleName));

         }

 

@@ -151,7 +151,7 @@ 
 

     public function getTheme(string $themeName): AbstractTheme

     {

-        if (!isset($this->themes[$themeName])) {

+        if (!isset($this->themes[$themeName])) {
             throw new InvalidArgumentException(sprintf('Theme "%s" does not exist or it is not enabled.', $themeName));

         }

 

@@ -166,8 +166,8 @@ 
     public function getJustBundles(): array

     {

         $bundles = [];

-        foreach ($this->bundles as $bundle) {

-            if (!$bundle instanceof AbstractExtension) {

+        foreach ($this->bundles as $bundle) {
+            if (!$bundle instanceof AbstractExtension) {
                 $bundles[] = $bundle;

             }

         }

@@ -177,11 +177,11 @@ 
 

     public function isBundle(string $name): bool

     {

-        try {

+        try {
             $this->getBundle($name);

 

             return true;

-        } catch (Exception $exception) {

+        } catch (Exception $exception) {
             return false;

         }

     }

@@ -193,16 +193,16 @@ 
 

     public function getAutoloader(): object

     {

-        if (null === $this->autoloader) {

+        if (null === $this->autoloader) {
             $loaders = spl_autoload_functions();

-            if ($loaders[0][0] instanceof DebugClassLoader) {

+            if ($loaders[0][0] instanceof DebugClassLoader) {
                 $classLoader = $loaders[0][0]->getClassLoader();

-                if (is_callable($classLoader) && is_object($classLoader[0])) {

+                if (is_callable($classLoader) && is_object($classLoader[0])) {
                     $this->autoloader = $classLoader[0];

-                } elseif (is_object($classLoader)) {

+                } elseif (is_object($classLoader)) {
                     $this->autoloader = $classLoader;

                 }

-            } else {

+            } else {
                 $this->autoloader = $loaders[0][0];

             }

         }

@@ -213,8 +213,8 @@ 
     public function isClassInBundle(string $class): bool

     {

         /* @var BundleInterface $bundle */

-        foreach ($this->getBundles() as $bundle) {

-            if (0 === mb_strpos($class, $bundle->getNamespace())) {

+        foreach ($this->getBundles() as $bundle) {
+            if (0 === mb_strpos($class, $bundle->getNamespace())) {
                 return $bundle instanceof AbstractExtension;

             }

         }