getting to something 😄

CHANGELOG-3.0.md

@@ -99,7 +99,7 @@
     - doctrine/orm updated from 2.5.14 to 2.7.0
     - doctrine/persistence installed in 1.3.3
     - doctrine/reflection installed in 1.0.0
-    - egulias/email-validator installed in 2.1.12
+    - egulias/email-validator installed in 2.1.13
     - elao/web-profiler-extra-bundle updated from 2.3.6 to dev-master 4329dde
     - erusev/parsedown installed in 1.7.3
     - friendsofsymfony/jsrouting-bundle updated from 1.6.3 to 2.5.1

src/app/config/config.yml

@@ -128,15 +128,14 @@ stof_doctrine_extensions:
         uploadable:           Gedmo\Uploadable\UploadableListener
         reference_integrity:  Gedmo\ReferenceIntegrity\ReferenceIntegrityListener
 
-#jms_i18n_routing:
-    #strategy: prefix_except_default
-    #cookie:
-        #enabled: false
+jms_i18n_routing:
+    strategy: prefix_except_default
+    cookie:
+        enabled: false
 
 bazinga_js_translation:
     default_domain: zikula_javascript
-    #locale_fallback: "%jms_i18n_routing.default_locale%"
-    locale_fallback: en
+    locale_fallback: "%jms_i18n_routing.default_locale%"
     active_locales: "%jms_i18n_routing.locales%"
 
 parameters:

src/app/config/dynamic/default.yml

@@ -2,10 +2,10 @@
 # generated.yml
 # It's here to give an initial configuration (until Zikula is installed).
 
-#jms_i18n_routing:
-    #default_locale: en
-    #locales: [en]
-    #strategy: prefix_except_default
+jms_i18n_routing:
+    default_locale: en
+    locales: [en]
+    strategy: prefix_except_default
 swiftmailer:
     transport: smtp
     username: ''

src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/UpgraderController.php

@@ -56,7 +56,7 @@ public function upgradeAction(Request $request, $stage): Response
             $session->getFlashBag()->add('warning', implode('<hr>', $ini_warnings));
         }
 
-        $yamlDumper = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml');
+        $yamlDumper = new YamlDumper($this->container->get('kernel')->getProjectDir() . '/app/config', 'custom_parameters.yml');
         $yamlDumper->setParameter('upgrading', true);
         $request->setLocale($this->container->getParameter('locale'));
 

src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/CreateAdminStage.php

@@ -34,7 +34,7 @@ class CreateAdminStage implements StageInterface, FormHandlerInterface, InjectCo
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml');
+        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getProjectDir() . '/app/config', 'custom_parameters.yml');
     }
 
     public function getName(): string

src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Install/DbCredsStage.php

@@ -41,7 +41,7 @@ class DbCredsStage implements StageInterface, FormHandlerInterface, InjectContai
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml');
+        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getProjectDir() . '/app/config', 'custom_parameters.yml');
     }
 
     public function getName(): string

src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/LocaleStage.php

@@ -51,7 +51,7 @@ class LocaleStage implements StageInterface, FormHandlerInterface, InjectContain
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml', 'parameters.yml');
+        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getProjectDir() . '/app/config', 'custom_parameters.yml', 'parameters.yml');
         $this->installedLocales = $container->get(LocaleApi::class)->getSupportedLocales();
         $this->matchedLocale = $container->get(LocaleApi::class)->getBrowserLocale();
     }

src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/LoginStage.php

@@ -31,7 +31,7 @@ class LoginStage implements StageInterface, FormHandlerInterface, InjectContaine
     public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
-        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml');
+        $this->yamlManager = new YamlDumper($this->container->get('kernel')->getProjectDir() . '/app/config', 'custom_parameters.yml');
     }
 
     public function getName(): string

src/system/AdminModule/Controller/AdminInterfaceController.php

@@ -167,7 +167,7 @@ public function securityanalyzerAction(Request $request, VariableApiInterface $v
         }
 
         // check for .htaccess in app directory
