makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14285] Fix undefined property

Browse source 
PHPBB3-14285
This commit is contained in:
Rubén Calvo 2018-06-30 04:20:43 +02:00 • committed by rubencm
parent 0b136a6231
commit 5707d98682
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/config/default/container/services_storage.yml
View file

@ -87,7 +87,9 @@ services:
storage.controller.avatar: storage.controller.avatar:
class: phpbb\storage\controller\avatar class: phpbb\storage\controller\avatar
arguments: arguments:
- '@cache'
- '@config' - '@config'
- '@dbal.conn'
- '@storage.avatar' - '@storage.avatar'
storage.controller.attachment: storage.controller.attachment:

3
phpBB/phpbb/storage/controller/attachment.php
View file

@ -34,9 +34,6 @@ class attachment extends controller
/** @var content_visibility */ /** @var content_visibility */
protected $content_visibility; protected $content_visibility;
/** @var driver_interface */
protected $db;
/** @var dispatcher */ /** @var dispatcher */
protected $dispatcher; protected $dispatcher;

4
phpBB/phpbb/storage/controller/avatar.php
View file

@ -15,6 +15,7 @@ namespace phpbb\storage\controller;
use phpbb\cache\service; use phpbb\cache\service;
use phpbb\config\config; use phpbb\config\config;
use phpbb\db\driver\driver_interface;
use phpbb\storage\storage; use phpbb\storage\storage;
class avatar extends controller class avatar extends controller
@ -24,10 +25,11 @@ class avatar extends controller
protected $allowed_extensions = ['png', 'gif', 'jpg', 'jpeg']; protected $allowed_extensions = ['png', 'gif', 'jpg', 'jpeg'];
public function __construct(service $cache, config $config, storage $storage) public function __construct(service $cache, config $config, driver_interface $db, storage $storage)
{ {
$this->cache = $cache; $this->cache = $cache;
$this->config = $config; $this->config = $config;
$this->db = $db;
$this->storage = $storage; $this->storage = $storage;
} }

8
phpBB/phpbb/storage/controller/controller.php
View file

@ -13,8 +13,8 @@
namespace phpbb\storage\controller; namespace phpbb\storage\controller;
use phpbb\cache\service; use phpbb\cache\service;
use phpbb\db\driver\driver_interface;
use phpbb\storage\storage; use phpbb\storage\storage;
class controller class controller
@ -23,12 +23,16 @@ class controller
/** @var service */ /** @var service */
protected $cache; protected $cache;
/** @var driver_interface */
protected $db;
/** @var storage */ /** @var storage */
protected $storage; protected $storage;
public function __construct(service $cache, storage $storage) public function __construct(service $cache, driver_interface $db, storage $storage)
{ {
$this->cache = $cache; $this->cache = $cache;
$this->db = $db;
$this->storage = $storage; $this->storage = $storage;
} }