Merge pull request #129 from darkwebdesign/ISSUE-104

ISSUE-104: Update Add-on Pack for Symfony 3.0

Author: raymondschouten

src/BooleanType.php

@@ -54,14 +54,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        $self = $this;
-
-        $labelTrueNormalizer = function (Options $options, $value) use ($self) {
-            return !is_null($value) ? (string) $value : $self->humanize($options['value_true']);
+        $labelTrueNormalizer = function (Options $options, $value) {
+            return !is_null($value) ? (string) $value : $this->humanize($options['value_true']);
         };
 
-        $labelFalseNormalizer = function (Options $options, $value) use ($self) {
-            return !is_null($value) ? (string) $value : $self->humanize($options['value_false']);
+        $labelFalseNormalizer = function (Options $options, $value) {
+            return !is_null($value) ? (string) $value : $this->humanize($options['value_false']);
         };
 
         $choicesNormalizer = function (Options $options) {
@@ -117,8 +115,6 @@ public function getParent()
      * @param string $text
      *
      * @return string
-     *
-     * @deprecated since 2.8, will be removed in 3.0
      */
     public function humanize($text)
     {

tests/EntityTypeTest.php

@@ -36,16 +36,16 @@ class EntityTypeTest extends TypeTestCase
     /** @var int */
     private $identifier;
 
-    /** @var \Doctrine\Common\Persistence\ManagerRegistry */
+    /** @var \Doctrine\Common\Persistence\ManagerRegistry|\PHPUnit_Framework_MockObject_MockObject */
     private $registry;
 
-    /** @var \Doctrine\Common\Persistence\ObjectManager */
+    /** @var \Doctrine\Common\Persistence\ObjectManager|\PHPUnit_Framework_MockObject_MockObject */
     private $entityManager;
 
-    /** @var \Doctrine\Common\Persistence\ObjectRepository */
+    /** @var \Doctrine\Common\Persistence\ObjectRepository|\PHPUnit_Framework_MockObject_MockObject */
     private $repository;
 
-    /** @var \Doctrine\Common\Persistence\Mapping\ClassMetadata */
+    /** @var \Doctrine\Common\Persistence\Mapping\ClassMetadata|\PHPUnit_Framework_MockObject_MockObject */
     private $metadata;
 
     protected function setUp()