Fix Admin deprecated class usage (#391)

The Admin class has been deprecated in favour of AbstractAdmin,
and has been removed in 3.1 version of admin-bundle.

Admin/Admin.php

@@ -13,7 +13,7 @@
 
 use PHPCR\Util\PathHelper;
 use PHPCR\Util\UUIDHelper;
-use Sonata\AdminBundle\Admin\Admin as BaseAdmin;
+use Sonata\AdminBundle\Admin\AbstractAdmin;
 use Sonata\AdminBundle\Datagrid\ProxyQueryInterface;
 use Sonata\AdminBundle\Route\RouteCollection;
 
@@ -24,7 +24,7 @@
  *
  * @author Uwe Jäger <uwej711@googlemail.com>
  */
-class Admin extends BaseAdmin
+class Admin extends AbstractAdmin
 {
     /**
      * Path to the root node in the repository under which documents of this

Tests/Admin/AdminTest.php

@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Sonata Project package.
+ *
+ * (c) Thomas Rabaix <thomas.rabaix@sonata-project.org>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Sonata\DoctrinePHPCRAdminBundle\Tests\Admin;
+
+use Sonata\DoctrinePHPCRAdminBundle\Admin\Admin;
+
+class AdminTest extends \PHPUnit_Framework_TestCase
+{
+    public function testItCanBeInstanciated()
+    {
+        $admin = new Admin('', '', '');
+    }
+}

Tests/Builder/ListBuilderTest.php

@@ -102,7 +102,7 @@ private function setupAddField()
 
         //AdminInterface doesn't implement methods called in addField,
         //so we mock Admin
-        $this->admin = $this->getMock('\Sonata\AdminBundle\Admin\Admin', array(), array(), '', false);
+        $this->admin = $this->getMock('\Sonata\AdminBundle\Admin\AbstractAdmin', array(), array(), '', false);
         $this->admin->expects($this->any())
             ->method('getModelManager')
             ->will($this->returnValue($this->modelManager));

Tests/Route/PathInfoBuilderSlashesTest.php

@@ -19,12 +19,16 @@ public function testBuild()
     {
         $collectionChild = $this->getMock('Sonata\\AdminBundle\\Route\\RouteCollection', array(), array(), '', false);
 
-        $adminChild = $this->getMockBuilder('Sonata\\AdminBundle\\Admin\\Admin')->disableOriginalConstructor()->getMock();
+        $adminChild = $this->getMockBuilder('Sonata\\AdminBundle\\Admin\\AbstractAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
         $adminChild->expects($this->once())
             ->method('getRoutes')
             ->will($this->returnValue($collectionChild));
 
-        $admin = $this->getMockBuilder('Sonata\\AdminBundle\\Admin\\Admin')->disableOriginalConstructor()->getMock();
+        $admin = $this->getMockBuilder('Sonata\\AdminBundle\\Admin\\AbstractAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
         $admin->expects($this->once())
             ->method('getChildren')
             ->will($this->returnValue(array($adminChild)));
@@ -43,7 +47,9 @@ public function testBuild()
 
     public function testBuildWithAcl()
     {
-        $admin = $this->getMockBuilder('Sonata\\AdminBundle\\Admin\\Admin')->disableOriginalConstructor()->getMock();
+        $admin = $this->getMockBuilder('Sonata\\AdminBundle\\Admin\\AbstractAdmin')
+            ->disableOriginalConstructor()
+            ->getMock();
         $admin->expects($this->once())
             ->method('getChildren')
             ->will($this->returnValue(array()));

composer.json

@@ -19,7 +19,7 @@
         "php": "^5.5 || ^7.0",
         "doctrine/phpcr-bundle": "^1.1",
         "doctrine/phpcr-odm": "^1.1",
-        "sonata-project/admin-bundle": "^3.0",
+        "sonata-project/admin-bundle": "^3.1",
         "sonata-project/block-bundle": "^3.0",
         "symfony-cmf/resource-rest-bundle": "^1.0@dev",
         "symfony-cmf/tree-browser-bundle": "^2.0@dev",