Merge remote-tracking branch 'origin/develop-3.2.x'

Author: iMattPro

.travis.yml

@@ -5,12 +5,10 @@ language: php
 
 matrix:
   include:
-    - php: 5.3.3
-      env: DB=mysqli
-    - php: 5.3
-      env: DB=mysqli # MyISAM
     - php: 5.4
-      env: DB=mysqli
+      env: DB=none;NOTESTS=1
+    - php: 5.4
+      env: DB=mysqli #myisam
     - php: 5.4
       env: DB=mysql
     - php: 5.4
@@ -23,6 +21,10 @@ matrix:
       env: DB=mysqli
     - php: 5.6
       env: DB=mysqli
+    - php: 7.0
+      env: DB=mysqli
+    - php: 7.1
+      env: DB=mysqli
     - php: hhvm
       env: DB=mysqli
   allow_failures:
@@ -35,7 +37,7 @@ env:
     - SNIFF="1"        # Should we run code sniffer on your code?
     - IMAGE_ICC="1"    # Should we run icc profile sniffer on your images?
     - EPV="1"          # Should we run EPV (Extension Pre Validator) on your code?
-    - PHPBB_BRANCH="3.1.x"
+    - PHPBB_BRANCH="3.2.x"
 
 branches:
   only:
@@ -49,14 +51,14 @@ install:
   - travis/prepare-phpbb.sh $EXTNAME $PHPBB_BRANCH
   - cd ../../phpBB3
   - travis/prepare-extension.sh $EXTNAME $PHPBB_BRANCH
-  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION
-  - ../phpbb-extensions/pages/travis/prepare-epv.sh $EPV $DB $TRAVIS_PHP_VERSION
+  - travis/setup-phpbb.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
+  - ../phpbb-extensions/pages/travis/prepare-epv.sh $EPV $NOTESTS
 
 before_script:
-  - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION
+  - travis/setup-database.sh $DB $TRAVIS_PHP_VERSION $NOTESTS
 
 script:
-  - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME; fi"
-  - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION; fi"
-  - phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php
-  - sh -c "if [ '$EPV' != '0' ] && [ '$TRAVIS_PHP_VERSION' = '5.5' ] && [ '$DB' = 'mysqli' ]; then phpBB/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
+  - sh -c "if [ '$SNIFF' != '0' ]; then travis/ext-sniff.sh $DB $TRAVIS_PHP_VERSION $EXTNAME $NOTESTS; fi"
+  - sh -c "if [ '$IMAGE_ICC' != '0' ]; then travis/check-image-icc-profiles.sh $DB $TRAVIS_PHP_VERSION $NOTESTS; fi"
+  - sh -c "if [ '$EPV' != '0' ] && [ '$NOTESTS' = '1' ]; then phpBB/vendor/bin/EPV.php run --dir='phpBB/ext/$EXTNAME/'; fi"
+  - sh -c "if [ '$NOTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration phpBB/ext/$EXTNAME/travis/phpunit-$DB-travis.xml --bootstrap ./tests/bootstrap.php; fi"

acp/pages_module.php

