Skip to content

Commit 3078e00

Browse files
simluxsimlux
committed
moved extensions to subfolder
1 parent b1d24ab commit 3078e00

File tree

12 files changed

+196
-183
lines changed

12 files changed

+196
-183
lines changed

src/AbstractStringExtension.php renamed to src/Extensions/AbstractStringExtension.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?php declare(strict_types=1);
22

3-
namespace Simlux\String;
3+
namespace Simlux\String\Extensions;
4+
5+
use Simlux\String\StringBuffer;
46

57
abstract class AbstractStringExtension
68
{

src/StringConditions.php renamed to src/Extensions/Conditions.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php declare(strict_types=1);
22

3-
namespace Simlux\String;
3+
namespace Simlux\String\Extensions;
44

5-
class StringConditions extends AbstractStringExtension
5+
class Conditions extends AbstractStringExtension
66
{
77
/**
88
* @param string $string

src/StringManipulator.php renamed to src/Extensions/Manipulator.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php declare(strict_types=1);
22

3-
namespace Simlux\String;
3+
namespace Simlux\String\Extensions;
44

5-
class StringManipulator extends AbstractStringExtension
5+
use Simlux\String\StringBuffer;
6+
7+
class Manipulator extends AbstractStringExtension
68
{
79
const CHARLIST = " \t\n\r\0\x0B";
810

src/StringProperties.php renamed to src/Extensions/Properties.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php declare(strict_types=1);
22

3-
namespace Simlux\String;
3+
namespace Simlux\String\Extensions;
44

5-
class StringProperties extends AbstractStringExtension
5+
class Properties extends AbstractStringExtension
66
{
77
/**
88
* @return int

src/StringTransformer.php renamed to src/Extensions/Transformer.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
<?php declare(strict_types=1);
22

3-
namespace Simlux\String;
3+
namespace Simlux\String\Extensions;
44

5-
class StringTransformer extends AbstractStringExtension
5+
use Simlux\String\StringBuffer;
6+
7+
class Transformer extends AbstractStringExtension
68
{
79
/**
810
* @return StringBuffer

‎src/StringBuffer.php‎

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44

55
use Simlux\String\Exceptions\UnknownExtensionException;
66
use Simlux\String\Exceptions\UnknownMethodException;
7+
use Simlux\String\Extensions\AbstractStringExtension;
8+
use Simlux\String\Extensions\Conditions;
9+
use Simlux\String\Extensions\Manipulator;
10+
use Simlux\String\Extensions\Properties;
11+
use Simlux\String\Extensions\Transformer;
712

813
/**
914
* Class StringBuffer
@@ -45,7 +50,7 @@ class StringBuffer
4550
private $string;
4651

4752
/**
48-
* @var StringConditions
53+
* @var Conditions
4954
*/
5055
private $conditions;
5156

@@ -62,7 +67,7 @@ class StringBuffer
6267
];
6368

6469
/**
65-
* @var StringProperties
70+
* @var Properties
6671
*/
6772
private $properties;
6873

@@ -74,7 +79,7 @@ class StringBuffer
7479
];
7580

7681
/**
77-
* @var StringTransformer
82+
* @var Transformer
7883
*/
7984
private $transformer;
8085

@@ -89,7 +94,7 @@ class StringBuffer
8994
];
9095

9196
/**
92-
* @var StringManipulator
97+
* @var Manipulator
9398
*/
9499
private $manipulator;
95100

@@ -188,48 +193,48 @@ public function __call(string $name, array $arguments)
188193
}
189194

190195
/**
191-
* @return StringConditions
196+
* @return Conditions
192197
*/
193-
public function conditions(): StringConditions
198+
public function conditions(): Conditions
194199
{
195200
if (is_null($this->conditions)) {
196-
$this->conditions = new StringConditions($this);
201+
$this->conditions = new Conditions($this);
197202
}
198203

199204
return $this->conditions;
200205
}
201206

