Skip to content

Commit

Permalink
Restore changes by cs-fixer
Browse files Browse the repository at this point in the history
  • Loading branch information
sowbiba committed Dec 6, 2021
1 parent 418311a commit 5bebdea
Show file tree
Hide file tree
Showing 12 changed files with 340 additions and 345 deletions.
4 changes: 2 additions & 2 deletions classes/assets/AbstractAssetManager.php
Expand Up @@ -28,8 +28,6 @@

abstract class AbstractAssetManagerCore
{
use PrestaShop\PrestaShop\Adapter\Assets\AssetUrlGeneratorTrait;

protected $directories;
protected $configuration;
protected $list = [];
Expand All @@ -38,6 +36,8 @@ abstract class AbstractAssetManagerCore
const DEFAULT_PRIORITY = 50;
const DEFAULT_JS_POSITION = 'bottom';

use PrestaShop\PrestaShop\Adapter\Assets\AssetUrlGeneratorTrait;

public function __construct(array $directories, ConfigurationInterface $configuration)
{
$this->directories = $directories;
Expand Down
4 changes: 2 additions & 2 deletions classes/assets/CccReducer.php
Expand Up @@ -29,13 +29,13 @@

class CccReducerCore
{
use PrestaShop\PrestaShop\Adapter\Assets\AssetUrlGeneratorTrait;

/** @var string */
private $cacheDir;
/** @var Filesystem */
protected $filesystem;

use PrestaShop\PrestaShop\Adapter\Assets\AssetUrlGeneratorTrait;

/**
* @param string $cacheDir
* @param ConfigurationInterface $configuration
Expand Down
2 changes: 1 addition & 1 deletion classes/db/Db.php
Expand Up @@ -278,7 +278,7 @@ protected static function loadSlaveServers()

// Add here your slave(s) server(s) in this file
if (file_exists(_PS_ROOT_DIR_ . '/config/db_slave_server.inc.php')) {
self::$_servers = array_merge(self::$_servers, require(_PS_ROOT_DIR_ . '/config/db_slave_server.inc.php'));
self::$_servers = array_merge(self::$_servers, require (_PS_ROOT_DIR_ . '/config/db_slave_server.inc.php'));
}

self::$_slave_servers_loaded = true;
Expand Down
6 changes: 3 additions & 3 deletions classes/module/Module.php
Expand Up @@ -1133,7 +1133,7 @@ public static function getModuleNameFromClass($current_class)
}

$file = _PS_MODULE_DIR_ . static::$classInModule[$current_class] . '/' . Context::getContext()->language->iso_code . '.php';
if (Tools::file_exists_cache($file) && include_once($file)) {
if (Tools::file_exists_cache($file) && include_once ($file)) {
$_MODULES = !empty($_MODULES) ? array_merge($_MODULES, $_MODULE) : $_MODULE;
}
} else {
Expand Down Expand Up @@ -1263,7 +1263,7 @@ public static function getModuleName($module)
// Find translations
global $_MODULES;
$file = _PS_MODULE_DIR_ . $module . '/' . Context::getContext()->language->iso_code . '.php';
if (Tools::file_exists_cache($file) && include_once($file)) {
if (Tools::file_exists_cache($file) && include_once ($file)) {
if (isset($_MODULE) && is_array($_MODULE)) {
$_MODULES = !empty($_MODULES) ? array_merge($_MODULES, $_MODULE) : $_MODULE;
}
Expand Down Expand Up @@ -1362,7 +1362,7 @@ public static function getModulesOnDisk($use_config = false, $logged_on_addons =
// If no errors in Xml, no need instand and no need new config.xml file, we load only translations
if (!count($module_errors) && (int) $xml_module->need_instance == 0) {
$file = _PS_MODULE_DIR_ . $module . '/' . Context::getContext()->language->iso_code . '.php';
if (Tools::file_exists_cache($file) && include_once($file)) {
if (Tools::file_exists_cache($file) && include_once ($file)) {
if (isset($_MODULE) && is_array($_MODULE)) {
$_MODULES = !empty($_MODULES) ? array_merge($_MODULES, $_MODULE) : $_MODULE;
}
Expand Down

0 comments on commit 5bebdea

Please sign in to comment.