-        $appDir = $this->get('kernel')->getRootDir();
+        $appDir = $this->get('kernel')->getProjectDir() . '/app';
         if ($appDir) {
             // check if we have an absolute path which is possibly not within the document root
             $docRoot = $request->server->get('DOCUMENT_ROOT');

src/system/AdminModule/Form/Type/ConfigType.php

@@ -63,15 +63,13 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('itemsperpage', IntegerType::class, [
                 'label' => $this->__('Modules per page in module categories list'),
                 'empty_data' => 5,
-                'scale' => 0,
                 'attr' => [
                     'maxlength' => 3
                 ]
             ])
             ->add('modulesperrow', IntegerType::class, [
                 'label' => $this->__('Modules per row in admin panel'),
                 'empty_data' => 5,
-                'scale' => 0,
                 'attr' => [
                     'maxlength' => 3
                 ]

src/system/BlocksModule/Api/BlockFilterApi.php

@@ -59,6 +59,9 @@ public function isDisplayable(BlockEntity $blockEntity): bool
                 default:
                     $name = $request->attributes->get($filter['attribute']);
             }
+            if (empty($name)) {
+                continue;
+            }
             $displayable = $displayable && $this->compare($name, $filter['comparator'], $filter['value']);
         }
 

src/system/ExtensionsModule/Helper/ExtensionDependencyHelper.php

@@ -174,8 +174,8 @@ private function bundleDependencySatisfied(ExtensionDependencyEntity $dependency
             if ($this->kernel->isBundle($dependency->getModname())) {
                 if (empty($this->installedPackages)) {
                     // create and cache installed packages from composer.lock file
-                    $appPath = $this->kernel->getRootDir();
-                    $composerLockPath = realpath($appPath . '/../') . 'composer.lock';
+                    $projectPath = $this->kernel->getProjectDir();
+                    $composerLockPath = realpath($projectPath . '/') . 'composer.lock';
                     $packages = json_decode(file_get_contents($composerLockPath), true);
                     foreach ($packages as $package) {
                         $this->installedPackages[$package['name']] = $package;

src/system/GroupsModule/Form/Type/ConfigType.php

@@ -45,7 +45,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder
             ->add('itemsperpage', IntegerType::class, [
                 'label' => $this->__('Items per page'),
-                'scale' => 0,
                 'attr' => [
                     'maxlength' => 3,
                     'min' => 1

src/system/MailerModule/Form/Type/ConfigType.php

@@ -95,7 +95,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('wordwrap', IntegerType::class, [
                 'label' => $this->__('Word wrap'),
-                'scale' => 0,
                 'attr' => [
                     'maxlength' => 3
                 ],
@@ -115,7 +114,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ])
             ->add('port', IntegerType::class, [
                 'label' => $this->__('SMTP port'),
-                'scale' => 0,
                 'attr' => [
                     'maxlength' => 5
                 ],

src/system/PermissionsModule/Form/Type/ConfigType.php

@@ -57,7 +57,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('adminid', IntegerType::class, [
                 'label' => $this->__('ID of main administration permission rule'),
                 'empty_data' => 1,
-                'scale' => 0,
                 'attr' => [
                     'maxlength' => 3
                 ]

src/system/PermissionsModule/Resources/views/Permission/list.html.twig

@@ -19,8 +19,8 @@
 
 {% if enableFilter %}
     {% form_theme filterForm with [
-    'ZikulaCategoriesModule:Form:filter_layout_customizations.html.twig',
-    '@ZikulaFormExtension/Form/form_div_layout.html.twig'
+        '@ZikulaCategoriesModule/Form/filter_layout_customizations.html.twig',
+        '@ZikulaFormExtension/Form/form_div_layout.html.twig'
     ] %}
     {{ form_start(filterForm) }}
     <fieldset>

src/system/PermissionsModule/Resources/views/Permission/permission.html.twig

@@ -1,7 +1,7 @@
 <div id="edit-form-container">
     {% form_theme form with [
-    'bootstrap_3_horizontal_layout.html.twig',
-    '@ZikulaFormExtension/Form/form_div_layout.html.twig'
+        'bootstrap_3_horizontal_layout.html.twig',
+        '@ZikulaFormExtension/Form/form_div_layout.html.twig'
     ] %}
     {{ form_start(form) }}
     {{ form_errors(form) }}