makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16955] Resolve psalm issues in di files

Browse source 
PHPBB3-16955
This commit is contained in:
Marc Alexander 2022-12-26 14:07:53 +01:00
parent cd026245fe
commit c4d3e1aa7b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/psalm_bootstrap.php
View file

@ -45,3 +45,7 @@ require_once $phpbb_root_path . 'includes/compatibility_globals.' . $phpEx;
$phpbb_class_loader = new \phpbb\class_loader('phpbb\\', $phpbb_root_path . 'phpbb/', "php"); $phpbb_class_loader = new \phpbb\class_loader('phpbb\\', $phpbb_root_path . 'phpbb/', "php");
$phpbb_class_loader->register(); $phpbb_class_loader->register();
class phpbb_cache_container extends \Symfony\Component\DependencyInjection\Container
{
}

3
phpBB/phpbb/di/container_builder.php
View file

@ -46,7 +46,7 @@ class container_builder
/** /**
* The container under construction * The container under construction
* *
* @var ContainerBuilder * @var \phpbb_cache_container|ContainerBuilder
*/ */
protected $container; protected $container;
@ -449,6 +449,7 @@ class container_builder
$ext_container->register('cache.driver', '\\phpbb\\cache\\driver\\dummy'); $ext_container->register('cache.driver', '\\phpbb\\cache\\driver\\dummy');
$ext_container->compile(); $ext_container->compile();
/** @var \phpbb\config\config $config */
$config = $ext_container->get('config'); $config = $ext_container->get('config');
if (@is_file($this->phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php')) if (@is_file($this->phpbb_root_path . $config['exts_composer_vendor_dir'] . '/autoload.php'))
{ {

4
phpBB/phpbb/di/extension/config.php
View file

@ -32,12 +32,12 @@ class config extends Extension
/** /**
* Loads a specific configuration. * Loads a specific configuration.
* *
* @param array $config An array of configuration values * @param array $configs An array of configuration values
* @param ContainerBuilder $container A ContainerBuilder instance * @param ContainerBuilder $container A ContainerBuilder instance
* *
* @throws \InvalidArgumentException When provided tag is not defined in this extension * @throws \InvalidArgumentException When provided tag is not defined in this extension
*/ */
public function load(array $config, ContainerBuilder $container) public function load(array $configs, ContainerBuilder $container)
{ {
$parameters = array( $parameters = array(
'core.adm_relative_path' => $this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/', 'core.adm_relative_path' => $this->config_php->get('phpbb_adm_relative_path') ? $this->config_php->get('phpbb_adm_relative_path') : 'adm/',

6
phpBB/phpbb/di/ordered_service_collection.php
View file

@ -85,13 +85,13 @@ class ordered_service_collection extends service_collection
/** /**
* Adds a service ID to the collection * Adds a service ID to the collection
* *
* @param string $service_id * @param string $name
* @param int $order * @param int $order
*/ */
public function add($service_id, $order = 0) public function add($name, $order = 0)
{ {
$order = (int) $order; $order = (int) $order;
$this->service_ids[$order][] = $service_id; $this->service_ids[$order][] = $name;
$this->is_ordered = false; $this->is_ordered = false;
} }