use NEXT_MAJOR instead of a @todo (#4109)

Command/ExplainAdminCommand.php

@@ -68,13 +68,23 @@ class ExplainAdminCommand extends ContainerAwareCommand
         $output->writeln('');
         $output->writeln('<info>Datagrid Columns</info>');
         foreach ($admin->getListFieldDescriptions() as $name => $fieldDescription) {
-            $output->writeln(sprintf('  - % -25s  % -15s % -15s', $name, $fieldDescription->getType(), $fieldDescription->getTemplate()));
+            $output->writeln(sprintf(
+                '  - % -25s  % -15s % -15s',
+                $name,
+                $fieldDescription->getType(),
+                $fieldDescription->getTemplate()
+            ));
         }
 
         $output->writeln('');
         $output->writeln('<info>Datagrid Filters</info>');
         foreach ($admin->getFilterFieldDescriptions() as $name => $fieldDescription) {
-            $output->writeln(sprintf('  - % -25s  % -15s % -15s', $name, $fieldDescription->getType(), $fieldDescription->getTemplate()));
+            $output->writeln(sprintf(
+                '  - % -25s  % -15s % -15s',
+                $name,
+                $fieldDescription->getType(),
+                $fieldDescription->getTemplate()
+            ));
         }
 
         $output->writeln('');
@@ -86,7 +96,12 @@ class ExplainAdminCommand extends ContainerAwareCommand
         $output->writeln('');
         $output->writeln('<info>Form Fields</info>');
         foreach ($admin->getFormFieldDescriptions() as $name => $fieldDescription) {
-            $output->writeln(sprintf('  - % -25s  % -15s % -15s', $name, $fieldDescription->getType(), $fieldDescription->getTemplate()));
+            $output->writeln(sprintf(
+                '  - % -25s  % -15s % -15s',
+                $name,
+                $fieldDescription->getType(),
+                $fieldDescription->getTemplate()
+            ));
         }
 
         $metadata = false;
@@ -115,7 +130,11 @@ class ExplainAdminCommand extends ContainerAwareCommand
                 $output->writeln(sprintf('  - %s', $name));
 
                 foreach ($property->getConstraints() as $constraint) {
-                    $output->writeln(sprintf('    % -70s %s', get_class($constraint), implode('|', $constraint->groups)));
+                    $output->writeln(sprintf(
+                        '    % -70s %s',
+                        get_class($constraint),
+                        implode('|', $constraint->groups)
+                    ));
                 }
             }
         }
@@ -130,7 +149,11 @@ class ExplainAdminCommand extends ContainerAwareCommand
                 $output->writeln(sprintf('  - %s', $name));
 
                 foreach ($property->getConstraints() as $constraint) {
-                    $output->writeln(sprintf('    % -70s %s', get_class($constraint), implode('|', $constraint->groups)));
+                    $output->writeln(sprintf(
+                        '    % -70s %s',
+                        get_class($constraint),
+                        implode('|', $constraint->groups)
+                    ));
                 }
             }
         }

Command/GenerateAdminCommand.php

