Merge pull request #20 from networkteam/remove-reserved-keyword-in-na…

…mespaces Bugfix: Remove reserved keyword String in class namespaces
networkteam · Nov 28, 2019 · 3260524 · 3260524
2 parents 057ada1 + fdd725a
commit 3260524
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 12 deletions.
diff --git a/Classes/Fusion/ConvertEmailLinksImplementation.php b/Classes/Fusion/ConvertEmailLinksImplementation.php
@@ -19,8 +19,8 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Fusion\FusionObjects\AbstractFusionObject;
 use Networkteam\Neos\MailObfuscator\Exception;
-use Networkteam\Neos\MailObfuscator\String\Converter\EmailLinkNameConverterInterface;
-use Networkteam\Neos\MailObfuscator\String\Converter\MailtoLinkConverterInterface;
+use Networkteam\Neos\MailObfuscator\Converter\EmailLinkNameConverterInterface;
+use Networkteam\Neos\MailObfuscator\Converter\MailtoLinkConverterInterface;
 
 class ConvertEmailLinksImplementation extends AbstractFusionObject
 {

diff --git a/Classes/String/Converter/EmailLinkNameConverterInterface.php b/Classes/String/Converter/EmailLinkNameConverterInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Networkteam\Neos\MailObfuscator\String\Converter;
+namespace Networkteam\Neos\MailObfuscator\Converter;
 
 /*
  * Copyright (C) 2014 networkteam GmbH

diff --git a/Classes/String/Converter/Mailto2HrefObfuscatingConverter.php b/Classes/String/Converter/Mailto2HrefObfuscatingConverter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Networkteam\Neos\MailObfuscator\String\Converter;
+namespace Networkteam\Neos\MailObfuscator\Converter;
 
 /*
  * Copyright (C) 2014 networkteam GmbH

diff --git a/Classes/String/Converter/MailtoLinkConverterInterface.php b/Classes/String/Converter/MailtoLinkConverterInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Networkteam\Neos\MailObfuscator\String\Converter;
+namespace Networkteam\Neos\MailObfuscator\Converter;
 
 /*
  * Copyright (C) 2014 networkteam GmbH

diff --git a/Classes/String/Converter/RewriteAtCharConverter.php b/Classes/String/Converter/RewriteAtCharConverter.php
@@ -1,5 +1,5 @@
 <?php
-namespace Networkteam\Neos\MailObfuscator\String\Converter;
+namespace Networkteam\Neos\MailObfuscator\Converter;
 
 use Neos\Flow\Annotations as Flow;
 

diff --git a/Configuration/Objects.yaml b/Configuration/Objects.yaml
@@ -10,8 +10,8 @@
 # You should have received a copy of the GNU General Public License along with this program; if not, write to the
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-'Networkteam\Neos\MailObfuscator\String\Converter\EmailLinkNameConverterInterface':
-  className: 'Networkteam\Neos\MailObfuscator\String\Converter\RewriteAtCharConverter'
+'Networkteam\Neos\MailObfuscator\Converter\EmailLinkNameConverterInterface':
+  className: 'Networkteam\Neos\MailObfuscator\Converter\RewriteAtCharConverter'
 
-'Networkteam\Neos\MailObfuscator\String\Converter\MailtoLinkConverterInterface':
-  className: 'Networkteam\Neos\MailObfuscator\String\Converter\Mailto2HrefObfuscatingConverter'
+'Networkteam\Neos\MailObfuscator\Converter\MailtoLinkConverterInterface':
+  className: 'Networkteam\Neos\MailObfuscator\Converter\Mailto2HrefObfuscatingConverter'
diff --git a/Migrations/Code/Version20190919145400.php b/Migrations/Code/Version20190919145400.php
@@ -0,0 +1,26 @@
+<?php
+namespace Neos\Flow\Core\Migrations;
+
+/**
+ * Move class names in namespace String because string is a reserved keyword
+ */
+class Version20190919145400 extends \Neos\Flow\Core\Migrations\AbstractMigration
+{
+    /**
+     * @return string
+     */
+    public function getIdentifier()
+    {
+        return 'Networkteam.Neos.MailObfuscator-20190919145400';
+    }
+
+    public function up()
+    {
+        $this->searchAndReplace('Networkteam\Neos\MailObfuscator\String\Converter', 'Networkteam\Neos\MailObfuscator\Converter', ['yaml', 'php', 'fusion']);
+    }
+
+    public function down()
+    {
+        $this->searchAndReplace('Networkteam\Neos\MailObfuscator\Converter', 'Networkteam\Neos\MailObfuscator\String\Converter', ['yaml', 'php', 'fusion']);
+    }
+}
diff --git a/Tests/Unit/Fusion/ConvertEmailLinksImplementationTest.php b/Tests/Unit/Fusion/ConvertEmailLinksImplementationTest.php
@@ -20,8 +20,8 @@
 use Neos\Flow\Tests\UnitTestCase;
 use Neos\Fusion\Core\Runtime;
 use Networkteam\Neos\MailObfuscator\Fusion\ConvertEmailLinksImplementation;
-use Networkteam\Neos\MailObfuscator\String\Converter\Mailto2HrefObfuscatingConverter;
-use Networkteam\Neos\MailObfuscator\String\Converter\RewriteAtCharConverter;
+use Networkteam\Neos\MailObfuscator\Converter\Mailto2HrefObfuscatingConverter;
+use Networkteam\Neos\MailObfuscator\Converter\RewriteAtCharConverter;
 
 class ConvertEmailLinksImplementationTest extends UnitTestCase
 {