Skip to content

Commit 5004a59

Browse files
committed
SoftDeleteable extension namespace must match what Gedmo will check afterwards
1 parent e1ac666 commit 5004a59

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

lib/Softdeleteable/Mapping/Driver/Fluent.php renamed to lib/SoftDeleteable/Mapping/Driver/Fluent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace Gedmo\Softdeleteable\Mapping\Driver;
3+
namespace Gedmo\SoftDeleteable\Mapping\Driver;
44

55
use Gedmo\FluentExtension;
66

src/Extensions/Gedmo/GedmoBuilderHints.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Trait only meant for type hinting
77
*
88
* @method void loggable(string $logEntry = null)
9-
* @method Softdeleteable softDelete(string $fieldName = 'deletedAt', string $type = 'dateTime')
9+
* @method SoftDeleteable softDelete(string $fieldName = 'deletedAt', string $type = 'dateTime')
1010
* @method void timestamps(string $createdAt = 'createdAt', string $updatedAt = 'updatedAt', string $type = 'dateTime')
1111
* @method TranslationClass translationClass(string $class)
1212
* @method Tree tree(callable $callback = null)

src/Extensions/Gedmo/GedmoFieldHints.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @method IpTraceable ipTraceable()
1010
* @method void locale()
1111
* @method Sluggable sluggable(mixed $fields)
12-
* @method Softdeleteable softDelete()
12+
* @method SoftDeleteable softDelete()
1313
* @method void sortableGroup()
1414
* @method void sortablePosition()
1515
* @method Timestampable timestampable()

src/Extensions/Gedmo/Softdeleteable.php renamed to src/Extensions/Gedmo/SoftDeleteable.php

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

33
namespace LaravelDoctrine\Fluent\Extensions\Gedmo;
44

5-
use Gedmo\Softdeleteable\Mapping\Driver\Fluent as FluentDriver;
5+
use Gedmo\SoftDeleteable\Mapping\Driver\Fluent as FluentDriver;
66
use LaravelDoctrine\Fluent\Buildable;
77
use LaravelDoctrine\Fluent\Builders\Builder;
88
use LaravelDoctrine\Fluent\Builders\Field;
99
use LaravelDoctrine\Fluent\Extensions\ExtensibleClassMetadata;
1010
use LaravelDoctrine\Fluent\Extensions\Extension;
1111

12-
class Softdeleteable implements Buildable, Extension
12+
class SoftDeleteable implements Buildable, Extension
1313
{
1414
const MACRO_METHOD = 'softDelete';
1515

src/Extensions/GedmoExtensions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class GedmoExtensions
3737
Gedmo\IpTraceable::class,
3838
Gedmo\Loggable::class,
3939
Gedmo\Sluggable::class,
40-
Gedmo\Softdeleteable::class,
40+
Gedmo\SoftDeleteable::class,
4141
Gedmo\Sortable::class,
4242
Gedmo\Timestampable::class,
4343
Gedmo\Translatable::class,

src/Fluent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Extensions:
99
* @method void loggable(string $logEntry = null)
10-
* @method Extensions\Gedmo\Softdeleteable softDelete(string $fieldName = 'deletedAt', string $type = 'dateTime')
10+
* @method Extensions\Gedmo\SoftDeleteable softDelete(string $fieldName = 'deletedAt', string $type = 'dateTime')
1111
* @method void timestamps(string $createdAt = 'createdAt', string $updatedAt = 'updatedAt', string $type = 'dateTime')
1212
* @method Extensions\Gedmo\TranslationClass translationClass(string $class)
1313
* @method Extensions\Gedmo\Tree tree(callable $callback = null)

tests/Extensions/Gedmo/SoftdeleteableTest.php renamed to tests/Extensions/Gedmo/SoftDeleteableTest.php

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
use LaravelDoctrine\Fluent\Builders\Field;
77
use LaravelDoctrine\Fluent\Extensions\ExtensibleClassMetadata;
88
use LaravelDoctrine\Fluent\Extensions\Gedmo\AbstractTrackingExtension;
9-
use Gedmo\Softdeleteable\Mapping\Driver\Fluent as SoftdeleteableDriver;
10-
use LaravelDoctrine\Fluent\Extensions\Gedmo\Softdeleteable;
9+
use Gedmo\SoftDeleteable\Mapping\Driver\Fluent as SoftDeleteableDriver;
10+
use LaravelDoctrine\Fluent\Extensions\Gedmo\SoftDeleteable;
1111

1212
/**
1313
* @mixin \PHPUnit_Framework_TestCase
1414
*/
15-
class SoftdeleteableTest extends \PHPUnit_Framework_TestCase
15+
class SoftDeleteableTest extends \PHPUnit_Framework_TestCase
1616
{
1717
/**
1818
* @var string
@@ -25,38 +25,38 @@ class SoftdeleteableTest extends \PHPUnit_Framework_TestCase
2525
protected $classMetadata;
2626

2727
/**
28-
* @var Softdeleteable
28+
* @var SoftDeleteable
2929
*/
3030
private $extension;
3131

3232
protected function setUp()
3333
{
3434
$this->fieldName = 'deletedAt';
3535
$this->classMetadata = new ExtensibleClassMetadata('foo');
36-
$this->extension = new Softdeleteable($this->classMetadata, $this->fieldName);
36+
$this->extension = new SoftDeleteable($this->classMetadata, $this->fieldName);
3737
}
3838

3939
public function test_it_should_add_itself_as_a_field_macro()
4040
{
41-
Softdeleteable::enable();
41+
SoftDeleteable::enable();
4242

4343
$field = Field::make(new ClassMetadataBuilder(new ExtensibleClassMetadata('Foo')), 'string', $this->fieldName);
4444

4545
$this->assertInstanceOf(
46-
Softdeleteable::class,
47-
call_user_func([$field, Softdeleteable::MACRO_METHOD])
46+
SoftDeleteable::class,
47+
call_user_func([$field, SoftDeleteable::MACRO_METHOD])
4848
);
4949
}
5050

5151
public function test_it_should_make_itself_a_builder_macro()
5252
{
53-
Softdeleteable::enable();
53+
SoftDeleteable::enable();
5454

5555
$builder = new Builder($cmb = new ClassMetadataBuilder(new ExtensibleClassMetadata('Foo')));
5656

5757
$this->assertInstanceOf(
58-
Softdeleteable::class,
59-
call_user_func([$builder, Softdeleteable::MACRO_METHOD], 'deletedAt')
58+
SoftDeleteable::class,
59+
call_user_func([$builder, SoftDeleteable::MACRO_METHOD], 'deletedAt')
6060
);
6161
}
6262

@@ -98,7 +98,7 @@ protected function assertBuildResultIs(array $expected)
9898
}
9999

100100
/**
101-
* @return Softdeleteable
101+
* @return SoftDeleteable
102102
*/
103103
protected function getExtension()
104104
{

0 commit comments

Comments
 (0)