From 3842d2bf97294c748ecc34472d8dbd20d8927f4c Mon Sep 17 00:00:00 2001 From: nmaillat Date: Tue, 16 Jan 2018 18:09:21 +0100 Subject: [PATCH 1/5] PHRAS-1798 update version number and the name --- lib/Alchemy/Phrasea/Core/Version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php index bd4bf283d1..1fbafcb5b7 100644 --- a/lib/Alchemy/Phrasea/Core/Version.php +++ b/lib/Alchemy/Phrasea/Core/Version.php @@ -16,12 +16,12 @@ class Version /** * @var string */ - private $number = '4.0.0-alpha.8'; + private $number = '4.1.0-alpha.9'; /** * @var string */ - private $name = 'Itemirus'; + private $name = 'Buxus'; /** * @return string From 81feec6bea737f7a8ef6d5c23e25b63abd8d04b9 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Tue, 16 Jan 2018 21:37:35 +0100 Subject: [PATCH 2/5] PHRAS-1798 fix test change maximum-phraseanet-version --- .../Tests/Phrasea/Plugin/Fixtures/manifest-good-big.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/manifest-good-big.json b/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/manifest-good-big.json index 00f3dfb5ce..27c614ca91 100644 --- a/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/manifest-good-big.json +++ b/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/manifest-good-big.json @@ -18,7 +18,7 @@ "license" : "MIT", "version" : "0.1", "minimum-phraseanet-version": "3.8", - "maximum-phraseanet-version": "4.1", + "maximum-phraseanet-version": "4.2", "services" : [ { "class": "Vendor\\PluginService" From 9cf6f5a06027d478e3c9a6795939d0fa0a6978ff Mon Sep 17 00:00:00 2001 From: nmaillat Date: Wed, 17 Jan 2018 10:02:39 +0100 Subject: [PATCH 3/5] PHRAS-1798 fix test bis, change maximum-phraseanet-version --- .../Phrasea/Plugin/Fixtures/PluginDir/TestPlugin/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/PluginDir/TestPlugin/manifest.json b/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/PluginDir/TestPlugin/manifest.json index 99a7fa04cd..cf8ee1c36a 100644 --- a/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/PluginDir/TestPlugin/manifest.json +++ b/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/PluginDir/TestPlugin/manifest.json @@ -13,7 +13,7 @@ "license" : "MIT", "version" : "0.1", "minimum-phraseanet-version": "3.8", - "maximum-phraseanet-version": "4.1", + "maximum-phraseanet-version": "4.2", "twig-paths": ["views", "twig-views"], "services" : [ { From 575bf525b5984b2c19e8bedc6a1a2d7a2561f78f Mon Sep 17 00:00:00 2001 From: nmaillat Date: Wed, 17 Jan 2018 17:39:50 +0100 Subject: [PATCH 4/5] PHRAS-1798 fix test ter --- .../Fixtures/PluginDirInstalled/test-plugin/manifest.json | 2 +- tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/PluginDirInstalled/test-plugin/manifest.json b/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/PluginDirInstalled/test-plugin/manifest.json index 0ae2c75993..72878ee922 100644 --- a/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/PluginDirInstalled/test-plugin/manifest.json +++ b/tests/Alchemy/Tests/Phrasea/Plugin/Fixtures/PluginDirInstalled/test-plugin/manifest.json @@ -13,7 +13,7 @@ "license" : "MIT", "version" : "0.1", "minimum-phraseanet-version": "3.8", - "maximum-phraseanet-version": "4.1", + "maximum-phraseanet-version": "4.2", "twig-paths": ["views", "twig-views"], "services" : [ { diff --git a/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php b/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php index 09f44d7e18..025c77f1fd 100644 --- a/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php +++ b/tests/Alchemy/Tests/Phrasea/Setup/ConfigurationTesterTest.php @@ -97,7 +97,7 @@ class ConfigurationTesterTest extends AbstractSetupTester // Must return version + 1 $app['phraseanet.version']->expects($this->any()) ->method('getNumber') - ->will($this->returnValue('4.1')); + ->will($this->returnValue('4.2')); $tester = $this->getTester($app); @@ -138,7 +138,7 @@ class ConfigurationTesterTest extends AbstractSetupTester */ $app['phraseanet.version']->expects($this->any()) ->method('getNumber') - ->will($this->returnValue('4.1')); + ->will($this->returnValue('4.2')); $tester = $this->getTester($app); From b564ef350b7c4493777403b60a0aeb70bd3bb799 Mon Sep 17 00:00:00 2001 From: nmaillat Date: Wed, 17 Jan 2018 18:32:44 +0100 Subject: [PATCH 5/5] PHRAS-1798 name and version fix test last --- tests/Alchemy/Tests/Phrasea/Plugin/Schema/ManifestTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Alchemy/Tests/Phrasea/Plugin/Schema/ManifestTest.php b/tests/Alchemy/Tests/Phrasea/Plugin/Schema/ManifestTest.php index e2628a92f6..c55b9cebec 100644 --- a/tests/Alchemy/Tests/Phrasea/Plugin/Schema/ManifestTest.php +++ b/tests/Alchemy/Tests/Phrasea/Plugin/Schema/ManifestTest.php @@ -27,7 +27,7 @@ class ManifestTest extends \PhraseanetTestCase $this->assertEquals('MIT', $manifest->getLicense()); $this->assertEquals('0.1', $manifest->getVersion()); $this->assertEquals('3.8', $manifest->getMinimumPhraseanetVersion()); - $this->assertEquals('4.1', $manifest->getMaximumPhraseanetVersion()); + $this->assertEquals('4.2', $manifest->getMaximumPhraseanetVersion()); $this->assertEquals(['views', 'twig-views'], $manifest->getTwigPaths()); $this->assertEquals([['class' => 'Vendor\CustomCommand']], $manifest->getCommands()); $this->assertEquals([['class' => 'Vendor\PluginService']], $manifest->getServices());