Merge pull request #36 from fre5h/feature-symfony-3.0

Symfony 3.0 support

Author: fre5h

.travis.yml

@@ -3,13 +3,13 @@ sudo: false
 
 php:
   - 5.4
-  - 5.6
   - 7.0
   - hhvm
 
 env:
+  - SYMFONY_VERSION=2.6.*
   - SYMFONY_VERSION=2.7.*
-  - SYMFONY_VERSION=3.0.*@dev
+  - SYMFONY_VERSION=3.0.*
 
 allow_failures:
   - php: hhvm

README.md

@@ -22,7 +22,15 @@ Provides support of **ENUM type** for Doctrine in Symfony applications.
 
 ## Installation
 
-#### Latest stable version
+#### Latest actual stable version (includes support of Symfony3)
+
+* PHP >= 5.4
+* Symfony >= 2.6, **also works with Symfony 3.0**
+* Doctrine >= 2.2
+
+```php composer.phar require fresh/doctrine-enum-bundle='v4.0'```
+
+#### Latest stable version for Symfony <=2.8
 
 * PHP >= 5.4
 * Symfony >= 2.3 and <= 2.8

Resources/config/services.yml

@@ -21,7 +21,7 @@ services:
     enum_type_guesser:
         class: %enum_type_guesser.class%
         arguments:
-            - @doctrine
+            - "@doctrine"
             - %doctrine.dbal.connection_factory.types%
         tags:
             - { name: form.type_guesser }

Tests/Validator/EnumValidatorTest.php

@@ -39,7 +39,7 @@ public function setUp()
     {
         $this->enumValidator = new EnumValidator();
 
-        $this->context = $this->getMockBuilder('Symfony\Component\Validator\ExecutionContext')
+        $this->context = $this->getMockBuilder('Symfony\Component\Validator\Context\ExecutionContext')
                               ->disableOriginalConstructor()
                               ->getMock();
     }
@@ -67,9 +67,8 @@ public function testValidBasketballPositionType()
             'entity' => 'Fresh\DoctrineEnumBundle\Tests\Fixtures\DBAL\Types\BasketballPositionType',
         ]);
 
-        $this->context
-             ->expects($this->never())
-             ->method('addViolation');
+        $this->context->expects($this->never())
+                      ->method('buildViolation');
 
         $this->enumValidator->initialize($this->context);
         $this->enumValidator->validate(BasketballPositionType::SMALL_FORWARD, $constraint);
@@ -84,13 +83,23 @@ public function testInvalidBasketballPositionType()
             'entity' => 'Fresh\DoctrineEnumBundle\Tests\Fixtures\DBAL\Types\BasketballPositionType',
         ]);
 
-        $this->context
-             ->expects($this->once())
-             ->method('addViolation')
-             ->with(
-                 $this->equalTo('The value you selected is not a valid choice.'),
-                 $this->equalTo(['{{ value }}' => '"Pitcher"'])
-             );
+        $constraintValidationBuilder = $this->getMockBuilder('Symfony\Component\Validator\Violation\ConstraintViolationBuilder')
+                                            ->disableOriginalConstructor()
+                                            ->getMock();
+
+        $constraintValidationBuilder->expects($this->once())
+                                    ->method('setParameter')
+                                    ->with($this->equalTo('{{ value }}'), $this->equalTo('"Pitcher"'))
+                                    ->will($this->returnSelf());
+
+        $constraintValidationBuilder->expects($this->once())
+                                    ->method('setCode')
+                                    ->will($this->returnSelf());
+
+        $this->context->expects($this->once())
+                      ->method('buildViolation')
+                      ->with($this->equalTo('The value you selected is not a valid choice.'))
+                      ->will($this->returnValue($constraintValidationBuilder));
 
         $this->enumValidator->initialize($this->context);
         $this->enumValidator->validate('Pitcher', $constraint); // It's not a baseball =)

composer.json

@@ -23,7 +23,7 @@
     },
     "require": {
         "php": ">=5.4.0",
-        "symfony/symfony": "~2.3",
+        "symfony/symfony": "~2.6|~3.0",
         "doctrine/orm": "~2.2"
     },
     "require-dev": {