Merge pull request #4122 from greg0ire/avoid_deprecation_notices

Avoid deprecation notices

Tests/Controller/CRUDControllerTest.php

@@ -11,6 +11,8 @@
 
 namespace Sonata\AdminBundle\Tests\Controller;
 
+use Exporter\Exporter;
+use Exporter\Writer\JsonWriter;
 use Sonata\AdminBundle\Admin\AdminInterface;
 use Sonata\AdminBundle\Admin\FieldDescriptionCollection;
 use Sonata\AdminBundle\Admin\Pool;
@@ -178,11 +180,16 @@ class CRUDControllerTest extends \PHPUnit_Framework_TestCase
                 }
             }));
 
-        $exporter = $this->getMock('Sonata\AdminBundle\Export\Exporter');
+        // NEXT_MAJOR : require sonata/exporter ^1.7 and remove conditional
+        if (class_exists('Exporter\Exporter')) {
+            $exporter = new Exporter(array(new JsonWriter('/tmp/sonataadmin/export.json')));
+        } else {
+            $exporter = $this->getMock('Sonata\AdminBundle\Export\Exporter');
 
-        $exporter->expects($this->any())
-            ->method('getResponse')
-            ->will($this->returnValue(new StreamedResponse()));
+            $exporter->expects($this->any())
+                ->method('getResponse')
+                ->will($this->returnValue(new StreamedResponse()));
+        }
 
         $this->auditManager = $this->getMockBuilder('Sonata\AdminBundle\Model\AuditManager')
             ->disableOriginalConstructor()

Tests/Export/ExporterTest.php

@@ -14,6 +14,9 @@ namespace Sonata\AdminBundle\Tests\Filter;
 use Exporter\Source\ArraySourceIterator;
 use Sonata\AdminBundle\Export\Exporter;
 
+/**
+ * @group legacy
+ */
 class ExporterTest extends \PHPUnit_Framework_TestCase
 {
     /**

Tests/Form/Widget/BaseWidgetTest.php

@@ -56,7 +56,9 @@ abstract class BaseWidgetTest extends AbstractWidgetTestCase
     {
         $environment = parent::getEnvironment();
         $environment->addGlobal('sonata_admin', $this->getSonataAdmin());
-        $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        if (!$environment->hasExtension('translator')) {
+            $environment->addExtension(new TranslationExtension(new StubTranslator()));
+        }
 
         return $environment;
     }