Merge pull request #19 from sonata-project/master-dev-kit

DevKit updates for master branch
sonata-project · Oct 14, 2016 · bc4d1ef · bc4d1ef
2 parents 9165c34 + ebd7e65
commit bc4d1ef
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 27 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -7,6 +7,7 @@
 preset: symfony
 
 enabled:
+  - class_keyword_remove
   - combine_consecutive_unsets
   - long_array_syntax
   - newline_after_open_tag

diff --git a/Admin/ArticleAdmin.php b/Admin/ArticleAdmin.php
@@ -20,11 +20,7 @@
 use Sonata\ArticleBundle\Model\AbstractArticle;
 use Sonata\ArticleBundle\Model\ArticleInterface;
 use Sonata\ArticleBundle\Model\FragmentInterface;
-use Sonata\CoreBundle\Form\Type\DateTimePickerType;
 use Sonata\CoreBundle\Validator\ErrorElement;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\TextareaType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
 
 /**
  * @author Florent Denis <florent.denis@ekino.com>
@@ -134,33 +130,33 @@ protected function configureFormFields(FormMapper $formMapper)
 
         $formMapper
             ->with('General', array('class' => 'col-md-8'))
-                ->add('title', TextType::class, array(
+                ->add('title', 'Symfony\Component\Form\Extension\Core\Type\TextType', array(
                     'attr' => array('maxlength' => 255),
                 ))
-                ->add('subtitle', TextType::class, array(
+                ->add('subtitle', 'Symfony\Component\Form\Extension\Core\Type\TextType', array(
                     'required' => false,
                     'attr' => array('maxlength' => 255),
                 ))
-                ->add('abstract', TextareaType::class, array(
+                ->add('abstract', 'Symfony\Component\Form\Extension\Core\Type\TextareaType', array(
                     'required' => false,
                 ))
             ->end()
 
             ->with('Publication', array('class' => 'col-md-4'))
-                ->add('status', ChoiceType::class, array(
+                ->add('status', 'Symfony\Component\Form\Extension\Core\Type\ChoiceType', array(
                     'choices' => $this->isGranted('ROLE_ARTICLE_PUBLISH') ?
                         AbstractArticle::getStatuses() : AbstractArticle::getContributorStatus(),
                     'attr' => array('class' => 'full-width'),
                     'choices_as_values' => false,
                 ))
-                ->add('publicationStartsAt', DateTimePickerType::class, array(
+                ->add('publicationStartsAt', 'Sonata\CoreBundle\Form\Type\DateTimePickerType', array(
                     'format' => 'dd/MM/yyyy HH:mm',
                     'datepicker_use_button' => false,
                     'dp_side_by_side' => true,
                     'dp_language' => 'fr',
                     'required' => false,
                 ))
-                ->add('publicationEndsAt', DateTimePickerType::class, array(
+                ->add('publicationEndsAt', 'Sonata\CoreBundle\Form\Type\DateTimePickerType', array(
                     'format' => 'dd/MM/yyyy HH:mm',
                     'datepicker_use_button' => false,
                     'dp_side_by_side' => true,

diff --git a/Admin/FragmentAdmin.php b/Admin/FragmentAdmin.php
@@ -17,7 +17,6 @@
 use Sonata\AdminBundle\Route\RouteCollection;
 use Sonata\AdminBundle\Show\ShowMapper;
 use Sonata\ArticleBundle\FragmentService\FragmentServiceInterface;
-use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
 /**
@@ -237,10 +236,10 @@ protected function configureShowFields(ShowMapper $showMapper)
      */
     protected function configureFormFields(FormMapper $formMapper)
     {
-        $formMapper->add('id', HiddenType::class);
-        $formMapper->add('enabled', HiddenType::class);
-        $formMapper->add('position', HiddenType::class);
-        $formMapper->add('type', HiddenType::class, array('read_only' => true));
+        $formMapper->add('id', 'Symfony\Component\Form\Extension\Core\Type\HiddenType');
+        $formMapper->add('enabled', 'Symfony\Component\Form\Extension\Core\Type\HiddenType');
+        $formMapper->add('position', 'Symfony\Component\Form\Extension\Core\Type\HiddenType');
+        $formMapper->add('type', 'Symfony\Component\Form\Extension\Core\Type\HiddenType', array('read_only' => true));
 
         if (!is_object($this->getSubject())) {
             return;

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -181,9 +181,9 @@ namespace Foo;
 
 interface BarInterface
 {
-
-  // NEXT_MAJOR: Uncomment this method
   /**
+   * NEXT_MAJOR: Uncomment this method
+   *
    * This method does useful stuff.
    */
   // public function usefulMethod();

diff --git a/Tests/Helper/FragmentHelperTest.php b/Tests/Helper/FragmentHelperTest.php
@@ -11,9 +11,7 @@
 
 namespace Sonata\ArticleBundle\Tests\Helper;
 
-use Sonata\ArticleBundle\FragmentService\FragmentServiceInterface;
 use Sonata\ArticleBundle\Helper\FragmentHelper;
-use Sonata\ArticleBundle\Model\FragmentInterface;
 use Symfony\Component\Templating\EngineInterface;
 
 /**
@@ -33,7 +31,7 @@ class FragmentHelperTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->templating = $this->getMockBuilder(EngineInterface::class)
+        $this->templating = $this->getMockBuilder('Symfony\Component\Templating\EngineInterface')
             ->disableOriginalConstructor()
             ->setMethods(array('render', 'exists', 'supports'))
             ->getMock();
@@ -43,7 +41,7 @@ protected function setUp()
 
     public function testRenderWithoutService()
     {
-        $this->expectException(\RuntimeException::class);
+        $this->expectException('\RuntimeException');
         $this->expectExceptionMessage('Cannot render Fragment of type `foo.bar`. Service not found.');
 
         // templating render should not be called
@@ -60,7 +58,7 @@ public function testRender()
         // templating render must be called once
         $this->templating->expects($this->once())->method('render')->will($this->returnValue('foo'));
 
-        $fragmentService = $this->createMock(FragmentServiceInterface::class);
+        $fragmentService = $this->createMock('Sonata\ArticleBundle\FragmentService\FragmentServiceInterface');
         $fragmentService->expects($this->once())->method('getTemplate')->will($this->returnValue('template.html.twig'));
 
         $this->fragmentHelper->setFragmentServices(array('foo.bar' => $fragmentService));
@@ -72,7 +70,7 @@ public function testRender()
      */
     private function getFragmentMock()
     {
-        $fragment = $this->createMock(FragmentInterface::class);
+        $fragment = $this->createMock('Sonata\ArticleBundle\Model\FragmentInterface');
         $fragment->expects($this->once())->method('getType')->will($this->returnValue('foo.bar'));
         $fragment->expects($this->any())->method('getSettings')->will($this->returnValue(array()));
 

diff --git a/Tests/Twig/FragmentExtensionTest.php b/Tests/Twig/FragmentExtensionTest.php
@@ -12,7 +12,6 @@
 namespace Sonata\ArticleBundle\Tests\Twig;
 
 use Sonata\ArticleBundle\Helper\FragmentHelper;
-use Sonata\ArticleBundle\Model\ArticleInterface;
 use Sonata\ArticleBundle\Model\FragmentInterface;
 use Sonata\ArticleBundle\Twig\FragmentExtension;
 
@@ -33,7 +32,7 @@ class FragmentExtensionTest extends \PHPUnit_Framework_TestCase
 
     protected function setUp()
     {
-        $this->fragmentHelper = $this->getMockBuilder(FragmentHelper::class)
+        $this->fragmentHelper = $this->getMockBuilder('Sonata\ArticleBundle\Helper\FragmentHelper')
             ->disableOriginalConstructor()
             ->setMethods(array('render'))
             ->getMock();
@@ -76,7 +75,7 @@ public function testRenderArticleFragment()
             );
         }
 
-        $article = $this->createMock(ArticleInterface::class);
+        $article = $this->createMock('Sonata\ArticleBundle\Model\ArticleInterface');
         $article->expects($this->any())
             ->method('getFragments')
             ->will($this->returnValue($fragments));
@@ -110,7 +109,7 @@ public function renderFragment(FragmentInterface $fragment)
      */
     protected function getFragmentMock(array $settings, $enabled = true)
     {
-        $fragment = $this->createMock(FragmentInterface::class);
+        $fragment = $this->createMock('Sonata\ArticleBundle\Model\FragmentInterface');
         $fragment->expects($this->any())
             ->method('getSettings')
             ->will($this->returnValue($settings));