@@ -290,8 +290,8 @@ class GenerateAdminCommand extends ContainerAwareCommand
     {
         $questionHelper = $this->getQuestionHelper();
 
+        // NEXT_MAJOR: Remove this BC code for SensioGeneratorBundle 2.3/2.4 after dropping support for Symfony 2.3
         if ($questionHelper instanceof DialogHelper) {
-            // @todo remove this BC code for SensioGeneratorBundle 2.3/2.4 after dropping  support for Symfony 2.3
             return $questionHelper->askAndValidate($output, $questionHelper->getQuestion($questionText, $default), $validator, false, $default);
         }
 
@@ -315,9 +315,9 @@ class GenerateAdminCommand extends ContainerAwareCommand
     {
         $questionHelper = $this->getQuestionHelper();
 
+        // NEXT_MAJOR: Remove this BC code for SensioGeneratorBundle 2.3/2.4 after dropping support for Symfony 2.3
         if ($questionHelper instanceof DialogHelper) {
-            // @todo remove this BC code for SensioGeneratorBundle 2.3/2.4 after dropping  support for Symfony 2.3
-             $question = $questionHelper->getQuestion($questionText, $default, $separator);
+            $question = $questionHelper->getQuestion($questionText, $default, $separator);
 
             return $questionHelper->askConfirmation($output, $question, ($default === 'no' ? false : true));
         }
@@ -404,8 +404,8 @@ class GenerateAdminCommand extends ContainerAwareCommand
      */
     private function getKernel()
     {
-        $application = $this->getApplication();
         /* @var $application Application */
+        $application = $this->getApplication();
 
         return $application->getKernel();
     }
@@ -415,8 +415,8 @@ class GenerateAdminCommand extends ContainerAwareCommand
      */
     private function getQuestionHelper()
     {
+        // NEXT_MAJOR: Remove this BC code for SensioGeneratorBundle 2.3/2.4 after dropping support for Symfony 2.3
         if (class_exists('Sensio\Bundle\GeneratorBundle\Command\Helper\DialogHelper')) {
-            // @todo remove this BC code for SensioGeneratorBundle 2.3/2.4 after dropping  support for Symfony 2.3
             $questionHelper = $this->getHelper('dialog');
 
             if (!$questionHelper instanceof DialogHelper) {

Command/SetupAclCommand.php

@@ -50,7 +50,10 @@ class SetupAclCommand extends ContainerAwareCommand
 
             $manipulator = $this->getContainer()->get('sonata.admin.manipulator.acl.admin');
             if (!$manipulator instanceof AdminAclManipulatorInterface) {
-                $output->writeln(sprintf('The interface "AdminAclManipulatorInterface" is not implemented for %s: <info>ignoring</info>', get_class($manipulator)));
+                $output->writeln(sprintf(
+                    'The interface "AdminAclManipulatorInterface" is not implemented for %s: <info>ignoring</info>',
+                    get_class($manipulator)
+                ));
                 continue;
             }
             $manipulator->configureAcls($output, $admin);

Command/Validators.php

@@ -50,7 +50,11 @@ class Validators
         $entity = str_replace('/', '\\', $shortcut);
 
         if (false === $pos = strpos($entity, ':')) {
-            throw new \InvalidArgumentException(sprintf('The entity name must contain a : ("%s" given, expecting something like AcmeBlogBundle:Post)', $entity));
+            throw new \InvalidArgumentException(sprintf(
+                'The entity name must contain a ":" (colon sign) '
+                .'("%s" given, expecting something like AcmeBlogBundle:Post)',
+                $entity
+            ));
         }
 
         return array(substr($entity, 0, $pos), substr($entity, $pos + 1));
@@ -90,7 +94,11 @@ class Validators
         $adminClassBasename = str_replace('/', '\\', $adminClassBasename);
 
         if (false !== strpos($adminClassBasename, ':')) {
-            throw new \InvalidArgumentException(sprintf('The admin class name must not contain a : ("%s" given, expecting something like PostAdmin")', $adminClassBasename));
+            throw new \InvalidArgumentException(sprintf(
+                'The admin class name must not contain a ":" (colon sign) '
+                .'("%s" given, expecting something like PostAdmin")',
+                $adminClassBasename
+            ));
         }
 
         return $adminClassBasename;
@@ -110,11 +118,15 @@ class Validators
         $controllerClassBasename = str_replace('/', '\\', $controllerClassBasename);
 
         if (false !== strpos($controllerClassBasename, ':')) {
-            throw new \InvalidArgumentException(sprintf('The controller class name must not contain a : ("%s" given, expecting something like PostAdminController")', $controllerClassBasename));
+            throw new \InvalidArgumentException(sprintf(
+                'The controller class name must not contain a ":" (colon sign) ("%s" given, '
+                .'expecting something like PostAdminController")',
+                $controllerClassBasename
+            ));
         }
 
         if (substr($controllerClassBasename, -10) != 'Controller') {
-            throw new \InvalidArgumentException('The controller class name must end with Controller.');
+            throw new \InvalidArgumentException('The controller class name must end with "Controller".');
         }
 
         return $controllerClassBasename;

Datagrid/ListMapper.php

@@ -18,7 +18,6 @@ use Sonata\AdminBundle\Builder\ListBuilderInterface;
 use Sonata\AdminBundle\Mapper\BaseMapper;
 
 /**
- * Class ListMapper
  * This class is used to simulate the Form API.
  *
  * @author  Thomas Rabaix <thomas.rabaix@sonata-project.org>
@@ -96,7 +95,10 @@ class ListMapper extends BaseMapper
             $fieldDescription->mergeOptions($fieldDescriptionOptions);
         } elseif (is_string($name)) {
             if ($this->admin->hasListFieldDescription($name)) {
-                throw new \RuntimeException(sprintf('Duplicate field name "%s" in list mapper. Names should be unique.', $name));
+                throw new \RuntimeException(sprintf(
+                    'Duplicate field name "%s" in list mapper. Names should be unique.',
+                    $name
+                ));
             }
 
             $fieldDescription = $this->admin->getModelManager()->getNewFieldDescriptionInstance(
@@ -105,11 +107,17 @@ class ListMapper extends BaseMapper
                 $fieldDescriptionOptions
             );
         } else {
-            throw new \RuntimeException('Unknown field name in list mapper. Field name should be either of FieldDescriptionInterface interface or string.');
+            throw new \RuntimeException(
+                'Unknown field name in list mapper. '
+                .'Field name should be either of FieldDescriptionInterface interface or string.'
+            );
         }
 
         if (!$fieldDescription->getLabel()) {
-            $fieldDescription->setOption('label', $this->admin->getLabelTranslatorStrategy()->getLabel($fieldDescription->getName(), 'list', 'label'));
+            $fieldDescription->setOption(
+                'label',
+                $this->admin->getLabelTranslatorStrategy()->getLabel($fieldDescription->getName(), 'list', 'label')
+            );
         }
 
         // add the field with the FormBuilder

Form/Extension/ChoiceTypeExtension.php

@@ -25,9 +25,9 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 class ChoiceTypeExtension extends AbstractTypeExtension
 {
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Extension/Field/Type/FormTypeFieldExtension.php

@@ -174,9 +174,9 @@ class FormTypeFieldExtension extends AbstractTypeExtension
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Extension/Field/Type/MopaCompatibilityTypeFieldExtension.php

@@ -28,9 +28,9 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 class MopaCompatibilityTypeFieldExtension extends AbstractTypeExtension
 {
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/AclMatrixType.php

@@ -55,9 +55,9 @@ class AclMatrixType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -86,9 +86,9 @@ class AclMatrixType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {

Form/Type/AdminType.php

@@ -59,7 +59,7 @@ class AdminType extends AbstractType
                 $parentSubject = $admin->getParentFieldDescription()->getAdmin()->getSubject();
                 if ($parentSubject !== null && $parentSubject !== false) {
                     // for PropertyAccessor < 2.5
-                    // @todo remove this code for old PropertyAccessor after dropping support for Symfony 2.3
+                    // NEXT_MAJOR: remove this code for old PropertyAccessor after dropping support for Symfony 2.3
                     if (!method_exists($p, 'isReadable')) {
                         $subjectCollection = $p->getValue(
                             $parentSubject,
@@ -101,9 +101,9 @@ class AdminType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -135,9 +135,9 @@ class AdminType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {

Form/Type/ChoiceFieldMaskType.php

@@ -46,9 +46,9 @@ class ChoiceFieldMaskType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -60,7 +60,7 @@ class ChoiceFieldMaskType extends AbstractType
      */
     public function configureOptions(OptionsResolver $resolver)
     {
-        // TODO: Remove conditional parent call when bumping requirements to SF 2.7+
+        // NEXT_MAJOR: Remove conditional parent call when bumping requirements to SF 2.7+
         if (method_exists('Symfony\Component\Form\AbstractType', 'configureOptions')) {
             parent::configureOptions($resolver);
         } else {
@@ -81,9 +81,9 @@ class ChoiceFieldMaskType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {

Form/Type/CollectionType.php

@@ -33,9 +33,9 @@ class CollectionType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {

Form/Type/Filter/ChoiceType.php

@@ -46,9 +46,9 @@ class ChoiceType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -102,9 +102,9 @@ class ChoiceType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/Filter/DateRangeType.php

@@ -43,9 +43,9 @@ class DateRangeType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -97,10 +97,10 @@ class DateRangeType extends AbstractType
         ;
     }
 
+    // NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+
+
     /**
      * {@inheritdoc}
-     *
-     * @todo Remove it when bumping requirements to SF 2.7+
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/Filter/DateTimeRangeType.php

@@ -43,9 +43,9 @@ class DateTimeRangeType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -98,9 +98,9 @@ class DateTimeRangeType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/Filter/DateTimeType.php

@@ -54,9 +54,9 @@ class DateTimeType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -114,9 +114,9 @@ class DateTimeType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/Filter/DateType.php

@@ -54,9 +54,9 @@ class DateType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -114,9 +114,9 @@ class DateType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/Filter/DefaultType.php

@@ -24,9 +24,9 @@ use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 class DefaultType extends AbstractType
 {
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -53,9 +53,9 @@ class DefaultType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/Filter/NumberType.php

@@ -50,9 +50,9 @@ class NumberType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {
@@ -109,9 +109,9 @@ class NumberType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/ModelAutocompleteType.php

@@ -95,9 +95,9 @@ class ModelAutocompleteType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {

Form/Type/ModelHiddenType.php

@@ -35,9 +35,9 @@ class ModelHiddenType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -64,9 +64,9 @@ class ModelHiddenType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {

Form/Type/ModelListType.php

@@ -67,9 +67,9 @@ class ModelListType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -100,9 +100,9 @@ class ModelListType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {

Form/Type/ModelReferenceType.php

@@ -33,9 +33,9 @@ class ModelReferenceType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -63,9 +63,9 @@ class ModelReferenceType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {

Form/Type/ModelType.php

@@ -81,9 +81,9 @@ class ModelType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove method, when bumping requirements to SF 2.7+.
      *
-     * @todo Remove it when bumping requirements to SF 2.7+
+     * {@inheritdoc}
      */
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
@@ -175,9 +175,9 @@ class ModelType extends AbstractType
     }
 
     /**
-     * {@inheritdoc}
+     * NEXT_MAJOR: Remove when dropping Symfony <2.8 support.
      *
-     * @todo Remove when dropping Symfony <2.8 support
+     * {@inheritdoc}
      */
     public function getName()
     {

Security/Handler/AclSecurityHandler.php

@@ -68,13 +68,13 @@ class AclSecurityHandler implements AclSecurityHandlerInterface
     protected $maskBuilderClass;
 
     /**
+     * NEXT_MAJOR: Go back to signature class check when bumping requirements to SF 2.6+.
+     *
      * @param TokenStorageInterface|SecurityContextInterface $tokenStorage
      * @param TokenStorageInterface|SecurityContextInterface $authorizationChecker
      * @param MutableAclProviderInterface                    $aclProvider
      * @param string                                         $maskBuilderClass
      * @param array                                          $superAdminRoles
-     *
-     * @todo Go back to signature class check when bumping requirements to SF 2.6+
      */
     public function __construct($tokenStorage, $authorizationChecker, MutableAclProviderInterface $aclProvider, $maskBuilderClass, array $superAdminRoles)
     {

Security/Handler/RoleSecurityHandler.php

@@ -34,10 +34,10 @@ class RoleSecurityHandler implements SecurityHandlerInterface
     protected $superAdminRoles;
 
     /**
+     * NEXT_MAJOR: Go back to signature class check when bumping requirements to SF 2.6+.
+     *
      * @param AuthorizationCheckerInterface|SecurityContextInterface $authorizationChecker
      * @param array                                                  $superAdminRoles
-     *
-     * @todo Go back to signature class check when bumping requirements to SF 2.6+
      */
     public function __construct($authorizationChecker, array $superAdminRoles)
     {

Tests/Command/GenerateAdminCommandTest.php

@@ -198,7 +198,7 @@ class GenerateAdminCommandTest extends \PHPUnit_Framework_TestCase
 
         $command = $this->application->find('sonata:admin:generate');
 
-        // @todo remove this BC code for SensioGeneratorBundle 2.3/2.4 after dropping  support for Symfony 2.3
+        // NEXT_MAJOR: Remove this BC code for SensioGeneratorBundle 2.3/2.4 after dropping support for Symfony 2.3
         // DialogHelper does not exist in SensioGeneratorBundle 2.5+
         if (class_exists('Sensio\Bundle\GeneratorBundle\Command\Helper\DialogHelper')) {
             $dialog = $this->getMock('Sensio\Bundle\GeneratorBundle\Command\Helper\DialogHelper', array('askConfirmation', 'askAndValidate'));