@@ -16,10 +16,13 @@ class pages_module
 
 	public function main($id, $mode)
 	{
-		global $cache, $phpbb_container, $request, $user;
+		global $cache, $phpbb_container, $request;
+
+		/** @var \phpbb\language\language $lang */
+		$lang = $phpbb_container->get('language');
 
 		// Add the pages ACP lang file
-		$user->add_lang_ext('phpbb/pages', 'pages_acp');
+		$lang->add_lang('pages_acp', 'phpbb/pages');
 
 		// Get an instance of the admin controller
 		$admin_controller = $phpbb_container->get('phpbb.pages.admin.controller');
@@ -35,14 +38,14 @@ public function main($id, $mode)
 		$this->tpl_name = 'manage_pages';
 
 		// Set the page title for our ACP page
-		$this->page_title = $user->lang('ACP_PAGES_MANAGE');
+		$this->page_title = $lang->lang('ACP_PAGES_MANAGE');
 
 		// Perform any actions submitted by the user
 		switch ($action)
 		{
 			case 'add':
 				// Set the page title for our ACP page
-				$this->page_title = $user->lang('ACP_PAGES_CREATE_PAGE');
+				$this->page_title = $lang->lang('ACP_PAGES_CREATE_PAGE');
 
 				// Load the add page handle in the admin controller
 				$admin_controller->add_page();
@@ -53,7 +56,7 @@ public function main($id, $mode)
 
 			case 'edit':
 				// Set the page title for our ACP page
-				$this->page_title = $user->lang('ACP_PAGES_EDIT_PAGE');
+				$this->page_title = $lang->lang('ACP_PAGES_EDIT_PAGE');
 
 				// Load the edit page handle in the admin controller
 				$admin_controller->edit_page($page_id);
@@ -72,7 +75,7 @@ public function main($id, $mode)
 				else
 				{
 					// Request confirmation from the user to delete the page
-					confirm_box(false, $user->lang('ACP_PAGES_DELETE_CONFIRM'), build_hidden_fields(array(
+					confirm_box(false, $lang->lang('ACP_PAGES_DELETE_CONFIRM'), build_hidden_fields(array(
 						'page_id'	=> $page_id,
 						'mode'		=> $mode,
 						'action'	=> $action,

composer.json

@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "An extension which allows you to add static pages to your phpBB forum",
 	"homepage": "https://www.phpbb.com",
-	"version": "1.0.5-dev",
+	"version": "2.0.0-dev",
 	"keywords": ["phpbb", "extension", "static", "pages"],
 	"license": "GPL-2.0",
 	"authors": [
@@ -19,6 +19,11 @@
 			"homepage": "http://michaelcullum.com",
 			"role": "Extensions Team Consultant"
 		},
+		{
+			"name": "Tristan Darricau",
+			"email": "phpbb@nicofuma.fr",
+			"role": "Extensions Team Consultant"
+		},
 		{
 			"name": "Matt Friedman",
 			"homepage": "http://mattfriedman.me",
@@ -44,7 +49,8 @@
 		}
 	],
 	"require": {
-		"php": ">=5.3.3",
+		"php": ">=5.4",
+		"phpbb/phpbb": ">=3.2.0@dev",
 		"composer/installers": "~1.0"
 	},
 	"require-dev": {
@@ -53,7 +59,7 @@
 	"extra": {
 		"display-name": "Pages",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.1.3,<3.3.0@dev"
+			"phpbb/phpbb": ">=3.2.0@dev,<3.3.0@dev"
 		},
 		"version-check": {
 			"host": "www.phpbb.com",

composer.lock

@@ -1,3 +1,9 @@
+# Dynamic routing for Pages 2.0.x
+phpbb_pages_dynamic_controller:
+    resource: phpbb_pages_new_controller # can be any name, it is not used, but must be present
+    type: phpbb_pages_route
+
+# Legacy routing from Pages 1.0.x, for backwards compatibility
 phpbb_pages_main_controller:
     path: /page/{route}
     defaults: { _controller: phpbb.pages.controller:display }

config/routing.yml

@@ -5,7 +5,9 @@ services:
     phpbb.pages.admin.controller:
         class: phpbb\pages\controller\admin_controller
         arguments:
+            - '@cache.driver'
             - '@controller.helper'
+            - '@language'
             - '@log'
             - '@phpbb.pages.operator'
             - '@request'
@@ -22,6 +24,7 @@ services:
             - '@auth'
             - '@service_container'
             - '@controller.helper'
+            - '@language'
             - '@template'
             - '@user'
 
@@ -30,6 +33,7 @@ services:
         arguments:
             - '@auth'
             - '@controller.helper'
+            - '@language'
             - '@phpbb.pages.operator'
             - '@template'
             - '@user'
@@ -40,13 +44,13 @@ services:
 
     phpbb.pages.entity:
         class: phpbb\pages\entity\page
-        scope: prototype # scope MUST be prototype for this to work!
+        shared: false # service MUST not be shared for this to work!
         arguments:
             - '@dbal.conn'
             - '@config'
             - '@dispatcher'
             - '%phpbb.pages.tables.pages%'
-            - '@?text_formatter.utils' # optional to allow bc with phpBB 3.1
+            - '@text_formatter.utils'
 
     phpbb.pages.operator:
         class: phpbb\pages\operators\page
@@ -58,3 +62,35 @@ services:
             - '%phpbb.pages.tables.pages%'
             - '%phpbb.pages.tables.pages_links%'
             - '%phpbb.pages.tables.pages_pages_links%'
+
+    phpbb.pages.routing.loader:
+        class: phpbb\pages\routing\page_loader
+        arguments:
+            - '@dbal.conn'
+            - '%phpbb.pages.tables.pages%'
+        tags:
+            - { name: routing.loader }
+
+    phpbb.pages.text_reparser.page_text:
+        class: phpbb\pages\textreparser\plugins\pages_text
+        arguments:
+            - '@dbal.conn'
+            - '%phpbb.pages.tables.pages%'
+        calls:
+            - [set_name, [phpbb_pages_text]]
+        tags:
+            - { name: text_reparser.plugin }
+
+    phpbb.pages.cron.task.text_reparser:
+        class: phpbb\cron\task\text_reparser\reparser
+        arguments:
+            - '@config'
+            - '@config_text'
+            - '@text_reparser.lock'
+            - '@text_reparser.manager'
+            - '@text_reparser_collection'
+        calls:
+            - [set_name, [cron.task.text_reparser.phpbb_pages]]
+            - [set_reparser, [phpbb.pages.text_reparser.page_text]]
+        tags:
+            - { name: cron.task }