mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 21:44:57 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'vsephpbb/ticket/12311' into develop-ascraeus

Browse Source 
* vsephpbb/ticket/12311:
  [ticket/12311] Use British-English spelling of licence in lang file
  [ticket/12311] Use valid composer schema - license - for extensions
This commit is contained in:
Joas Schilling 2014-03-28 17:29:56 +01:00
commit ce6e3966cf
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/adm/style/acp_ext_details.html
View File

@ -41,8 +41,8 @@
</dl> </dl>
<!-- ENDIF --> <!-- ENDIF -->
<dl> <dl>
<dt><label>{L_LICENCE}{L_COLON}</label></dt> <dt><label>{L_LICENSE}{L_COLON}</label></dt>
<dd><span id="meta_license">{META_LICENCE}</span></dd> <dd><span id="meta_license">{META_LICENSE}</span></dd>
</dl> </dl>
</fieldset> </fieldset>

2
phpBB/language/en/acp/extensions.php
View File

@ -96,7 +96,7 @@ $lang = array_merge($lang, array(
'HOMEPAGE' => 'Homepage', 'HOMEPAGE' => 'Homepage',
'PATH' => 'File Path', 'PATH' => 'File Path',
'TIME' => 'Release Time', 'TIME' => 'Release Time',
'LICENCE' => 'Licence', 'LICENSE' => 'Licence',
'REQUIREMENTS' => 'Requirements', 'REQUIREMENTS' => 'Requirements',
'PHPBB_VERSION' => 'phpBB Version', 'PHPBB_VERSION' => 'phpBB Version',

4
phpBB/phpbb/extension/metadata_manager.php
View File

@ -196,7 +196,7 @@ class metadata_manager
$fields = array( $fields = array(
'name' => '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#', 'name' => '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
'type' => '#^phpbb-extension$#', 'type' => '#^phpbb-extension$#',
'licence' => '#.+#', 'license' => '#.+#',
'version' => '#.+#', 'version' => '#.+#',
); );
@ -351,7 +351,7 @@ class metadata_manager
'META_HOMEPAGE' => (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '', 'META_HOMEPAGE' => (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '',
'META_VERSION' => (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '', 'META_VERSION' => (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '',
'META_TIME' => (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '', 'META_TIME' => (isset($this->metadata['time'])) ? htmlspecialchars($this->metadata['time']) : '',
'META_LICENCE' => htmlspecialchars($this->metadata['licence']), 'META_LICENSE' => htmlspecialchars($this->metadata['license']),
'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '', 'META_REQUIRE_PHP' => (isset($this->metadata['require']['php'])) ? htmlspecialchars($this->metadata['require']['php']) : '',
'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(), 'META_REQUIRE_PHP_FAIL' => !$this->validate_require_php(),

2
tests/extension/ext/barfoo/composer.json
View File

@ -4,7 +4,7 @@
"description": "An example/sample extension to be used for testing purposes in phpBB Development.", "description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0", "version": "1.0.0",
"time": "2012-02-15 01:01:01", "time": "2012-02-15 01:01:01",
"licence": "GNU GPL v2", "license": "GNU GPL v2",
"authors": [{ "authors": [{
"name": "John Smith", "name": "John Smith",
"username": "JohnSmith27", "username": "JohnSmith27",

2
tests/extension/ext/vendor/moo/composer.json vendored
View File

@ -4,7 +4,7 @@
"description": "An example/sample extension to be used for testing purposes in phpBB Development.", "description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0", "version": "1.0.0",
"time": "2012-02-15 01:01:01", "time": "2012-02-15 01:01:01",
"licence": "GNU GPL v2", "license": "GNU GPL v2",
"authors": [{ "authors": [{
"name": "John Smith", "name": "John Smith",
"username": "JohnSmith27", "username": "JohnSmith27",

2
tests/extension/ext/vendor2/bar/composer.json
View File

@ -4,7 +4,7 @@
"description": "An example/sample extension to be used for testing purposes in phpBB Development.", "description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0", "version": "1.0.0",
"time": "2012-02-15 01:01:01", "time": "2012-02-15 01:01:01",
"licence": "GPL-2.0", "license": "GPL-2.0",
"authors": [{ "authors": [{
"name": "John Smith", "name": "John Smith",
"email": "email@phpbb.com", "email": "email@phpbb.com",

2
tests/extension/ext/vendor2/foo/composer.json
View File

@ -4,7 +4,7 @@
"description": "An example/sample extension to be used for testing purposes in phpBB Development.", "description": "An example/sample extension to be used for testing purposes in phpBB Development.",
"version": "1.0.0", "version": "1.0.0",
"time": "2012-02-15 01:01:01", "time": "2012-02-15 01:01:01",
"licence": "GPL-2.0", "license": "GPL-2.0",
"authors": [{ "authors": [{
"name": "John Smith", "name": "John Smith",
"email": "email@phpbb.com", "email": "email@phpbb.com",

12
tests/extension/metadata_manager_test.php
View File

@ -148,13 +148,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
try try
{ {
$manager->validate('licence'); $manager->validate('license');
$this->fail('Exception not triggered'); $this->fail('Exception not triggered');
} }
catch(\phpbb\extension\exception $e) catch(\phpbb\extension\exception $e)
{ {
$this->assertEquals((string) $e, 'Required meta field \'licence\' has not been set.'); $this->assertEquals((string) $e, 'Required meta field \'license\' has not been set.');
} }
try try
@ -208,7 +208,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->set_metadata(array( $manager->set_metadata(array(
'name' => 'asdf', 'name' => 'asdf',
'type' => 'asdf', 'type' => 'asdf',
'licence' => '', 'license' => '',
'version' => '', 'version' => '',
)); ));
@ -236,13 +236,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
try try
{ {
$manager->validate('licence'); $manager->validate('license');
$this->fail('Exception not triggered'); $this->fail('Exception not triggered');
} }
catch(\phpbb\extension\exception $e) catch(\phpbb\extension\exception $e)
{ {
$this->assertEquals((string) $e, 'Meta field \'licence\' is invalid.'); $this->assertEquals((string) $e, 'Meta field \'license\' is invalid.');
} }
try try
@ -267,7 +267,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->set_metadata(array( $manager->set_metadata(array(
'name' => 'test/foo', 'name' => 'test/foo',
'type' => 'phpbb-extension', 'type' => 'phpbb-extension',
'licence' => 'GPL v2', 'license' => 'GPL v2',
'version' => '1.0.0', 'version' => '1.0.0',
)); ));

2
tests/functional/extension_acp_test.php
View File

@ -116,7 +116,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case
'DESCRIPTION' => 'An example/sample extension to be used for testing purposes in phpBB Development.', 'DESCRIPTION' => 'An example/sample extension to be used for testing purposes in phpBB Development.',
'VERSION' => '1.0.0', 'VERSION' => '1.0.0',
'TIME' => '2012-02-15 01:01:01', 'TIME' => '2012-02-15 01:01:01',
'LICENCE' => 'GPL-2.0', 'LICENSE' => 'GPL-2.0',
'PHPBB_VERSION' => '3.1.*@dev', 'PHPBB_VERSION' => '3.1.*@dev',
'PHP_VERSION' => '>=5.3', 'PHP_VERSION' => '>=5.3',
'AUTHOR_NAME' => 'John Smith', 'AUTHOR_NAME' => 'John Smith',

2
tests/functional/fixtures/ext/foo/bar/composer.json
View File

@ -5,7 +5,7 @@
"homepage": "", "homepage": "",
"version": "1.0.0", "version": "1.0.0",
"time": "2013-03-21 01:01:01", "time": "2013-03-21 01:01:01",
"licence": "GPL-2.0", "license": "GPL-2.0",
"authors": [{ "authors": [{
"name": "Joas Schilling", "name": "Joas Schilling",
"email": "nickvergessen@phpbb.com", "email": "nickvergessen@phpbb.com",