202207
/**
203-
* @return StringProperties
208+
* @return Properties
204209
*/
205-
public function properties(): StringProperties
210+
public function properties(): Properties
206211
{
207212
if (is_null($this->properties)) {
208-
$this->properties = new StringProperties($this);
213+
$this->properties = new Properties($this);
209214
}
210215

211216
return $this->properties;
212217
}
213218

214219
/**
215-
* @return StringTransformer
220+
* @return Transformer
216221
*/
217-
public function transformer(): StringTransformer
222+
public function transformer(): Transformer
218223
{
219224
if (is_null($this->transformer)) {
220-
$this->transformer = new StringTransformer($this);
225+
$this->transformer = new Transformer($this);
221226
}
222227

223228
return $this->transformer;
224229
}
225230

226231
/**
227-
* @return StringManipulator
232+
* @return Manipulator
228233
*/
229-
public function manipulator(): StringManipulator
234+
public function manipulator(): Manipulator
230235
{
231236
if (is_null($this->manipulator)) {
232-
$this->manipulator = new StringManipulator($this);
237+
$this->manipulator = new Manipulator($this);
233238
}
234239

235240
return $this->manipulator;

tests/StringBufferTest.php renamed to tests/BufferTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
namespace Simlux\String\Test;
44

55
use Simlux\String\Exceptions\UnknownMethodException;
6+
use Simlux\String\Extensions\Conditions;
7+
use Simlux\String\Extensions\Properties;
8+
use Simlux\String\Extensions\Transformer;
69
use Simlux\String\StringBuffer;
7-
use Simlux\String\StringConditions;
8-
use Simlux\String\StringProperties;
9-
use Simlux\String\StringTransformer;
1010

11-
class StringBufferTest extends TestCase
11+
class BufferTest extends TestCase
1212
{
1313
public function testCreateFactory()
1414
{
@@ -57,17 +57,17 @@ public function testPrependIf()
5757

5858
public function testConditions()
5959
{
60-
$this->assertInstanceOf(StringConditions::class, StringBuffer::create('')->conditions());
60+
$this->assertInstanceOf(Conditions::class, StringBuffer::create('')->conditions());
6161
}
6262

6363
public function testProperties()
6464
{
65-
$this->assertInstanceOf(StringProperties::class, StringBuffer::create('')->properties());
65+
$this->assertInstanceOf(Properties::class, StringBuffer::create('')->properties());
6666
}
6767

6868
public function testTransformer()
6969
{
70-
$this->assertInstanceOf(StringTransformer::class, StringBuffer::create('')->transformer());
70+
$this->assertInstanceOf(Transformer::class, StringBuffer::create('')->transformer());
7171
}
7272

7373
public function testThatUnknownMethodExceptionIsThrown()

tests/StringConditionsTest.php renamed to tests/ConditionsTest.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Simlux\String\Test;
44

5+
use Simlux\String\Extensions\Conditions;
56
use Simlux\String\StringBuffer;
6-
use Simlux\String\StringConditions;
77

8-
class StringConditionsTest extends TestCase
8+
class ConditionsTest extends TestCase
99
{
1010
public function dataProviderForTestContains(): array
1111
{
@@ -53,7 +53,7 @@ public function dataProviderForTestContains(): array
5353
*/
5454
public function testContains(string $string, string $contains, bool $caseSensitive, bool $expected)
5555
{
56-
$condition = new StringConditions(StringBuffer::create($string));
56+
$condition = new Conditions(StringBuffer::create($string));
5757
$this->assertSame($expected, $condition->contains($contains, $caseSensitive));
5858
}
5959

@@ -97,7 +97,7 @@ public function dataProviderForTestContainsOneOf()
9797
*/
9898
public function testContainsOneOf(string $string, array $contains, bool $caseSensitive, bool $expected)
9999
{
100-
$condition = new StringConditions(StringBuffer::create($string));
100+
$condition = new Conditions(StringBuffer::create($string));
101101
$this->assertSame($expected, $condition->containsOneOf($contains, $caseSensitive));
102102
}
103103

@@ -141,7 +141,7 @@ public function dataProviderForTestBeginsWith(): array
141141
*/
142142
public function testBeginsWith(string $string, string $beginsWith, bool $caseSensitive, bool $expected)
143143
{
144-
$condition = new StringConditions(StringBuffer::create($string));
144+
$condition = new Conditions(StringBuffer::create($string));
145145
$this->assertSame($expected, $condition->beginsWith($beginsWith, $caseSensitive));
146146
}
147147

@@ -185,7 +185,7 @@ public function dataProviderForTestBeginsWithOneOf(): array
185185
*/
186186
public function testBeginsWithOneOf(string $string, array $beginsWith, bool $caseSensitive, bool $expected)
187187
{
188-
$condition = new StringConditions(StringBuffer::create($string));
188+
$condition = new Conditions(StringBuffer::create($string));
189189
$this->assertSame($expected, $condition->beginsWithOneOf($beginsWith, $caseSensitive));
190190
}
191191

@@ -229,7 +229,7 @@ public function dataProviderForTestEndsWith(): array
229229
*/
230230
public function testEndsWith(string $string, string $endsWith, bool $caseSensitive, bool $expected)
231231
{
232-
$condition = new StringConditions(StringBuffer::create($string));
232+
$condition = new Conditions(StringBuffer::create($string));
233233
$this->assertSame($expected, $condition->endsWith($endsWith, $caseSensitive));
234234
}
235235

@@ -273,7 +273,7 @@ public function dataProviderForTestEndsWithOneOf(): array
273273
*/
274274
public function testEndsWithOneOf(string $string, array $endsWith, bool $caseSensitive, bool $expected)
275275
{
276-
$condition = new StringConditions(StringBuffer::create($string));
276+
$condition = new Conditions(StringBuffer::create($string));
277277
$this->assertSame($expected, $condition->endsWithOneOf($endsWith, $caseSensitive));
278278
}
279279

@@ -317,7 +317,7 @@ public function dataProviderForTestEquals(): array
317317
*/
318318
public function testEquals(string $string, string $equals, bool $caseSensitive, bool $expected)
319319
{
320-
$condition = new StringConditions(StringBuffer::create($string));
320+
$condition = new Conditions(StringBuffer::create($string));
321321
$this->assertSame($expected, $condition->equals($equals, $caseSensitive));
322322
}
323323
}

tests/StringManipulatorTest.php renamed to tests/ManipulatorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use Simlux\String\StringBuffer;
66

7-
class StringManipulatorTest extends TestCase
7+
class ManipulatorTest extends TestCase
88
{
99
public function testTrim()
1010
{

tests/StringTransformerTest.php renamed to tests/TransformerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
namespace Simlux\String\Test;
44

5+
use Simlux\String\Extensions\Transformer;
56
use Simlux\String\StringBuffer;
6-
use Simlux\String\StringTransformer;
77

8-
class StringTransformerTest extends TestCase
8+
class TransformerTest extends TestCase
99
{
1010
public function dataProviderForTestToLower(): array
1111
{
@@ -29,7 +29,7 @@ public function dataProviderForTestToLower(): array
2929
*/
3030
public function testToLower(string $string, string $expected)
3131
{
32-
$transformer = new StringTransformer(StringBuffer::create($string));
32+
$transformer = new Transformer(StringBuffer::create($string));
3333
$this->assertSame($expected, $transformer->toLower()->toString());
3434
}
3535

@@ -55,7 +55,7 @@ public function dataProviderForTestToUpper(): array
5555
*/
5656
public function testToUpper(string $string, string $expected)
5757
{
58-
$transformer = new StringTransformer(StringBuffer::create($string));
58+
$transformer = new Transformer(StringBuffer::create($string));
5959
$this->assertSame($expected, $transformer->toUpper()->toString());
6060
}
6161

0 commit comments

Comments
 (0)