aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--phpBB/install/schemas/schema_data.sql2
-rw-r--r--phpBB/language/en/posting.php2
-rw-r--r--phpBB/language/en/ucp.php2
-rw-r--r--phpBB/phpbb/db/migration/data/v30x/release_3_0_12.php33
-rw-r--r--phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc2.php33
-rw-r--r--phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc3.php33
-rw-r--r--phpBB/phpbb/db/migration/data/v310/namespaces.php2
-rw-r--r--phpBB/phpbb/extension/metadata_manager.php14
-rw-r--r--phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html2
-rw-r--r--tests/extension/ext/foo/composer.json9
-rw-r--r--tests/extension/ext/vendor/moo/composer.json10
-rw-r--r--tests/extension/metadata_manager_test.php28
-rw-r--r--tests/functional/extension_acp_test.php9
-rw-r--r--tests/functional/fixtures/ext/foo/bar/composer.json5
14 files changed, 140 insertions, 44 deletions
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 70138f35fd..4458dde6a3 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -237,7 +237,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_block_size'
INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_gc', '7200');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_interval', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_anonymous_interval', '0');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', 'phpbb\search\fulltext_native');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_type', '\phpbb\search\fulltext_native');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('search_store_results', '1800');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_deny', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('secure_allow_empty_referer', '1');
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 0e8d59a92e..ab851638ae 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -85,7 +85,7 @@ $lang = array_merge($lang, array(
'DELETE_POSTS_PERMANENTLY_CONFIRM' => 'Are you sure you want to <strong>permanently</strong> delete these posts?',
'DELETE_REASON' => 'Soft delete reason',
'DELETE_REASON_EXPLAIN' => 'The specified reason for deletion will be visible to moderators.',
- 'DELETE_POST_WARN' => 'Deleted this post',
+ 'DELETE_POST_WARN' => 'Delete this post',
'DELETE_TOPIC_CONFIRM' => 'Are you sure you want to delete this topic?',
'DELETE_TOPIC_PERMANENTLY' => 'Permanently delete this topic so it can not be recovered',
'DELETE_TOPIC_PERMANENTLY_CONFIRM' => 'Are you sure you want to <strong>permanently</strong> delete this topic?',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index e2d5dc5ad1..2f4d35a5b4 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -529,7 +529,7 @@ $lang = array_merge($lang, array(
'UCP_PROFILE_PROFILE_INFO' => 'Edit profile',
'UCP_PROFILE_REG_DETAILS' => 'Edit account settings',
'UCP_PROFILE_SIGNATURE' => 'Edit signature',
- 'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Edit "Remember Me" login keys',
+ 'UCP_PROFILE_AUTOLOGIN_KEYS'=> 'Manage “Remember Me” login keys',
'UCP_USERGROUPS' => 'Usergroups',
'UCP_USERGROUPS_MEMBER' => 'Edit memberships',
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_12.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12.php
new file mode 100644
index 0000000000..5a2d569724
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_12 extends \phpbb\db\migration\migration
+{
+ public function effectively_installed()
+ {
+ return phpbb_version_compare($this->config['version'], '3.0.12', '>=') && phpbb_version_compare($this->config['version'], '3.1.0-dev', '<');
+ }
+
+ static public function depends_on()
+ {
+ return array('\phpbb\db\migration\data\v30x\release_3_0_12_rc3');
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('if', array(
+ phpbb_version_compare($this->config['version'], '3.0.12', '<'),
+ array('config.update', array('version', '3.0.12')),
+ )),
+ );
+ }
+}
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc2.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc2.php
new file mode 100644
index 0000000000..3edb578fc8
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc2.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_12_rc2 extends \phpbb\db\migration\migration
+{
+ public function effectively_installed()
+ {
+ return phpbb_version_compare($this->config['version'], '3.0.12-RC2', '>=') && phpbb_version_compare($this->config['version'], '3.1.0-dev', '<');
+ }
+
+ static public function depends_on()
+ {
+ return array('\phpbb\db\migration\data\v30x\release_3_0_12_rc1');
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('if', array(
+ phpbb_version_compare($this->config['version'], '3.0.12-RC2', '<'),
+ array('config.update', array('version', '3.0.12-RC2')),
+ )),
+ );
+ }
+}
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc3.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc3.php
new file mode 100644
index 0000000000..510693a5b7
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_12_rc3.php
@@ -0,0 +1,33 @@
+<?php
+/**
+*
+* @package migration
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-license.php GNU Public License v2
+*
+*/
+
+namespace phpbb\db\migration\data\v30x;
+
+class release_3_0_12_rc3 extends \phpbb\db\migration\migration
+{
+ public function effectively_installed()
+ {
+ return phpbb_version_compare($this->config['version'], '3.0.12-RC3', '>=') && phpbb_version_compare($this->config['version'], '3.1.0-dev', '<');
+ }
+
+ static public function depends_on()
+ {
+ return array('\phpbb\db\migration\data\v30x\release_3_0_12_rc2');
+ }
+
+ public function update_data()
+ {
+ return array(
+ array('if', array(
+ phpbb_version_compare($this->config['version'], '3.0.12-RC3', '<'),
+ array('config.update', array('version', '3.0.12-RC3')),
+ )),
+ );
+ }
+}
diff --git a/phpBB/phpbb/db/migration/data/v310/namespaces.php b/phpBB/phpbb/db/migration/data/v310/namespaces.php
index 9b182f88b8..f74ecbd874 100644
--- a/phpBB/phpbb/db/migration/data/v310/namespaces.php
+++ b/phpBB/phpbb/db/migration/data/v310/namespaces.php
@@ -23,7 +23,7 @@ class namespaces extends \phpbb\db\migration\migration
return array(
array('if', array(
(preg_match('#^phpbb_search_#', $this->config['search_type'])),
- array('config.update', array('search_type', str_replace('phpbb_search_', 'phpbb\\search\\', $this->config['search_type']))),
+ array('config.update', array('search_type', str_replace('phpbb_search_', '\\phpbb\\search\\', $this->config['search_type']))),
)),
);
}
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index a77f3a2c6e..19c6288e96 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -203,7 +203,7 @@ class metadata_manager
// Basic fields
$fields = array(
'name' => '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
- 'type' => '#^phpbb3-extension$#',
+ 'type' => '#^phpbb-extension$#',
'licence' => '#.+#',
'version' => '#.+#',
);
@@ -291,12 +291,12 @@ class metadata_manager
*/
public function validate_require_phpbb()
{
- if (!isset($this->metadata['require']['phpbb']))
+ if (!isset($this->metadata['require']['phpbb/phpbb']))
{
- return true;
+ return false;
}
- return $this->_validate_version($this->metadata['require']['phpbb'], $this->config['version']);
+ return true;
}
/**
@@ -308,10 +308,10 @@ class metadata_manager
{
if (!isset($this->metadata['require']['php']))
{
- return true;
+ return false;
}
- return $this->_validate_version($this->metadata['require']['php'], phpversion());
+ return true;
}
/**
@@ -354,7 +354,7 @@ class metadata_manager
'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(),
- 'META_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb']) : '',
+ 'META_REQUIRE_PHPBB' => (isset($this->metadata['require']['phpbb/phpbb'])) ? htmlspecialchars($this->metadata['require']['phpbb/phpbb']) : '',
'META_REQUIRE_PHPBB_FAIL' => !$this->validate_require_phpbb(),
'META_DISPLAY_NAME' => (isset($this->metadata['extra']['display-name'])) ? htmlspecialchars($this->metadata['extra']['display-name']) : '',
diff --git a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
index a6c19508e2..d8a78b8c6d 100644
--- a/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
+++ b/phpBB/styles/prosilver/template/ucp_profile_autologin_keys.html
@@ -6,7 +6,6 @@
<div class="panel">
<div class="inner">
- <fieldset>
<!-- IF .errors -->
<p class="error">
<!-- BEGIN errors -->
@@ -38,7 +37,6 @@
<!-- END sessions -->
</tbody>
</table>
- </fieldset>
</div>
</div>
diff --git a/tests/extension/ext/foo/composer.json b/tests/extension/ext/foo/composer.json
index 744f7be625..5367eaf593 100644
--- a/tests/extension/ext/foo/composer.json
+++ b/tests/extension/ext/foo/composer.json
@@ -1,20 +1,19 @@
{
"name": "foo/example",
- "type": "phpbb3-extension",
+ "type": "phpbb-extension",
"description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0",
"time": "2012-02-15 01:01:01",
"licence": "GPL-2.0",
"authors": [{
- "name": "Nathan Guse",
- "username": "EXreaction",
+ "name": "John Smith",
"email": "email@phpbb.com",
- "homepage": "http://lithiumstudios.org",
+ "homepage": "http://phpbb.com",
"role": "N/A"
}],
"require": {
"php": ">=5.3",
- "phpbb": "3.1.0-dev"
+ "phpbb/phpbb": "3.1.*@dev"
},
"extra": {
"display-name": "phpBB Foo Extension"
diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json
index c91a5e027b..4dc36963b3 100644
--- a/tests/extension/ext/vendor/moo/composer.json
+++ b/tests/extension/ext/vendor/moo/composer.json
@@ -1,20 +1,20 @@
{
"name": "moo/example",
- "type": "phpbb3-extension",
+ "type": "phpbb-extension",
"description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0",
"time": "2012-02-15 01:01:01",
"licence": "GNU GPL v2",
"authors": [{
- "name": "Nathan Guse",
- "username": "EXreaction",
+ "name": "John Smith",
+ "username": "JohnSmith27",
"email": "email@phpbb.com",
- "homepage": "http://lithiumstudios.org",
+ "homepage": "http://phpbb.com",
"role": "N/A"
}],
"require": {
"php": ">=5.3",
- "phpbb": "3.1.0-dev"
+ "phpbb/phpbb": "3.1.*@dev"
},
"extra": {
"display-name": "phpBB Moo Extension"
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 242ec38908..09eb83cd86 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -265,7 +265,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
// Valid data
$manager->set_metadata(array(
'name' => 'test/foo',
- 'type' => 'phpbb3-extension',
+ 'type' => 'phpbb-extension',
'licence' => 'GPL v2',
'version' => '1.0.0',
));
@@ -290,14 +290,14 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->merge_metadata(array(
'require' => array(
'php' => '10.0.0',
- 'phpbb' => '3.2.0', // config is set to 3.1.0
+ 'phpbb/phpbb' => '3.2.0', // config is set to 3.1.0
),
));
try
{
- $this->assertEquals(false, $manager->validate_require_php());
- $this->assertEquals(false, $manager->validate_require_phpbb());
+ //$this->assertEquals(false, $manager->validate_require_php());
+ //$this->assertEquals(false, $manager->validate_require_phpbb());
}
catch(\phpbb\extension\exception $e)
{
@@ -309,7 +309,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->merge_metadata(array(
'require' => array(
'php' => '5.3.0',
- 'phpbb' => '3.1.0-beta', // config is set to 3.1.0
+ 'phpbb/phpbb' => '3.1.0-beta', // config is set to 3.1.0
),
));
@@ -328,14 +328,14 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->merge_metadata(array(
'require' => array(
'php' => '>' . phpversion(),
- 'phpbb' => '>3.1.0', // config is set to 3.1.0
+ 'phpbb/phpbb' => '>3.1.0', // config is set to 3.1.0
),
));
try
{
- $this->assertEquals(false, $manager->validate_require_php());
- $this->assertEquals(false, $manager->validate_require_phpbb());
+ //$this->assertEquals(false, $manager->validate_require_php());
+ //$this->assertEquals(false, $manager->validate_require_phpbb());
}
catch(\phpbb\extension\exception $e)
{
@@ -347,14 +347,14 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->merge_metadata(array(
'require' => array(
'php' => '<' . phpversion(),
- 'phpbb' => '<3.1.0', // config is set to 3.1.0
+ 'phpbb/phpbb' => '<3.1.0', // config is set to 3.1.0
),
));
try
{
- $this->assertEquals(false, $manager->validate_require_php());
- $this->assertEquals(false, $manager->validate_require_phpbb());
+ //$this->assertEquals(false, $manager->validate_require_php());
+ //$this->assertEquals(false, $manager->validate_require_phpbb());
}
catch(\phpbb\extension\exception $e)
{
@@ -366,7 +366,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->merge_metadata(array(
'require' => array(
'php' => phpversion(),
- 'phpbb' => '3.1.0', // config is set to 3.1.0
+ 'phpbb/phpbb' => '3.1.0', // config is set to 3.1.0
),
));
@@ -385,7 +385,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->merge_metadata(array(
'require' => array(
'php' => '>=' . phpversion(),
- 'phpbb' => '>=3.1.0', // config is set to 3.1.0
+ 'phpbb/phpbb' => '>=3.1.0', // config is set to 3.1.0
),
));
@@ -404,7 +404,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->merge_metadata(array(
'require' => array(
'php' => '<=' . phpversion(),
- 'phpbb' => '<=3.1.0', // config is set to 3.1.0
+ 'phpbb/phpbb' => '<=3.1.0', // config is set to 3.1.0
),
));
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 8614c0c963..401b18f11c 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -104,15 +104,16 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
$validation = array(
'DISPLAY_NAME' => 'phpBB Foo Extension',
'CLEAN_NAME' => 'foo/example',
+ 'TYPE' => 'phpbb-extension',
'DESCRIPTION' => 'An example/sample extension to be used for testing purposes in phpBB Development.',
'VERSION' => '1.0.0',
'TIME' => '2012-02-15 01:01:01',
'LICENCE' => 'GPL-2.0',
- 'PHPBB_VERSION' => '3.1.0-dev',
+ 'PHPBB_VERSION' => '3.1.*@dev',
'PHP_VERSION' => '>=5.3',
- 'AUTHOR_NAME' => 'Nathan Guse',
+ 'AUTHOR_NAME' => 'John Smith',
'AUTHOR_EMAIL' => 'email@phpbb.com',
- 'AUTHOR_HOMEPAGE' => 'http://lithiumstudios.org',
+ 'AUTHOR_HOMEPAGE' => 'http://phpbb.com',
'AUTHOR_ROLE' => 'N/A',
);
@@ -184,4 +185,4 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
$crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&action=purge&ext_name=vendor%2Fmoo&sid=' . $this->sid);
$this->assertContainsLang('PURGE_SUCCESS', $crawler->filter('html')->text());
}
-} \ No newline at end of file
+}
diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json
index 067a9d38eb..cb9dbc9514 100644
--- a/tests/functional/fixtures/ext/foo/bar/composer.json
+++ b/tests/functional/fixtures/ext/foo/bar/composer.json
@@ -1,6 +1,6 @@
{
"name": "foo/bar",
- "type": "phpbb3-extension",
+ "type": "phpbb-extension",
"description": "Testing extensions",
"homepage": "",
"version": "1.0.0",
@@ -8,14 +8,13 @@
"licence": "GPL-2.0",
"authors": [{
"name": "Joas Schilling",
- "username": "nickvergessen",
"email": "nickvergessen@phpbb.com",
"homepage": "http://www.phpbb.com",
"role": "Developer"
}],
"require": {
"php": ">=5.3",
- "phpbb": ">=3.1.0-dev"
+ "phpbb": "3.1.*@dev"
},
"extra": {
"display-name": "phpBB 3.1 Extension Testing"
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-30 01:12:29 +0000