zikula /
core
@@ -42,7 +42,7 @@ |
||
| 42 | 42 | 'composer-plugin' => 'Composer Plugins' |
| 43 | 43 | ]; |
| 44 | 44 | $types = array_keys($typeOrder); |
| 45 | - usort($packages, function ($a, $b) use ($types) { |
|
| 45 | + usort($packages, function($a, $b) use ($types) { |
|
| 46 | 46 | return array_search($a['type'], $types) - array_search($b['type'], $types); |
| 47 | 47 | }); |
| 48 | 48 | |
@@ -319,7 +319,7 @@ |
||
| 319 | 319 | -----------------sha1sums----------------- |
| 320 | 320 | $zipSha1 $name.zip |
| 321 | 321 | $tarSha1 $name.tar.gz |
| 322 | -CHECKSUM; |
|
| 322 | +checksum; |
|
| 323 | 323 | file_put_contents("$name-checksum.txt", $checksum); |
| 324 | 324 | $progress->advance(); |
| 325 | 325 | |
@@ -92,10 +92,10 @@ |
||
| 92 | 92 | |
| 93 | 93 | public function registerContainerConfiguration(LoaderInterface $loader) |
| 94 | 94 | { |
| 95 | - $loader->load($this->rootDir.'/config/config_'.$this->getEnvironment().'.yml'); |
|
| 96 | - $loader->load($this->rootDir.'/config/parameters.yml'); |
|
| 97 | - if (is_readable($this->rootDir.'/config/custom_parameters.yml')) { |
|
| 98 | - $loader->load($this->rootDir.'/config/custom_parameters.yml'); |
|
| 95 | + $loader->load($this->rootDir . '/config/config_' . $this->getEnvironment() . '.yml'); |
|
| 96 | + $loader->load($this->rootDir . '/config/parameters.yml'); |
|
| 97 | + if (is_readable($this->rootDir . '/config/custom_parameters.yml')) { |
|
| 98 | + $loader->load($this->rootDir . '/config/custom_parameters.yml'); |
|
| 99 | 99 | } |
| 100 | 100 | |
| 101 | 101 | if (!is_readable($this->rootDir . '/config/' . DynamicConfigDumper::CONFIG_GENERATED)) { |
@@ -16,7 +16,7 @@ |
||
| 16 | 16 | /** |
| 17 | 17 | * @var ClassLoader |
| 18 | 18 | */ |
| 19 | -$loader = require __DIR__.'/../vendor/autoload.php'; |
|
| 19 | +$loader = require __DIR__ . '/../vendor/autoload.php'; |
|
| 20 | 20 | |
| 21 | 21 | AnnotationRegistry::registerLoader([$loader, 'loadClass']); |
| 22 | 22 | AnnotationReader::addGlobalIgnoredName('type'); |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | if (isset($_SERVER['HTTP_HOST'])) { |
| 30 | 30 | echo "<html><body><pre>"; |
| 31 | 31 | } |
| 32 | - echo 'The following errors were discovered when checking the' .PHP_EOL. 'Zikula Core system/environment requirements:' . PHP_EOL; |
|
| 32 | + echo 'The following errors were discovered when checking the' . PHP_EOL . 'Zikula Core system/environment requirements:' . PHP_EOL; |
|
| 33 | 33 | echo '******************************************************' . PHP_EOL . PHP_EOL; |
| 34 | 34 | foreach ($versionChecker->requirementsErrors as $error) { |
| 35 | 35 | echo $error . PHP_EOL; |
@@ -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 | } |
@@ -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) |
@@ -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() |
