Skip to content

Commit c9d1eb1

Browse files
author
Tomas Votruba
committed
Refactoring
- lock to KnpLabs\DoctrineBehaviors stable version v1.0.2 - bump min version to PHP 5.5 - Zenify\CodingStandard updated to v2.0 - nicer badges + code quality badge added
1 parent 8796a77 commit c9d1eb1

18 files changed

+162
-146
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.4
54
- 5.5
65
- 5.6
76
- hhvm
@@ -17,10 +16,9 @@ before_script:
1716

1817
script:
1918
- vendor/bin/tester -c tests/php.ini-unix tests -s
20-
- vendor/bin/phpcs src --standard=vendor/zenify/coding-standard/src/ZenifyCodingStandard/ruleset.xml
21-
- vendor/bin/phpcs src --standard=vendor/mikulas/code-sniffs/cs/ruleset.xml --sniffs=cs.Debug.DebugFunctionCall,cs.Formatting.UseInAlphabeticalOrder,cs.Formatting.UseWithoutStartingSeparator
22-
- vendor/bin/phpcs tests/ZenifyTests/DoctrineBehaviors --standard=vendor/zenify/coding-standard/src/ZenifyCodingStandard/ruleset.xml
23-
- vendor/bin/phpcs tests/ZenifyTests/DoctrineBehaviors --standard=vendor/mikulas/code-sniffs/cs/ruleset.xml --sniffs=cs.Debug.DebugFunctionCall,cs.Formatting.UseInAlphabeticalOrder,cs.Formatting.UseWithoutStartingSeparator
19+
# php code sniffer
20+
- vendor/bin/phpcs src --standard=vendor/zenify/coding-standard/src/ZenifyCodingStandard/code-sniffer-ruleset.xml
21+
- vendor/bin/phpcs tests/ZenifyTests/DoctrineBehaviors --standard=vendor/zenify/coding-standard/src/ZenifyCodingStandard/code-sniffer-ruleset.xml
2422

2523
after_failure:
2624
- 'for i in $(find ./tests -name \*.actual); do echo "--- $i"; cat $i; echo; echo; done'

