From 557f1a89d512e6c4f4c96033091ab5b429825e6d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Aug 2015 09:01:29 +0200 Subject: [ticket/13904] Add filespec class to files classes PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 828f9076dd..a1cec843c5 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -1,3 +1,6 @@ services: filesystem: class: phpbb\filesystem\filesystem + + files.filespec: + class: phpbb\files\filespec -- cgit v1.2.1 From c72d6a71bb71b5abeae05b4a6494ffb166624179 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 31 May 2015 14:02:02 +0200 Subject: [ticket/13904] Modify constructor to be instantiatable by container PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index a1cec843c5..64d63776a2 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -4,3 +4,7 @@ services: files.filespec: class: phpbb\files\filespec + arguments: + - @filesystem + - @mimetype.guesser + - @plupload -- cgit v1.2.1 From 92e49cd0acef56b78fda3bcffebb7a0958891b82 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 1 Jun 2015 13:27:29 +0200 Subject: [ticket/13904] Turn filespec into prototype and improve init methods PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 64d63776a2..6f0b10cce1 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -4,6 +4,7 @@ services: files.filespec: class: phpbb\files\filespec + scope: prototype arguments: - @filesystem - @mimetype.guesser -- cgit v1.2.1 From 1af6f052d80e693d289258d490c1187a064093b9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Aug 2015 09:03:55 +0200 Subject: [ticket/13904] Load upload class using factory PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 6f0b10cce1..cd27d0745c 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -9,3 +9,9 @@ services: - @filesystem - @mimetype.guesser - @plupload + + files.upload: + class: phpbb\files\upload + scope: prototype + arguments: + - @filesystem -- cgit v1.2.1 From 57de89628622a80fcb386c0d95724fe4c6148929 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Aug 2015 09:10:05 +0200 Subject: [ticket/13904] Remove unneeded parameters from avatars and fix tests PHPBB3-13904 --- phpBB/config/default/container/services_avatar.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml index 1b0c109298..67a8097e6f 100644 --- a/phpBB/config/default/container/services_avatar.yml +++ b/phpBB/config/default/container/services_avatar.yml @@ -61,10 +61,9 @@ services: - @config - %core.root_path% - %core.php_ext% - - @filesystem - @path_helper - - @mimetype.guesser - @dispatcher + - @files.factory - @cache.driver calls: - [set_name, [avatar.driver.upload]] -- cgit v1.2.1 From f32a94ae5d5df156cc33e34a98d9a2e92385c393 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Aug 2015 09:12:43 +0200 Subject: [ticket/13904] Pass filesystem to upload avatar again PHPBB3-13904 --- phpBB/config/default/container/services_avatar.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml index 67a8097e6f..76057cf5a7 100644 --- a/phpBB/config/default/container/services_avatar.yml +++ b/phpBB/config/default/container/services_avatar.yml @@ -61,6 +61,7 @@ services: - @config - %core.root_path% - %core.php_ext% + - @filesystem - @path_helper - @dispatcher - @files.factory -- cgit v1.2.1 From eb11973ea8af41623a9e6e6c320cb1fb0df7a222 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Aug 2015 09:13:27 +0200 Subject: [ticket/13904] Use factory instead of container and add factory to services PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index cd27d0745c..8f3357022c 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -2,6 +2,11 @@ services: filesystem: class: phpbb\filesystem\filesystem + files.factory: + class: phpbb\files\factory + arguments: + - @service_container + files.filespec: class: phpbb\files\filespec scope: prototype @@ -15,3 +20,4 @@ services: scope: prototype arguments: - @filesystem + - @files.factory -- cgit v1.2.1 From 0121e60cd73963043047e1b29b8d94ea9aa684e3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 2 Jun 2015 13:33:10 +0200 Subject: [ticket/13904] Use language class instead of user global in upload PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 8f3357022c..c275b3f205 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -21,3 +21,4 @@ services: arguments: - @filesystem - @files.factory + - @language -- cgit v1.2.1 From 697ac5f4aa151b06ed65f8352652443bf297682a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 2 Jun 2015 15:06:24 +0200 Subject: [ticket/13904] Use language class instead of global user in filespec PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index c275b3f205..aabb5583d1 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -12,6 +12,7 @@ services: scope: prototype arguments: - @filesystem + - @language - @mimetype.guesser - @plupload -- cgit v1.2.1 From 47f8f2cc88bdcd40087c8e391be1d33d36a2d308 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 2 Jun 2015 15:24:38 +0200 Subject: [ticket/13904] Pass request service to upload instead of using global PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index aabb5583d1..f780441b65 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -23,3 +23,4 @@ services: - @filesystem - @files.factory - @language + - @request -- cgit v1.2.1 From b871dbcf1f2d0483cbe19cddf94a5bdc9659ab00 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 2 Jun 2015 15:46:41 +0200 Subject: [ticket/13904] Remove phpbb_root_path global from filespec class PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index f780441b65..d30037a4e5 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -13,6 +13,7 @@ services: arguments: - @filesystem - @language + - %core.root_path% - @mimetype.guesser - @plupload @@ -24,3 +25,4 @@ services: - @files.factory - @language - @request + - %core.root_path% -- cgit v1.2.1 From 11b2c938c6c3a6a14465f04ed356fbd013276143 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 14 Jul 2015 16:15:39 +0200 Subject: [ticket/13904] Move form_upload to its own class and define type classes PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index d30037a4e5..d884b76a34 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -26,3 +26,10 @@ services: - @language - @request - %core.root_path% + + files.types.form: + class: phpbb\files\types\form + arguments: + - @files.factory + - @plupload + - @request -- cgit v1.2.1 From adcc901af181b6727dd7af89a3926c9923a58471 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 15 Jul 2015 16:08:20 +0200 Subject: [ticket/13904] Fix minor issues and move local_upload to its own class PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index d884b76a34..d043954f93 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -29,7 +29,17 @@ services: files.types.form: class: phpbb\files\types\form + scope: prototype arguments: - @files.factory + - @language - @plupload - @request + + files.types.local: + class: phpbb\files\types\form + scope: prototype + arguments: + - @files.factory + - @language + - @request -- cgit v1.2.1 From 57ccfe0c483254e54b7b40bc1906ef946daf4f55 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 15 Jul 2015 18:00:52 +0200 Subject: [ticket/13904] Move remote upload to its own type class PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index d043954f93..4c353ccfa9 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -43,3 +43,11 @@ services: - @files.factory - @language - @request + + files.types.remote: + class: phpbb\files\types\remote + scope: prototype + arguments: + - @files.factory + - @language + - @request -- cgit v1.2.1 From a09c6d1fb760151b1a6c654b597b4578c3136be1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 15 Jul 2015 23:10:23 +0200 Subject: [ticket/13904] Split code up and pass root path to remote upload type PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 4c353ccfa9..e193dad4ea 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -51,3 +51,4 @@ services: - @files.factory - @language - @request + - %core.root_path% -- cgit v1.2.1 From cdde86ce7e0c594fad5992789b3fae466bd526cc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 26 Aug 2015 13:57:42 +0200 Subject: [ticket/13904] Use \phpbb\php\ini class for ini_get() PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index e193dad4ea..7237c5d318 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -12,6 +12,7 @@ services: scope: prototype arguments: - @filesystem + - @php_ini - @language - %core.root_path% - @mimetype.guesser @@ -23,6 +24,7 @@ services: arguments: - @filesystem - @files.factory + - @php_ini - @language - @request - %core.root_path% -- cgit v1.2.1 From 36545d5cbe7188efbedf2e1f44b1a7b9617b50c1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 26 Aug 2015 16:18:10 +0200 Subject: [ticket/13904] Switch around constructor arguments PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 7237c5d318..25cd532ae3 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -12,8 +12,8 @@ services: scope: prototype arguments: - @filesystem - - @php_ini - @language + - @php_ini - %core.root_path% - @mimetype.guesser - @plupload @@ -24,8 +24,8 @@ services: arguments: - @filesystem - @files.factory - - @php_ini - @language + - @php_ini - @request - %core.root_path% -- cgit v1.2.1 From 16f3b8c2b9de388223cbe8ace9e1d9bcf0ba5e11 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 27 Aug 2015 10:51:10 +0200 Subject: [ticket/13904] Modify files for changes in ini wrapper PHPBB3-13904 --- phpBB/config/default/container/services_php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_php.yml b/phpBB/config/default/container/services_php.yml index 8aabc7341f..29349960f3 100644 --- a/phpBB/config/default/container/services_php.yml +++ b/phpBB/config/default/container/services_php.yml @@ -1,3 +1,3 @@ services: php_ini: - class: phpbb\php\ini + class: bantu\IniGetWrapper\IniGetWrapper -- cgit v1.2.1 From b29b62debe4077ec688ebee9e9363db2c8614dd5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 27 Aug 2015 12:48:06 +0200 Subject: [ticket/13904] Use ini_get() wrapper in file upload types PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index 25cd532ae3..a4136a0573 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -35,6 +35,7 @@ services: arguments: - @files.factory - @language + - @php_ini - @plupload - @request @@ -44,6 +45,7 @@ services: arguments: - @files.factory - @language + - @php_ini - @request files.types.remote: @@ -52,5 +54,6 @@ services: arguments: - @files.factory - @language + - @php_ini - @request - %core.root_path% -- cgit v1.2.1 From 591995267a3f1931131fa630bd3ff120476f881f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 3 Sep 2015 17:20:54 +0200 Subject: [ticket/13904] Improve test coverage of filespec class PHPBB3-13904 --- phpBB/config/default/container/services_files.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'phpBB/config') diff --git a/phpBB/config/default/container/services_files.yml b/phpBB/config/default/container/services_files.yml index a4136a0573..cfdade37df 100644 --- a/phpBB/config/default/container/services_files.yml +++ b/phpBB/config/default/container/services_files.yml @@ -14,6 +14,7 @@ services: - @filesystem - @language - @php_ini + - @upload_imagesize - %core.root_path% - @mimetype.guesser - @plupload -- cgit v1.2.1