From f73805a6d132178bf7c77c246128ae4899824e42 Mon Sep 17 00:00:00 2001 From: Erika Gili Date: Sat, 29 Aug 2020 15:47:31 +0200 Subject: [PATCH 1/2] Fixed the Emphasis.php namespace to comply with PSR-4 rules --- src/Element/Emphasis.php | 2 +- src/Specification/Alexa.php | 2 +- src/Traits/EmphasisTrait.php | 2 +- tests/src/Element/EmphasisTest.php | 2 +- tests/src/Element/LangTest.php | 2 +- tests/src/Element/ProsodyTest.php | 2 +- tests/src/Traits/EmphasisTraitTest.php | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Element/Emphasis.php b/src/Element/Emphasis.php index 1b1deac..c57051b 100644 --- a/src/Element/Emphasis.php +++ b/src/Element/Emphasis.php @@ -8,7 +8,7 @@ * Written by Benjamin Ansbach , 2019 */ declare(strict_types = 1); -namespace Techworker\Ssml\Element\Amazon; +namespace Techworker\Ssml\Element; use Techworker\Ssml\ContainerElement; diff --git a/src/Specification/Alexa.php b/src/Specification/Alexa.php index 09fab28..f685595 100644 --- a/src/Specification/Alexa.php +++ b/src/Specification/Alexa.php @@ -12,7 +12,7 @@ namespace Techworker\Ssml\Specification; use Techworker\Ssml\BaseElement; -use Techworker\Ssml\Element\Amazon\Emphasis; +use Techworker\Ssml\Element\Emphasis; use Techworker\Ssml\Element\Lang; use Techworker\Ssml\Element\Audio; use Techworker\Ssml\Element\Break_; diff --git a/src/Traits/EmphasisTrait.php b/src/Traits/EmphasisTrait.php index 6801a80..89c3cd7 100644 --- a/src/Traits/EmphasisTrait.php +++ b/src/Traits/EmphasisTrait.php @@ -11,7 +11,7 @@ namespace Techworker\Ssml\Traits; use Techworker\Ssml\ContainerElement; -use Techworker\Ssml\Element\Amazon\Emphasis; +use Techworker\Ssml\Element\Emphasis; /** * Class EmphasisTrait diff --git a/tests/src/Element/EmphasisTest.php b/tests/src/Element/EmphasisTest.php index e0cbe87..58599ae 100644 --- a/tests/src/Element/EmphasisTest.php +++ b/tests/src/Element/EmphasisTest.php @@ -11,7 +11,7 @@ namespace Techworker\Ssml\Tests\Element; -use Techworker\Ssml\Element\Amazon\Emphasis; +use Techworker\Ssml\Element\Emphasis; use Techworker\Ssml\Tests\TestCase; class EmphasisTest extends TestCase diff --git a/tests/src/Element/LangTest.php b/tests/src/Element/LangTest.php index d473983..0553b5f 100644 --- a/tests/src/Element/LangTest.php +++ b/tests/src/Element/LangTest.php @@ -11,7 +11,7 @@ namespace Techworker\Ssml\Tests\Element; -use Techworker\Ssml\Element\Amazon\Emphasis; +use Techworker\Ssml\Element\Emphasis; use Techworker\Ssml\Element\Lang; use Techworker\Ssml\Tests\TestCase; diff --git a/tests/src/Element/ProsodyTest.php b/tests/src/Element/ProsodyTest.php index e13488f..a0df581 100644 --- a/tests/src/Element/ProsodyTest.php +++ b/tests/src/Element/ProsodyTest.php @@ -11,7 +11,7 @@ namespace Techworker\Ssml\Tests\Element; -use Techworker\Ssml\Element\Amazon\Emphasis; +use Techworker\Ssml\Element\Emphasis; use Techworker\Ssml\Element\Lang; use Techworker\Ssml\Element\Prosody; use Techworker\Ssml\Tests\TestCase; diff --git a/tests/src/Traits/EmphasisTraitTest.php b/tests/src/Traits/EmphasisTraitTest.php index c06e8d5..fe98cbc 100644 --- a/tests/src/Traits/EmphasisTraitTest.php +++ b/tests/src/Traits/EmphasisTraitTest.php @@ -11,7 +11,7 @@ namespace Techworker\Ssml\Tests\Traits; -use Techworker\Ssml\Element\Amazon\Emphasis; +use Techworker\Ssml\Element\Emphasis; use Techworker\Ssml\SsmlBuilder; use Techworker\Ssml\Tests\TestCase; From 7db1185a77128dbd77cd97cbfe28298bd4feb1aa Mon Sep 17 00:00:00 2001 From: Erika Gili Date: Sat, 29 Aug 2020 16:27:05 +0200 Subject: [PATCH 2/2] Fixed the InvalidElementException.php namespace to comply with PSR-4 rules --- README.md | 4 ++-- src/Specification.php | 2 +- src/Specification/{ => Exception}/Alexa.php | 2 +- .../InvalidAttributeValueException.php | 2 +- .../Exception/InvalidElementException.php | 2 +- tests/src/Specification/AlexaTest.php | 18 +++++++++--------- 6 files changed, 15 insertions(+), 15 deletions(-) rename src/Specification/{ => Exception}/Alexa.php (99%) diff --git a/README.md b/README.md index 1150abc..64260c4 100644 --- a/README.md +++ b/README.md @@ -357,7 +357,7 @@ This library ships with a Amazon Alexa validator. ```php paragraph()->root(); //..whatever @@ -368,4 +368,4 @@ try // invalid } -``` \ No newline at end of file +``` diff --git a/src/Specification.php b/src/Specification.php index ef0ee3f..54d0c65 100644 --- a/src/Specification.php +++ b/src/Specification.php @@ -11,7 +11,7 @@ namespace Techworker\Ssml; use Techworker\Ssml\Element\Speak; -use Techworker\Ssml\Specification\InvalidElementException; +use Techworker\Ssml\Specification\Exception\InvalidElementException; abstract class Specification { diff --git a/src/Specification/Alexa.php b/src/Specification/Exception/Alexa.php similarity index 99% rename from src/Specification/Alexa.php rename to src/Specification/Exception/Alexa.php index f685595..c328db2 100644 --- a/src/Specification/Alexa.php +++ b/src/Specification/Exception/Alexa.php @@ -9,7 +9,7 @@ */ declare(strict_types = 1); -namespace Techworker\Ssml\Specification; +namespace Techworker\Ssml\Specification\Exception; use Techworker\Ssml\BaseElement; use Techworker\Ssml\Element\Emphasis; diff --git a/src/Specification/Exception/InvalidAttributeValueException.php b/src/Specification/Exception/InvalidAttributeValueException.php index 11a98dd..3afb2c3 100644 --- a/src/Specification/Exception/InvalidAttributeValueException.php +++ b/src/Specification/Exception/InvalidAttributeValueException.php @@ -9,7 +9,7 @@ */ declare(strict_types = 1); -namespace Techworker\Ssml\Specification; +namespace Techworker\Ssml\Specification\Exception; use Techworker\Ssml\BaseElement; use Techworker\Ssml\SsmlException; diff --git a/src/Specification/Exception/InvalidElementException.php b/src/Specification/Exception/InvalidElementException.php index ef4ba1f..53bf26d 100644 --- a/src/Specification/Exception/InvalidElementException.php +++ b/src/Specification/Exception/InvalidElementException.php @@ -9,7 +9,7 @@ */ declare(strict_types = 1); -namespace Techworker\Ssml\Specification; +namespace Techworker\Ssml\Specification\Exception; use Techworker\Ssml\BaseElement; use Techworker\Ssml\SsmlException; diff --git a/tests/src/Specification/AlexaTest.php b/tests/src/Specification/AlexaTest.php index c15b9f1..b0930f0 100644 --- a/tests/src/Specification/AlexaTest.php +++ b/tests/src/Specification/AlexaTest.php @@ -11,14 +11,14 @@ namespace Techworker\Ssml\Tests\Specification; -use Techworker\Ssml\Specification\Alexa; +use Techworker\Ssml\Specification\Exception\Alexa; use Techworker\Ssml\SsmlBuilder; use Techworker\Ssml\Tests\TestCase; class AlexaTest extends TestCase { /** - * @expectedException \Techworker\Ssml\Specification\InvalidElementException + * @expectedException \Techworker\Ssml\Specification\Exception\InvalidElementException */ public function testNotAllowedElementThrowsException() { @@ -28,7 +28,7 @@ public function testNotAllowedElementThrowsException() } /** - * @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException + * @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException * @expectedExceptionMessageRegExp /attribute strength/ */ public function testBreakStrengthInvalid() @@ -50,7 +50,7 @@ public function testBreakStrengthValid() /** - * @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException + * @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException * @expectedExceptionMessageRegExp /attribute time/ */ public function testBreakTimeInvalid() @@ -61,7 +61,7 @@ public function testBreakTimeInvalid() } /** - * @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException + * @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException * @expectedExceptionMessageRegExp /attribute time/ */ public function testBreakTimeInvalid2() @@ -80,7 +80,7 @@ public function testBreakTimeValid() } /** - * @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException + * @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException * @expectedExceptionMessageRegExp /attribute alphabet/ */ public function testPhonemeAlphabetInvalid() @@ -101,7 +101,7 @@ public function testPhonemeAlphabetValid() } /** - * @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException + * @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException * @expectedExceptionMessageRegExp /attribute interpret-as/ */ public function testSayAsInterpretAsInvalid() @@ -126,7 +126,7 @@ public function testSayAsInterpretAsValid() } /** - * @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException + * @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException * @expectedExceptionMessageRegExp /attribute format/ */ public function testSayAsDateFormatInvalid() @@ -147,7 +147,7 @@ public function testSayAsDateFormatValid() } /** - * @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException + * @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException * @expectedExceptionMessageRegExp /attribute role/ */ public function testWordRoleInvalid()