aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Friedman <maf675@gmail.com>2014-03-27 23:27:30 -0700
committerMatt Friedman <maf675@gmail.com>2014-03-27 23:27:30 -0700
commitba9bc9c7dc24e8c21f0c22c9e872214094d94425 (patch)
tree9b950c2094dce5692602b1c138d0d15d9ae579cd
parentc256d7a88d617116e540fb4881605375f4f3e307 (diff)
downloadforums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.tar
forums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.tar.gz
forums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.tar.bz2
forums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.tar.xz
forums-ba9bc9c7dc24e8c21f0c22c9e872214094d94425.zip
[ticket/12311] Use valid composer schema - license - for extensions
http://tracker.phpbb.com/browse/PHPBB3-12311 PHPBB3-12311
Diffstat
-rw-r--r--phpBB/adm/style/acp_ext_details.html4
-rw-r--r--phpBB/language/en/acp/extensions.php2
-rw-r--r--phpBB/phpbb/extension/metadata_manager.php4
-rw-r--r--tests/extension/ext/barfoo/composer.json2
-rw-r--r--tests/extension/ext/vendor/moo/composer.json2
-rw-r--r--tests/extension/ext/vendor2/bar/composer.json2
-rw-r--r--tests/extension/ext/vendor2/foo/composer.json2
-rw-r--r--tests/extension/metadata_manager_test.php12
-rw-r--r--tests/functional/extension_acp_test.php2
-rw-r--r--tests/functional/fixtures/ext/foo/bar/composer.json2
10 files changed, 17 insertions, 17 deletions
diff --git a/phpBB/adm/style/acp_ext_details.html b/phpBB/adm/style/acp_ext_details.html
index 5141acd9fc..6aff4b29cc 100644
--- a/phpBB/adm/style/acp_ext_details.html
+++ b/phpBB/adm/style/acp_ext_details.html
@@ -41,8 +41,8 @@
</dl>
<!-- ENDIF -->
<dl>
- <dt><label>{L_LICENCE}{L_COLON}</label></dt>
- <dd><span id="meta_license">{META_LICENCE}</span></dd>
+ <dt><label>{L_LICENSE}{L_COLON}</label></dt>
+ <dd><span id="meta_license">{META_LICENSE}</span></dd>
</dl>
</fieldset>
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index 409b800ba6..c0000b4d73 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -96,7 +96,7 @@ $lang = array_merge($lang, array(
'HOMEPAGE' => 'Homepage',
'PATH' => 'File Path',
'TIME' => 'Release Time',
- 'LICENCE' => 'Licence',
+ 'LICENSE' => 'License',
'REQUIREMENTS' => 'Requirements',
'PHPBB_VERSION' => 'phpBB Version',
diff --git a/phpBB/phpbb/extension/metadata_manager.php b/phpBB/phpbb/extension/metadata_manager.php
index 66cdb86513..c90445ee09 100644
--- a/phpBB/phpbb/extension/metadata_manager.php
+++ b/phpBB/phpbb/extension/metadata_manager.php
@@ -196,7 +196,7 @@ class metadata_manager
$fields = array(
'name' => '#^[a-zA-Z0-9_\x7f-\xff]{2,}/[a-zA-Z0-9_\x7f-\xff]{2,}$#',
'type' => '#^phpbb-extension$#',
- 'licence' => '#.+#',
+ 'license' => '#.+#',
'version' => '#.+#',
);
@@ -351,7 +351,7 @@ class metadata_manager
'META_HOMEPAGE' => (isset($this->metadata['homepage'])) ? $this->metadata['homepage'] : '',
'META_VERSION' => (isset($this->metadata['version'])) ? htmlspecialchars($this->metadata['version']) : '',
'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_FAIL' => !$this->validate_require_php(),
diff --git a/tests/extension/ext/barfoo/composer.json b/tests/extension/ext/barfoo/composer.json
index 35d5d2a956..d88fd413c9 100644
--- a/tests/extension/ext/barfoo/composer.json
+++ b/tests/extension/ext/barfoo/composer.json
@@ -4,7 +4,7 @@
"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",
+ "license": "GNU GPL v2",
"authors": [{
"name": "John Smith",
"username": "JohnSmith27",
diff --git a/tests/extension/ext/vendor/moo/composer.json b/tests/extension/ext/vendor/moo/composer.json
index 901cb7f17a..b8fc544c01 100644
--- a/tests/extension/ext/vendor/moo/composer.json
+++ b/tests/extension/ext/vendor/moo/composer.json
@@ -4,7 +4,7 @@
"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",
+ "license": "GNU GPL v2",
"authors": [{
"name": "John Smith",
"username": "JohnSmith27",
diff --git a/tests/extension/ext/vendor2/bar/composer.json b/tests/extension/ext/vendor2/bar/composer.json
index 5d60ec031e..215e7d59db 100644
--- a/tests/extension/ext/vendor2/bar/composer.json
+++ b/tests/extension/ext/vendor2/bar/composer.json
@@ -4,7 +4,7 @@
"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",
+ "license": "GPL-2.0",
"authors": [{
"name": "John Smith",
"email": "email@phpbb.com",
diff --git a/tests/extension/ext/vendor2/foo/composer.json b/tests/extension/ext/vendor2/foo/composer.json
index 8821d9d50e..7b2a80f5d3 100644
--- a/tests/extension/ext/vendor2/foo/composer.json
+++ b/tests/extension/ext/vendor2/foo/composer.json
@@ -4,7 +4,7 @@
"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",
+ "license": "GPL-2.0",
"authors": [{
"name": "John Smith",
"email": "email@phpbb.com",
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index a3c4cc89e9..a3584be67b 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -148,13 +148,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
try
{
- $manager->validate('licence');
+ $manager->validate('license');
$this->fail('Exception not triggered');
}
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
@@ -208,7 +208,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->set_metadata(array(
'name' => 'asdf',
'type' => 'asdf',
- 'licence' => '',
+ 'license' => '',
'version' => '',
));
@@ -236,13 +236,13 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
try
{
- $manager->validate('licence');
+ $manager->validate('license');
$this->fail('Exception not triggered');
}
catch(\phpbb\extension\exception $e)
{
- $this->assertEquals((string) $e, 'Meta field \'licence\' is invalid.');
+ $this->assertEquals((string) $e, 'Meta field \'license\' is invalid.');
}
try
@@ -267,7 +267,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
$manager->set_metadata(array(
'name' => 'test/foo',
'type' => 'phpbb-extension',
- 'licence' => 'GPL v2',
+ 'license' => 'GPL v2',
'version' => '1.0.0',
));
diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php
index 53f62c4f19..1d79043eae 100644
--- a/tests/functional/extension_acp_test.php
+++ b/tests/functional/extension_acp_test.php
@@ -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.',
'VERSION' => '1.0.0',
'TIME' => '2012-02-15 01:01:01',
- 'LICENCE' => 'GPL-2.0',
+ 'LICENSE' => 'GPL-2.0',
'PHPBB_VERSION' => '3.1.*@dev',
'PHP_VERSION' => '>=5.3',
'AUTHOR_NAME' => 'John Smith',
diff --git a/tests/functional/fixtures/ext/foo/bar/composer.json b/tests/functional/fixtures/ext/foo/bar/composer.json
index e3e5fc21cd..2f91426d2a 100644
--- a/tests/functional/fixtures/ext/foo/bar/composer.json
+++ b/tests/functional/fixtures/ext/foo/bar/composer.json
@@ -5,7 +5,7 @@
"homepage": "",
"version": "1.0.0",
"time": "2013-03-21 01:01:01",
- "licence": "GPL-2.0",
+ "license": "GPL-2.0",
"authors": [{
"name": "Joas Schilling",
"email": "nickvergessen@phpbb.com",
generated by cgit v1.2.1 (git 2.21.0) at 2025-01-01 12:08:09 +0000