zikula / core

src/system/ThemeModule/Engine/Engine.php

Braces +23 added lines, -23 removed lines

@@ -45,8 +45,8 @@ 
  * @see https://github.com/zikula/SpecTheme

  * Themes can define 'realms' which determine specific templates based on Request

  */

-class Engine

-{

+class Engine
+{
     /**

      * The instance of the currently active theme.

      *

@@ -99,7 +99,7 @@ 
         ZikulaHttpKernelInterface $kernel,

         AssetFilter $filter,

         VariableApiInterface $variableApi

-    ) {

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

         $this->annotationReader = $annotationReader;

         $this->kernel = $kernel;

@@ -147,7 +147,7 @@ 
      */

     public function getTheme(): ?AbstractTheme

     {

-        if (!isset($this->activeThemeBundle) && $this->kernel->getContainer()->getParameter('installed')) {

+        if (!isset($this->activeThemeBundle) && $this->kernel->getContainer()->getParameter('installed')) {
             $this->setActiveTheme();

         }

 

@@ -160,7 +160,7 @@ 
      */

     public function getRealm(): string

     {

-        if (!isset($this->realm)) {

+        if (!isset($this->realm)) {
             $this->setMatchingRealm();

         }

 

@@ -181,15 +181,15 @@ 
      * @throws ReflectionException

      * @api Core-2.0

      */

-    public function changeThemeByAnnotation(string $controllerClassName, string $method)

-    {

+    public function changeThemeByAnnotation(string $controllerClassName, string $method)
+    {
         $reflectionClass = new ReflectionClass($controllerClassName);

         $reflectionMethod = $reflectionClass->getMethod($method);

         $themeAnnotation = $this->annotationReader->getMethodAnnotation($reflectionMethod, Theme::class);

-        if (isset($themeAnnotation)) {

+        if (isset($themeAnnotation)) {
             // method annotations contain `@Theme` so set theme based on value

             $this->annotationValue = $themeAnnotation->value;

-            switch ($themeAnnotation->value) {

+            switch ($themeAnnotation->value) {
                 case 'admin':

                     $newThemeName = $this->variableApi->get('ZikulaAdminModule', 'admintheme', '');

                     break;

@@ -205,7 +205,7 @@ 
                 default:

                     $newThemeName = $themeAnnotation->value;

             }

-            if (!empty($newThemeName)) {

+            if (!empty($newThemeName)) {
                 $this->setActiveTheme($newThemeName);

 

                 return $newThemeName;

@@ -218,11 +218,11 @@ 
     public function positionIsAvailableInTheme(string $name): bool

     {

         $config = $this->getTheme()->getConfig();

-        if (empty($config)) {

+        if (empty($config)) {
             return true;

         }

-        foreach ($config as $realm => $definition) {

-            if (isset($definition['block']['positions'][$name])) {

+        foreach ($config as $realm => $definition) {
+            if (isset($definition['block']['positions'][$name])) {
                 return true;

             }

         }

@@ -245,7 +245,7 @@ 
     {

         $themeConfig = $this->getTheme()->getConfig();

         // defining an admin realm overrides all other options for 'admin' annotated methods

-        if ('admin' === $this->annotationValue && isset($themeConfig['admin'])) {

+        if ('admin' === $this->annotationValue && isset($themeConfig['admin'])) {
             $this->realm = 'admin';

 

             return;

@@ -253,10 +253,10 @@ 
         $pathInfo = null;

         $requestAttributes = [];

         $request = $this->requestStack->getMasterRequest();

-        if (null !== $request) {

+        if (null !== $request) {
             $requestAttributes = $request->attributes->all();

             // match `/` for home realm

-            if (isset($requestAttributes['_route']) && 'home' === $requestAttributes['_route']) {

+            if (isset($requestAttributes['_route']) && 'home' === $requestAttributes['_route']) {
                 $this->realm = 'home';

 

                 return;

@@ -265,22 +265,22 @@ 
         }

 

         unset($themeConfig['admin'], $themeConfig['home'], $themeConfig['master']); // remove to avoid scanning/matching in loop

-        foreach ($themeConfig as $realm => $config) {

-            if (!empty($config['pattern'])) {

+        foreach ($themeConfig as $realm => $config) {
+            if (!empty($config['pattern'])) {
                 $pattern = ';' . str_replace('/', '\\/', $config['pattern']) . ';i'; // delimiters are ; and i means case-insensitive

                 $valuesToMatch = [];

-                if (isset($pathInfo)) {

+                if (isset($pathInfo)) {
                     $valuesToMatch[] = $pathInfo; // e.g. /pages/display/welcome-to-pages-content-manager

                 }

-                if (isset($requestAttributes['_route'])) {

+                if (isset($requestAttributes['_route'])) {
                     $valuesToMatch[] = $requestAttributes['_route']; // e.g. zikulapagesmodule_user_display

                 }

-                if (isset($requestAttributes['_zkModule'])) {

+                if (isset($requestAttributes['_zkModule'])) {
                     $valuesToMatch[] = $requestAttributes['_zkModule']; // e.g. zikulapagesmodule

                 }

-                foreach ($valuesToMatch as $value) {

+                foreach ($valuesToMatch as $value) {
                     $match = preg_match($pattern, $value);

-                    if (1 === $match) {

+                    if (1 === $match) {
                         $this->realm = $realm;

 

                         return; // use first match and do not continue to attempt to match patterns

src/system/ExtensionsModule/AbstractCoreTheme.php

Braces +2 added lines, -2 removed lines

@@ -13,6 +13,6 @@
 

 namespace Zikula\ExtensionsModule;

 

-abstract class AbstractCoreTheme extends AbstractTheme

-{

+abstract class AbstractCoreTheme extends AbstractTheme
+{
 }

src/system/ExtensionsModule/AbstractTheme.php

Braces +14 added lines, -14 removed lines

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

 use Zikula\ExtensionsModule\Api\VariableApi;

 

-abstract class AbstractTheme extends AbstractExtension

-{

+abstract class AbstractTheme extends AbstractExtension
+{
     /**

      * @var array

      */

@@ -39,17 +39,17 @@ 
     /**

      * Load the theme configuration from the config/theme.yaml file.

      */

-    public function __construct()

-    {

+    public function __construct()
+    {
         $this->config = [];

 

         $configPath = $this->getConfigPath() . '/theme.yaml';

-        if (!file_exists($configPath)) {

+        if (!file_exists($configPath)) {
             return;

         }

 

         $this->config = Yaml::parse(file_get_contents($configPath));

-        if (!isset($this->config['master'])) {

+        if (!isset($this->config['master'])) {
             throw new InvalidConfigurationException('Core-2.0 themes must have a defined master realm.');

         }

     }

@@ -88,9 +88,9 @@ 
         string $blockContent,

         string $blockTitle

     ): string {

-        if (isset($this->config[$realm]['block']['positions'][$positionName])) {

+        if (isset($this->config[$realm]['block']['positions'][$positionName])) {
             $template = '@' . $this->name . '/' . $this->config[$realm]['block']['positions'][$positionName];

-        } else {

+        } else {
             // block position not defined, provide a default template

             $template = '@ZikulaThemeModule/Default/block.html.twig';

         }

@@ -126,7 +126,7 @@ 
      */

     public function loadThemeVars(): void

     {

-        if ($this->getContainer()->has('zikula_core.common.theme.themevars')) {

+        if ($this->getContainer()->has('zikula_core.common.theme.themevars')) {
             $this->getContainer()->get('zikula_core.common.theme.themevars')->replace($this->getThemeVars());

         }

     }

@@ -138,12 +138,12 @@ 
     {

         $variableApi = $this->container->get(VariableApi::class);

         $dbVars = $variableApi->getAll($this->name);

-        if (empty($dbVars) && !is_array($dbVars)) {

+        if (empty($dbVars) && !is_array($dbVars)) {
             $dbVars = [];

         }

         $defaultVars = $this->getDefaultThemeVars();

         $combinedVars = array_merge($defaultVars, $dbVars);

-        if (array_keys($dbVars) !== array_keys($combinedVars)) {

+        if (array_keys($dbVars) !== array_keys($combinedVars)) {
             // First load of file or vars have been added to the YAML file.

             $variableApi->setAll($this->name, $combinedVars);

         }

@@ -158,7 +158,7 @@ 
     {

         $defaultVars = [];

         $themeVarsPath = $this->getConfigPath() . '/variables.yaml';

-        if (!file_exists($themeVarsPath)) {

+        if (!file_exists($themeVarsPath)) {
             return $defaultVars;

         }

 

@@ -167,10 +167,10 @@ 
         }*/

 

         $yamlVars = Yaml::parse(file_get_contents($themeVarsPath));

-        if (!is_array($yamlVars)) {

+        if (!is_array($yamlVars)) {
             $yamlVars = [];

         }

-        foreach ($yamlVars as $name => $definition) {

+        foreach ($yamlVars as $name => $definition) {
             $defaultVars[$name] = $definition['default_value'];

         }

 

src/system/ExtensionsModule/AbstractModule.php

Braces +2 added lines, -2 removed lines

@@ -13,8 +13,8 @@
 

 namespace Zikula\ExtensionsModule;

 

-abstract class AbstractModule extends AbstractExtension

-{

+abstract class AbstractModule extends AbstractExtension
+{
     public function getNameType(): string

     {

         return 'Module';

src/system/ExtensionsModule/Controller/ExtensionController.php

Braces +55 added lines, -55 removed lines

@@ -50,8 +50,8 @@ 
  * Class ExtensionController

  * @Route("")

  */

-class ExtensionController extends AbstractController

-{

+class ExtensionController extends AbstractController
+{
     private const NEW_ROUTES_AVAIL = 'new.routes.avail';

 

     /**

@@ -69,11 +69,11 @@ 
         RouterInterface $router,

         int $pos = 1

     ): array {

-        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {

+        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();

         }

         $modulesJustInstalled = $request->query->get('justinstalled');

-        if (!empty($modulesJustInstalled)) {

+        if (!empty($modulesJustInstalled)) {
             // notify the event dispatcher that new routes are available (ids of modules just installed avail as args)

             $event = new GenericEvent(null, json_decode($modulesJustInstalled));

             $eventDispatcher->dispatch($event, self::NEW_ROUTES_AVAIL);

@@ -86,7 +86,7 @@ 
         $upgradedExtensions = [];

         $vetoEvent = new GenericEvent();

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

-        if (1 === $pos && !$vetoEvent->isPropagationStopped()) {

+        if (1 === $pos && !$vetoEvent->isPropagationStopped()) {
             // regenerate the extension list only when viewing the first page

             $extensionsInFileSystem = $bundleSyncHelper->scanForBundles();

             $upgradedExtensions = $bundleSyncHelper->syncExtensions($extensionsInFileSystem);

@@ -121,19 +121,19 @@ 
         ExtensionStateHelper $extensionStateHelper,

         CacheClearer $cacheClearer

     ): RedirectResponse {

-        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {

+        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();

         }

 

-        if (!$this->isCsrfTokenValid('activate-extension', $token)) {

+        if (!$this->isCsrfTokenValid('activate-extension', $token)) {
             throw new AccessDeniedException();

         }

 

         /** @var ExtensionEntity $extension */

         $extension = $extensionRepository->find($id);

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

+        if (Constant::STATE_NOTALLOWED === $extension->getState()) {
             $this->addFlash('error', $this->trans('Error! Activation of %name% not allowed.', ['%name%' => $extension->getName()]));

-        } else {

+        } else {
             // Update state

             $extensionStateHelper->updateState($id, Constant::STATE_ACTIVE);

             $cacheClearer->clear('symfony');

@@ -157,21 +157,21 @@ 
         ExtensionStateHelper $extensionStateHelper,

         CacheClearer $cacheClearer

     ): RedirectResponse {

-        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {

+        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();

         }

 

-        if (!$this->isCsrfTokenValid('deactivate-extension', $token)) {

+        if (!$this->isCsrfTokenValid('deactivate-extension', $token)) {
             throw new AccessDeniedException();

         }

         // @todo check if this is a theme and currently set as default or admin theme

 

         /** @var ExtensionEntity $extension */

         $extension = $extensionRepository->find($id);

-        if (null !== $extension) {

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

+        if (null !== $extension) {
+            if (ZikulaKernel::isCoreExtension($extension->getName())) {
                 $this->addFlash('error', $this->trans('Error! You cannot deactivate the %name%. It is required by the system.', ['%name%' => $extension->getName()]));

-            } else {

+            } else {
                 // Update state

                 $extensionStateHelper->updateState($id, Constant::STATE_INACTIVE);

                 $cacheClearer->clear('symfony');

@@ -198,8 +198,8 @@ 
         ExtensionEntity $extension,

         CacheClearer $cacheClearer,

         bool $forceDefaults = false

-    ) {

-        if (!$this->hasPermission('ZikulaExtensionsModule::modify', $extension->getName() . '::' . $extension->getId(), ACCESS_ADMIN)) {

+    ) {
+        if (!$this->hasPermission('ZikulaExtensionsModule::modify', $extension->getName() . '::' . $extension->getId(), ACCESS_ADMIN)) {
             throw new AccessDeniedException();

         }

 

@@ -207,7 +207,7 @@ 
         $extensionBundle = $kernel->getBundle($extension->getName());

         $metaData = $extensionBundle->getMetaData()->getFilteredVersionInfoArray();

 

-        if ($forceDefaults) {

+        if ($forceDefaults) {
             $extension->setName($metaData['name']);

             $extension->setUrl($metaData['url']);

             $extension->setDescription($metaData['description']);

@@ -215,20 +215,20 @@ 
 

         $form = $this->createForm(ExtensionModifyType::class, $extension);

         $form->handleRequest($request);

-        if ($form->isSubmitted() && $form->isValid()) {

-            if ($form->get('defaults')->isClicked()) {

+        if ($form->isSubmitted() && $form->isValid()) {
+            if ($form->get('defaults')->isClicked()) {
                 $this->addFlash('info', 'Default values reloaded. Save to confirm.');

 

                 return $this->redirectToRoute('zikulaextensionsmodule_extension_modify', ['id' => $extension->getId(), 'forceDefaults' => 1]);

             }

-            if ($form->get('save')->isClicked()) {

+            if ($form->get('save')->isClicked()) {
                 $em = $this->getDoctrine()->getManager();

                 $em->persist($extension);

                 $em->flush();

 

                 $cacheClearer->clear('symfony');

                 $this->addFlash('status', 'Done! Extension updated.');

-            } elseif ($form->get('cancel')->isClicked()) {

+            } elseif ($form->get('cancel')->isClicked()) {
                 $this->addFlash('status', 'Operation cancelled.');

             }

 

@@ -251,7 +251,7 @@ 
      */

     public function compatibilityAction(ExtensionEntity $extension): array

     {

-        if (!$this->hasPermission('ZikulaExtensionsModule::', $extension->getName() . '::' . $extension->getId(), ACCESS_ADMIN)) {

+        if (!$this->hasPermission('ZikulaExtensionsModule::', $extension->getName() . '::' . $extension->getId(), ACCESS_ADMIN)) {
             throw new AccessDeniedException();

         }

 

@@ -280,17 +280,17 @@ 
         ExtensionStateHelper $extensionStateHelper,

         ExtensionDependencyHelper $dependencyHelper,

         CacheClearer $cacheClearer

-    ) {

-        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {

+    ) {
+        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();

         }

 

         $id = $extension->getId();

-        if (!$this->isCsrfTokenValid('install-extension', $token)) {

+        if (!$this->isCsrfTokenValid('install-extension', $token)) {
             throw new AccessDeniedException();

         }

 

-        if (!$kernel->isBundle($extension->getName())) {

+        if (!$kernel->isBundle($extension->getName())) {
             $extensionStateHelper->updateState($id, Constant::STATE_TRANSITIONAL);

             $cacheClearer->clear('symfony');

 

@@ -302,28 +302,28 @@ 
         ]);

         $hasNoUnsatisfiedDependencies = empty($unsatisfiedDependencies);

         $form->handleRequest($request);

-        if ($hasNoUnsatisfiedDependencies || ($form->isSubmitted() && $form->isValid())) {

-            if ($hasNoUnsatisfiedDependencies || $form->get('install')->isClicked()) {

+        if ($hasNoUnsatisfiedDependencies || ($form->isSubmitted() && $form->isValid())) {
+            if ($hasNoUnsatisfiedDependencies || $form->get('install')->isClicked()) {
                 $extensionsInstalled = [];

                 $data = $form->getData();

-                foreach ($data['dependencies'] as $dependencyId => $installSelected) {

-                    if (!$installSelected && MetaData::DEPENDENCY_REQUIRED !== $unsatisfiedDependencies[$dependencyId]->getStatus()) {

+                foreach ($data['dependencies'] as $dependencyId => $installSelected) {
+                    if (!$installSelected && MetaData::DEPENDENCY_REQUIRED !== $unsatisfiedDependencies[$dependencyId]->getStatus()) {
                         continue;

                     }

                     $dependencyExtensionEntity = $extensionRepository->get($unsatisfiedDependencies[$dependencyId]->getModname());

-                    if (isset($dependencyExtensionEntity)) {

-                        if (!$extensionHelper->install($dependencyExtensionEntity)) {

+                    if (isset($dependencyExtensionEntity)) {
+                        if (!$extensionHelper->install($dependencyExtensionEntity)) {
                             $this->addFlash('error', $this->trans('Failed to install dependency "%name%"!', ['%name%' => $dependencyExtensionEntity->getName()]));

 

                             return $this->redirectToRoute('zikulaextensionsmodule_extension_list');

                         }

                         $extensionsInstalled[] = $dependencyExtensionEntity->getId();

                         $this->addFlash('status', $this->trans('Installed dependency "%name%".', ['%name%' => $dependencyExtensionEntity->getName()]));

-                    } else {

+                    } else {
                         $this->addFlash('warning', $this->trans('Warning: could not install selected dependency "%name%".', ['%name%' => $unsatisfiedDependencies[$dependencyId]->getModname()]));

                     }

                 }

-                if ($extensionHelper->install($extension)) {

+                if ($extensionHelper->install($extension)) {
                     $this->addFlash('status', $this->trans('Done! Installed "%name%".', ['%name%' => $extension->getName()]));

                     $extensionsInstalled[] = $id;

                     $cacheClearer->clear('symfony');

@@ -333,7 +333,7 @@ 
                 $extensionStateHelper->updateState($id, Constant::STATE_UNINITIALISED);

                 $this->addFlash('error', $this->trans('Initialization of "%name%" failed!', ['%name%' => $extension->getName()]));

             }

-            if ($form->get('cancel')->isClicked()) {

+            if ($form->get('cancel')->isClicked()) {
                 $extensionStateHelper->updateState($id, Constant::STATE_UNINITIALISED);

                 $this->addFlash('status', 'Operation cancelled.');

             }

@@ -360,17 +360,17 @@ 
         EventDispatcherInterface $eventDispatcher,

         string $extensions = null

     ): RedirectResponse {

-        if (!empty($extensions)) {

+        if (!empty($extensions)) {
             $extensions = json_decode($extensions);

-            foreach ($extensions as $extensionId) {

+            foreach ($extensions as $extensionId) {
                 /** @var ExtensionEntity $extensionEntity */

                 $extensionEntity = $extensionRepository->find($extensionId);

-                if (null === $extensionRepository) {

+                if (null === $extensionRepository) {
                     continue;

                 }

                 /** @var AbstractExtension $extensionBundle */

                 $extensionBundle = $kernel->getBundle($extensionEntity->getName());

-                if (null === $extensionBundle) {

+                if (null === $extensionBundle) {
                     continue;

                 }

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

@@ -389,7 +389,7 @@ 
         array $dependencies

     ): array {

         $return = [];

-        foreach ($dependencies as $dependency) {

+        foreach ($dependencies as $dependency) {
             /** @var ExtensionEntity $dependencyExtension */

             $dependencyExtension = $extensionRepository->get($dependency->getModname());

             $return[$dependency->getId()] = null !== $dependencyExtension;

@@ -410,18 +410,18 @@ 
         $token,

         ExtensionHelper $extensionHelper

     ): RedirectResponse {

-        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {

+        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();

         }

 

-        if (!$this->isCsrfTokenValid('upgrade-extension', $token)) {

+        if (!$this->isCsrfTokenValid('upgrade-extension', $token)) {
             throw new AccessDeniedException();

         }

 

         $result = $extensionHelper->upgrade($extension);

-        if ($result) {

+        if ($result) {
             $this->addFlash('status', $this->trans('%name% upgraded to new version and activated.', ['%name%' => $extension->getDisplayname()]));

-        } else {

+        } else {
             $this->addFlash('error', 'Extension upgrade failed!');

         }

 

@@ -448,19 +448,19 @@ 
         ExtensionStateHelper $extensionStateHelper,

         ExtensionDependencyHelper $dependencyHelper,

         CacheClearer $cacheClearer

-    ) {

-        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {

+    ) {
+        if (!$this->hasPermission('ZikulaExtensionsModule::', '::', ACCESS_ADMIN)) {
             throw new AccessDeniedException();

         }

 

-        if (!$this->isCsrfTokenValid('uninstall-extension', $token)) {

+        if (!$this->isCsrfTokenValid('uninstall-extension', $token)) {
             throw new AccessDeniedException();

         }

 

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

+        if (Constant::STATE_MISSING === $extension->getState()) {
             throw new RuntimeException($this->trans('Error! The requested extension cannot be uninstalled because its files are missing!'));

         }

-        if (!$kernel->isBundle($extension->getName())) {

+        if (!$kernel->isBundle($extension->getName())) {
             $extensionStateHelper->updateState($extension->getId(), Constant::STATE_TRANSITIONAL);

             $cacheClearer->clear('symfony');

         }

@@ -474,10 +474,10 @@ 
             ]),

         ]);

         $form->handleRequest($request);

-        if ($form->isSubmitted() && $form->isValid()) {

-            if ($form->get('delete')->isClicked()) {

+        if ($form->isSubmitted() && $form->isValid()) {
+            if ($form->get('delete')->isClicked()) {
                 // remove dependent extensions

-                if (!$extensionHelper->uninstallArray($requiredDependents)) {

+                if (!$extensionHelper->uninstallArray($requiredDependents)) {
                     $this->addFlash('error', 'Error: Could not uninstall dependent extensions.');

 

                     return $this->redirectToRoute('zikulaextensionsmodule_extension_list');

@@ -486,12 +486,12 @@ 
                 $blockRepository->remove($blocks);

 

                 // remove the extension

-                if ($extensionHelper->uninstall($extension)) {

+                if ($extensionHelper->uninstall($extension)) {
                     $this->addFlash('status', 'Done! Uninstalled extension.');

-                } else {

+                } else {
                     $this->addFlash('error', 'Extension removal failed! (note: blocks and dependents may have been removed)');

                 }

-            } elseif ($form->get('cancel')->isClicked()) {

+            } elseif ($form->get('cancel')->isClicked()) {
                 $this->addFlash('status', 'Operation cancelled.');

             }

 

src/system/ExtensionsModule/Event/ExtensionStateEvent.php

Braces +4 added lines, -4 removed lines

@@ -19,8 +19,8 @@ 
 /**

  * Class ExtensionStateEvent

  */

-class ExtensionStateEvent extends Event

-{

+class ExtensionStateEvent extends Event
+{
     /**

      * @var null|AbstractExtension The module instance. Null when Module object is not available

      */

@@ -33,8 +33,8 @@ 
      */

     private $info;

 

-    public function __construct(AbstractExtension $extension = null, array $info = null)

-    {

+    public function __construct(AbstractExtension $extension = null, array $info = null)
+    {
         $this->extension = $extension;

         $this->info = $info;

     }

src/system/ExtensionsModule/Installer/AbstractExtensionInstaller.php

Braces +5 added lines, -5 removed lines

@@ -77,11 +77,11 @@ 
         $this->name = $extension->getName();

     }

 

-    public function setContainer(ContainerInterface $container = null)

-    {

+    public function setContainer(ContainerInterface $container = null)
+    {
         $this->extensionName = $this->name; // for ExtensionVariablesTrait

         $this->container = $container;

-        if (null === $container) {

+        if (null === $container) {
             return;

         }

         $this->setTranslator($container->get('translator'));

@@ -96,12 +96,12 @@ 
     public function addFlash(string $type, string $message): void

     {

         $request = $this->container->get('request_stack')->getCurrentRequest();

-        if (null === $request) {

+        if (null === $request) {
             echo ucfirst($type) . ': ' . $message . "\n";

 

             return;

         }

-        if (!$request->hasSession()) {

+        if (!$request->hasSession()) {
             throw new LogicException('You can not use the addFlash method if sessions are disabled.');

         }

 

src/system/ExtensionsModule/Installer/ExtensionInstallerInterface.php

Braces +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@
 /**

  * Interface ExtensionInstallerInterface

  */

-interface ExtensionInstallerInterface extends InstallerInterface

-{

+interface ExtensionInstallerInterface extends InstallerInterface
+{
     public function setExtension(AbstractExtension $extension): void;

 }

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'];

                     }