@@ -47,7 +47,7 @@ |
||
47 | 47 | { |
48 | 48 | $router = \ServiceUtil::get('router'); |
49 | 49 | $fqUrl = (is_bool($fqUrl) && $fqUrl) ? RouterInterface::ABSOLUTE_URL : RouterInterface::ABSOLUTE_PATH; |
50 | - $fragment = (!empty($this->fragment)) ? '#' . $this->fragment : ''; |
|
50 | + $fragment = (!empty($this->fragment)) ? '#' . $this->fragment : ''; |
|
51 | 51 | |
52 | 52 | $oldScheme = $router->getContext()->getScheme(); |
53 | 53 | if ($ssl) { |
@@ -25,7 +25,7 @@ |
||
25 | 25 | |
26 | 26 | public function addStylesheet($name = 'style.css') |
27 | 27 | { |
28 | - $moduleStylesheet = $this->getContainer()->get('zikula_core.common.theme.asset_helper')->resolve('@' . $this->getName() . ":css/$name"); |
|
28 | + $moduleStylesheet = $this->getContainer()->get('zikula_core.common.theme.asset_helper')->resolve('@' . $this->getName() . ":css/$name"); |
|
29 | 29 | if (!empty($moduleStylesheet)) { |
30 | 30 | $this->container->get('zikula_core.common.theme.assets_css')->add([$moduleStylesheet => AssetBag::WEIGHT_DEFAULT]); |
31 | 31 | } |
@@ -70,9 +70,9 @@ discard block |
||
70 | 70 | $config = $this->config; |
71 | 71 | $alias = $config->getAlias(); |
72 | 72 | $qb = $config->getQueryBuilder(); |
73 | - $qb->join($alias.'.categories', $alias.'_cat_plugin')->join( |
|
74 | - $alias.'_cat_plugin.category', |
|
75 | - $alias.'_cat_plugin_category' |
|
73 | + $qb->join($alias . '.categories', $alias . '_cat_plugin')->join( |
|
74 | + $alias . '_cat_plugin.category', |
|
75 | + $alias . '_cat_plugin_category' |
|
76 | 76 | ); |
77 | 77 | } |
78 | 78 | |
@@ -86,7 +86,7 @@ discard block |
||
86 | 86 | if (empty($property)) { |
87 | 87 | $this->property = null; |
88 | 88 | } else { |
89 | - $this->property = (array) $property; |
|
89 | + $this->property = (array)$property; |
|
90 | 90 | } |
91 | 91 | } |
92 | 92 | |
@@ -132,9 +132,9 @@ discard block |
||
132 | 132 | $alias = $config->getAlias(); |
133 | 133 | $expr = $config->getQueryBuilder()->expr(); |
134 | 134 | if ($op == 'sub' || is_numeric($value)) { |
135 | - $column = $alias.'_cat_plugin_category.id'; |
|
135 | + $column = $alias . '_cat_plugin_category.id'; |
|
136 | 136 | } else { |
137 | - $column = $alias.'_cat_plugin_category.name'; |
|
137 | + $column = $alias . '_cat_plugin_category.name'; |
|
138 | 138 | } |
139 | 139 | $con = null; |
140 | 140 | switch ($op) { |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | } |
153 | 153 | if (null !== $this->modname && null !== $this->property) { |
154 | 154 | $propertyCon = $expr->in( |
155 | - $alias.'_cat_plugin.categoryRegistryId', |
|
155 | + $alias . '_cat_plugin.categoryRegistryId', |
|
156 | 156 | $config->toParam($this->getRegistryIds(), 'category', $field) |
157 | 157 | ); |
158 | 158 | if (null !== $con) { |
@@ -29,7 +29,7 @@ |
||
29 | 29 | */ |
30 | 30 | public function load(array $configs, ContainerBuilder $container) |
31 | 31 | { |
32 | - $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
|
32 | + $loader = new YamlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); |
|
33 | 33 | $loader->load('services.yml'); |
34 | 34 | } |
35 | 35 | } |
@@ -43,8 +43,7 @@ |
||
43 | 43 | $dbh = new \PDO("$object[database_driver]:host=$object[database_host];dbname=$object[database_name]", $object['database_user'], $object['database_password']); |
44 | 44 | $dbh->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION); |
45 | 45 | $sql = ($object['database_driver'] == 'mysql' || $object['database_driver'] == 'mysqli') ? |
46 | - "SHOW TABLES FROM `$object[database_name]` LIKE '%'" : |
|
47 | - "SHOW TABLES FROM $object[database_name] LIKE '%'"; |
|
46 | + "SHOW TABLES FROM `$object[database_name]` LIKE '%'" : "SHOW TABLES FROM $object[database_name] LIKE '%'"; |
|
48 | 47 | $tables = $dbh->query($sql); |
49 | 48 | if (!is_object($tables)) { |
50 | 49 | $this->context->buildViolation($this->__('Error! Determination existing tables failed.') . ' SQL: ' . $sql) |
@@ -43,7 +43,7 @@ |
||
43 | 43 | public function __construct(ContainerInterface $container) |
44 | 44 | { |
45 | 45 | parent::__construct($container); |
46 | - $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml'); |
|
46 | + $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml'); |
|
47 | 47 | } |
48 | 48 | |
49 | 49 | public function ajaxAction(Request $request) |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | public function __construct(ContainerInterface $container) |
43 | 43 | { |
44 | 44 | parent::__construct($container); |
45 | - $originalParameters = Yaml::parse(file_get_contents($this->container->get('kernel')->getRootDir() .'/config/parameters.yml')); |
|
46 | - $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml'); |
|
45 | + $originalParameters = Yaml::parse(file_get_contents($this->container->get('kernel')->getRootDir() . '/config/parameters.yml')); |
|
46 | + $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml'); |
|
47 | 47 | // load and set new default values from the original parameters.yml file into the custom_parameters.yml file. |
48 | 48 | $this->yamlManager->setParameters(array_merge($originalParameters['parameters'], $this->yamlManager->getParameters())); |
49 | 49 | $this->currentVersion = $this->container->getParameter(\Zikula_Core::CORE_INSTALLED_VERSION_PARAM); |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $stage = $request->request->get('stage'); |
55 | 55 | $this->container->setParameter('upgrading', true); |
56 | 56 | $status = $this->executeStage($stage); |
57 | - $response = ['status' => (bool) $status]; |
|
57 | + $response = ['status' => (bool)$status]; |
|
58 | 58 | if (is_array($status)) { |
59 | 59 | $response['results'] = $status; |
60 | 60 | } |
@@ -26,7 +26,7 @@ |
||
26 | 26 | public function __construct(ContainerInterface $container) |
27 | 27 | { |
28 | 28 | $this->container = $container; |
29 | - $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml'); |
|
29 | + $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml'); |
|
30 | 30 | } |
31 | 31 | |
32 | 32 | public function getName() |
@@ -30,7 +30,7 @@ |
||
30 | 30 | public function __construct(ContainerInterface $container) |
31 | 31 | { |
32 | 32 | $this->container = $container; |
33 | - $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() .'/config', 'custom_parameters.yml'); |
|
33 | + $this->yamlManager = new YamlDumper($this->container->get('kernel')->getRootDir() . '/config', 'custom_parameters.yml'); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public function getName() |