Skip to content

Fix namespaces #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dottxado wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix namespaces #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f73805a
Fixed the Emphasis.php namespace to comply with PSR-4 rules
Aug 29, 2020
7db1185
Fixed the InvalidElementException.php namespace to comply with PSR-4 …
Aug 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ This library ships with a Amazon Alexa validator.
```php
<?php
use \Techworker\Ssml\SsmlBuilder;
use \Techworker\Ssml\Specification\Alexa;
use Techworker\Ssml\Specification\Exception\Alexa;

$ssml = SsmlBuilder::factory()->paragraph()->root(); //..whatever

Expand All @@ -368,4 +368,4 @@ try
// invalid
}

```
```
2 changes: 1 addition & 1 deletion src/Element/Emphasis.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* Written by Benjamin Ansbach <benjaminansbach@gmail.com>, 2019
*/
declare(strict_types = 1);
namespace Techworker\Ssml\Element\Amazon;
namespace Techworker\Ssml\Element;

use Techworker\Ssml\ContainerElement;

Expand Down
2 changes: 1 addition & 1 deletion src/Specification.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions src/Specification/Alexa.php → src/Specification/Exception/Alexa.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
*/
declare(strict_types = 1);

namespace Techworker\Ssml\Specification;
namespace Techworker\Ssml\Specification\Exception;

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_;
Expand Down
2 changes: 1 addition & 1 deletion src/Specification/Exception/InvalidAttributeValueException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Specification/Exception/InvalidElementException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Traits/EmphasisTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Element/EmphasisTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Element/LangTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion tests/src/Element/ProsodyTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
18 changes: 9 additions & 9 deletions tests/src/Specification/AlexaTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand All @@ -28,7 +28,7 @@ public function testNotAllowedElementThrowsException()
}

/**
* @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException
* @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException
* @expectedExceptionMessageRegExp /attribute strength/
*/
public function testBreakStrengthInvalid()
Expand All @@ -50,7 +50,7 @@ public function testBreakStrengthValid()


/**
* @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException
* @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException
* @expectedExceptionMessageRegExp /attribute time/
*/
public function testBreakTimeInvalid()
Expand All @@ -61,7 +61,7 @@ public function testBreakTimeInvalid()
}

/**
* @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException
* @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException
* @expectedExceptionMessageRegExp /attribute time/
*/
public function testBreakTimeInvalid2()
Expand All @@ -80,7 +80,7 @@ public function testBreakTimeValid()
}

/**
* @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException
* @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException
* @expectedExceptionMessageRegExp /attribute alphabet/
*/
public function testPhonemeAlphabetInvalid()
Expand All @@ -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()
Expand All @@ -126,7 +126,7 @@ public function testSayAsInterpretAsValid()
}

/**
* @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException
* @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException
* @expectedExceptionMessageRegExp /attribute format/
*/
public function testSayAsDateFormatInvalid()
Expand All @@ -147,7 +147,7 @@ public function testSayAsDateFormatValid()
}

/**
* @expectedException \Techworker\Ssml\Specification\InvalidAttributeValueException
* @expectedException \Techworker\Ssml\Specification\Exception\InvalidAttributeValueException
* @expectedExceptionMessageRegExp /attribute role/
*/
public function testWordRoleInvalid()
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Traits/EmphasisTraitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down