‎composer.json‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,22 @@
66
{ "name": "Tomáš Votruba", "homepage": "http://tomasvotruba.cz" }
77
],
88
"require": {
9-
"php": ">=5.4",
10-
"knplabs/doctrine-behaviors": "~1.1@dev",
9+
"php": ">=5.5",
10+
"knplabs/doctrine-behaviors": "~1.0.2",
1111
"kdyby/events": "~2.0"
1212
},
1313
"require-dev": {
1414
"kdyby/doctrine": "~2.0",
15-
"nette/bootstrap": "~2.0",
16-
"nette/di": "~2.0",
17-
"nette/http": "~2.0",
18-
"nette/mail": "~2.0",
19-
"nette/robot-loader": "~2.0",
20-
"nette/safe-stream": "~2.0",
21-
"nette/security": "~2.0",
22-
"nette/utils": "~2.0",
23-
"nette/tester": "~1.2",
15+
"nette/bootstrap": "~2.2",
16+
"nette/di": "~2.2",
17+
"nette/http": "~2.2",
18+
"nette/mail": "~2.2",
19+
"nette/safe-stream": "~2.2",
20+
"nette/security": "~2.2",
21+
"nette/utils": "~2.2",
22+
"nette/tester": "~1.3",
2423
"tracy/tracy": "~2.0",
25-
"zenify/coding-standard": "~1.0",
24+
"zenify/coding-standard": "~2.0",
2625
"jakub-onderka/php-parallel-lint": "~0.8"
2726
},
2827
"autoload": {

‎readme.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
# Zenify/DoctrineBehaviors
22

3-
[![Build Status](https://travis-ci.org/Zenify/DoctrineBehaviors.svg?branch=master)](https://travis-ci.org/Zenify/DoctrineBehaviors)
4-
[![Downloads this Month](https://img.shields.io/packagist/dm/zenify/doctrine-behaviors.svg)](https://packagist.org/packages/zenify/doctrine-behaviors)
5-
[![Latest stable](https://img.shields.io/packagist/v/zenify/doctrine-behaviors.svg)](https://packagist.org/packages/zenify/doctrine-behaviors)
3+
[![Build Status](https://img.shields.io/travis/Zenify/DoctrineBehaviors.svg?style=flat-square)](https://travis-ci.org/Zenify/DoctrineBehaviors)
4+
[![Quality Score](https://img.shields.io/scrutinizer/g/Zenify/DoctrineBehaviors.svg?style=flat-square)](https://scrutinizer-ci.com/g/Zenify/DoctrineBehaviors)
5+
[![Downloads this Month](https://img.shields.io/packagist/dm/zenify/doctrine-behaviors.svg?style=flat-square)](https://packagist.org/packages/zenify/doctrine-behaviors)
6+
[![Latest stable](https://img.shields.io/packagist/v/zenify/doctrine-behaviors.svg?style=flat-square)](https://packagist.org/packages/zenify/doctrine-behaviors)
67

78

89
Port of [KnpLabs/DoctrineBehaviors](https://github.com/KnpLabs/DoctrineBehaviors) to Nette
@@ -22,10 +23,9 @@ For implementation to entities, check [tests](https://github.com/KnpLabs/Doctrin
2223

2324
## Installation
2425

25-
To get the lastest version run [Composer](http://getcomposer.org/) commands:
26+
Install the latest version via Composer:
2627

2728
```sh
28-
$ composer require "knplabs/doctrine-behaviors:@dev"
2929
$ composer require zenify/doctrine-behaviors
3030
```
3131

@@ -52,18 +52,20 @@ Place trait to your entity:
5252
```php
5353
class Article
5454
{
55+
5556
use Knp\DoctrineBehaviors\Model\Translatable\Translatable;
5657
// returns translated property for $article->getTitle() or $article->title
5758
use Zenify\DoctrineBehaviors\Entities\Attributes\Translatable;
5859

5960
}
6061
```
6162

62-
And it's translation entity:
63+
And its translation entity:
6364

6465
```php
6566
class ArticleTranslation
6667
{
68+
6769
use Knp\DoctrineBehaviors\Model\Translatable\Translation;
6870

6971
/**
@@ -89,6 +91,7 @@ Place trait to your entity to ad `$createdAt` and `$updatedAt` properties:
8991
```php
9092
class Article
9193
{
94+
9295
use Knp\DoctrineBehaviors\Model\Timestampable\Timestampable;
9396

9497
}

‎src/DI/BehaviorExtension.php‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
namespace Zenify\DoctrineBehaviors\DI;
99

10+
use Knp\DoctrineBehaviors\Reflection\ClassAnalyzer;
1011
use Nette\DI\Compiler;
1112
use Nette\DI\CompilerExtension;
12-
use Nette\DI\ContainerBuilder;
1313
use Nette\DI\ServiceDefinition;
1414
use Nette\DI\Statement;
1515

@@ -22,15 +22,14 @@ abstract class BehaviorExtension extends CompilerExtension
2222
*/
2323
protected function getClassAnalyzer()
2424
{
25-
/** @var ContainerBuilder $builder */
2625
$builder = $this->getContainerBuilder();
2726

2827
if ($builder->hasDefinition('knp.classAnalyzer')) {
2928
return $builder->getDefinition('knp.classAnalyzer');
3029
}
3130

3231
return $builder->addDefinition('knp.classAnalyzer')
33-
->setClass('Knp\DoctrineBehaviors\Reflection\ClassAnalyzer');
32+
->setClass(ClassAnalyzer::class);
3433
}
3534

3635

@@ -47,9 +46,9 @@ protected function buildDefinition($value)
4746
$builder = $this->getContainerBuilder();
4847
$definition = $builder->addDefinition($this->prefix(md5($value)));
4948

50-
list($definition->factory) = Compiler::filterArguments(array(
49+
list($definition->factory) = Compiler::filterArguments([
5150
is_string($value) ? new Statement($value) : $value
52-
));
51+
]);
5352

5453
list($resolverClass) = (array) $builder->normalizeEntity($definition->getFactory()->getEntity());
5554
if (class_exists($resolverClass)) {

‎src/DI/BlameableExtension.php‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,12 @@
88
namespace Zenify\DoctrineBehaviors\DI;
99

1010
use Kdyby;
11+
use Knp\DoctrineBehaviors\Model\Blameable\Blameable;
12+
use Knp\DoctrineBehaviors\ORM\Blameable\BlameableListener;
1113
use Nette;
1214
use Nette\Utils\AssertionException;
1315
use Nette\Utils\Validators;
16+
use Zenify\DoctrineBehaviors\Blameable\UserCallable;
1417

1518

1619
class BlameableExtension extends BehaviorExtension
@@ -19,10 +22,10 @@ class BlameableExtension extends BehaviorExtension
1922
/**
2023
* @var array
2124
*/
22-
protected $default = [
25+
private $default = [
2326
'isRecursive' => TRUE,
24-
'trait' => 'Knp\DoctrineBehaviors\Model\Blameable\Blameable',
25-
'userCallable' => 'Zenify\DoctrineBehaviors\Blameable\UserCallable',
27+
'trait' => Blameable::class,
28+
'userCallable' => UserCallable::class,
2629
'userEntity' => NULL
2730
];
2831

@@ -36,7 +39,7 @@ public function loadConfiguration()
3639
$userCallable = $this->buildDefinition($config['userCallable']);
3740

3841
$builder->addDefinition($this->prefix('listener'))
39-
->setClass('Knp\DoctrineBehaviors\ORM\Blameable\BlameableSubscriber', [
42+
->setClass(BlameableListener::class, [
4043
'@' . $this->getClassAnalyzer()->getClass(),
4144
$config['isRecursive'],
4245
$config['trait'],
@@ -51,7 +54,7 @@ public function loadConfiguration()
5154
/**
5255
* @throws AssertionException
5356
*/
54-
protected function validateConfigTypes(array $config)
57+
private function validateConfigTypes(array $config)
5558
{
5659
Validators::assertField($config, 'isRecursive', 'bool');
5760
Validators::assertField($config, 'trait', 'type');

‎src/DI/GeocodableExtension.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
namespace Zenify\DoctrineBehaviors\DI;
99

1010
use Kdyby;
11+
use Knp\DoctrineBehaviors\Model\Geocodable\Geocodable;
12+
use Knp\DoctrineBehaviors\ORM\Geocodable\GeocodableListener;
1113
use Nette\Utils\AssertionException;
1214
use Nette\Utils\Validators;
1315

@@ -18,9 +20,9 @@ class GeocodableExtension extends BehaviorExtension
1820
/**
1921
* @var array
2022
*/
21-
protected $default = [
23+
private $default = [
2224
'isRecursive' => TRUE,
23-
'trait' => 'Knp\DoctrineBehaviors\Model\Geocodable\Geocodable',
25+
'trait' => Geocodable::class,
2426
'geolocationCallable' => NULL
2527
];
2628

@@ -34,7 +36,7 @@ public function loadConfiguration()
3436
$geolocationCallable = $this->buildDefinition($config['geolocationCallable']);
3537

3638
$builder->addDefinition($this->prefix('listener'))
37-
->setClass('Knp\DoctrineBehaviors\ORM\Geocodable\GeocodableSubscriber', [
39+
->setClass(GeocodableListener::class, [
3840
'@' . $this->getClassAnalyzer()->getClass(),
3941
$config['isRecursive'],
4042
$config['trait'],
@@ -48,7 +50,7 @@ public function loadConfiguration()
4850
/**
4951
* @throws AssertionException
5052
*/
51-
protected function validateConfigTypes(array $config)
53+
private function validateConfigTypes(array $config)
5254
{
5355
Validators::assertField($config, 'isRecursive', 'bool');
5456
Validators::assertField($config, 'trait', 'type');

‎src/DI/LoggableExtension.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
namespace Zenify\DoctrineBehaviors\DI;
99

1010
use Kdyby;
11+
use Knp\DoctrineBehaviors\ORM\Loggable\LoggableListener;
1112
use Nette;
1213
use Nette\Utils\AssertionException;
1314
use Nette\Utils\Validators;
15+
use Zenify\DoctrineBehaviors\Loggable\LoggerCallable;
1416

1517

1618
class LoggableExtension extends BehaviorExtension
@@ -19,9 +21,9 @@ class LoggableExtension extends BehaviorExtension
1921
/**
2022
* @var array
2123
*/
22-
protected $default = [
24+
private $default = [
2325
'isRecursive' => TRUE,
24-
'loggerCallable' => 'Zenify\DoctrineBehaviors\Loggable\LoggerCallable'
26+
'loggerCallable' => LoggerCallable::class
2527
];
2628

2729

@@ -34,7 +36,7 @@ public function loadConfiguration()
3436
$loggerCallable = $this->buildDefinition($config['loggerCallable']);
3537

3638
$builder->addDefinition($this->prefix('listener'))
37-
->setClass('Knp\DoctrineBehaviors\ORM\Loggable\LoggableSubscriber', [
39+
->setClass(LoggableListener::class, [
3840
'@' . $this->getClassAnalyzer()->getClass(),
3941
$config['isRecursive'],
4042
'@' . $loggerCallable->getClass()
@@ -47,7 +49,7 @@ public function loadConfiguration()
4749
/**
4850
* @throws AssertionException
4951
*/
50-
protected function validateConfigTypes(array $config)
52+
private function validateConfigTypes(array $config)
5153
{
5254
Validators::assertField($config, 'isRecursive', 'bool');
5355
Validators::assertField($config, 'loggerCallable', 'type');

‎src/DI/SluggableExtension.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
namespace Zenify\DoctrineBehaviors\DI;
99

1010
use Kdyby;
11+
use Knp\DoctrineBehaviors\Model\Sluggable\Sluggable;
12+
use Knp\DoctrineBehaviors\ORM\Sluggable\SluggableListener;
1113
use Nette\Utils\AssertionException;
1214
use Nette\Utils\Validators;
1315

@@ -20,7 +22,7 @@ class SluggableExtension extends BehaviorExtension
2022
*/
2123
protected $default = [
2224
'isRecursive' => TRUE,
23-
'trait' => 'Knp\DoctrineBehaviors\Model\Sluggable\Sluggable'
25+
'trait' => Sluggable::class
2426
];
2527

2628

@@ -31,7 +33,7 @@ public function loadConfiguration()
3133
$builder = $this->getContainerBuilder();
3234

3335
$builder->addDefinition($this->prefix('listener'))
34-
->setClass('Knp\DoctrineBehaviors\ORM\Sluggable\SluggableSubscriber', [
36+
->setClass(SluggableListener::class, [
3537
'@' . $this->getClassAnalyzer()->getClass(),
3638
$config['isRecursive'],
3739
$config['trait']
@@ -44,7 +46,7 @@ public function loadConfiguration()
4446
/**
4547
* @throws AssertionException
4648
*/
47-
protected function validateConfigTypes(array $config)
49+
private function validateConfigTypes(array $config)
4850
{
4951
Validators::assertField($config, 'isRecursive', 'bool');
5052
Validators::assertField($config, 'trait', 'type');

‎src/DI/SoftDeletableExtension.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
namespace Zenify\DoctrineBehaviors\DI;
99

1010
use Kdyby;
11+
use Knp\DoctrineBehaviors\Model\SoftDeletable\SoftDeletable;
12+
use Knp\DoctrineBehaviors\ORM\SoftDeletable\SoftDeletableListener;
1113
use Nette\Utils\AssertionException;
1214
use Nette\Utils\Validators;
1315

@@ -18,9 +20,9 @@ class SoftDeletableExtension extends BehaviorExtension
1820
/**
1921
* @var array
2022
*/
21-
protected $default = [
23+
private $default = [
2224
'isRecursive' => TRUE,
23-
'trait' => 'Knp\DoctrineBehaviors\Model\SoftDeletable\SoftDeletable'
25+
'trait' => SoftDeletable::class
2426
];
2527

2628

@@ -31,7 +33,7 @@ public function loadConfiguration()
3133
$builder = $this->getContainerBuilder();
3234

3335
$builder->addDefinition($this->prefix('listener'))
34-
->setClass('Knp\DoctrineBehaviors\ORM\SoftDeletable\SoftDeletableSubscriber', [
36+
->setClass(SoftDeletableListener::class, [
3537
'@' . $this->getClassAnalyzer()->getClass(),
3638
$config['isRecursive'],
3739
$config['trait']
@@ -44,7 +46,7 @@ public function loadConfiguration()
4446
/**
4547
* @throws AssertionException
4648
*/
47-
protected function validateConfigTypes(array $config)
49+
private function validateConfigTypes(array $config)
4850
{
4951
Validators::assertField($config, 'isRecursive', 'bool');
5052
Validators::assertField($config, 'trait', 'type');

‎src/DI/TimestampableExtension.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
namespace Zenify\DoctrineBehaviors\DI;
99

1010
use Kdyby;
11+
use Knp\DoctrineBehaviors\Model\Timestampable\Timestampable;
12+
use Knp\DoctrineBehaviors\ORM\Timestampable\TimestampableListener;
1113
use Nette\Utils\AssertionException;
1214
use Nette\Utils\Validators;
1315

@@ -18,9 +20,9 @@ class TimestampableExtension extends BehaviorExtension
1820
/**
1921
* @var array
2022
*/
21-
protected $default = [
23+
private $default = [
2224
'isRecursive' => TRUE,
23-
'trait' => 'Knp\DoctrineBehaviors\Model\Timestampable\Timestampable'
25+
'trait' => Timestampable::class
2426
];
2527

2628

@@ -31,7 +33,7 @@ public function loadConfiguration()
3133
$builder = $this->getContainerBuilder();
3234

3335
$builder->addDefinition($this->prefix('listener'))
34-
->setClass('Knp\DoctrineBehaviors\ORM\Timestampable\TimestampableSubscriber', [
36+
->setClass(TimestampableListener::class, [
3537
'@' . $this->getClassAnalyzer()->getClass(),
3638
$config['isRecursive'],
3739
$config['trait']
@@ -44,7 +46,7 @@ public function loadConfiguration()
4446
/**
4547
* @throws AssertionException
4648
*/
47-
protected function validateConfigTypes(array $config)
49+
private function validateConfigTypes(array $config)
4850
{
4951
Validators::assertField($config, 'isRecursive', 'bool');
5052
Validators::assertField($config, 'trait', 'type');

0 commit comments

Comments
 (0)