浏览代码

Merge pull request #4439 from greg0ire/remove_protected_method

Remove protected method
Jordi Sala Morales 8 年之前
父节点
当前提交
93faa541a3
共有 3 个文件被更改,包括 2 次插入10 次删除
  1. 0 8
      Admin/AdminInterface.php
  2. 1 1
      Controller/CoreController.php
  3. 1 1
      Tests/Helpers/PHPUnit_Framework_TestCase.php

+ 0 - 8
Admin/AdminInterface.php

@@ -1072,12 +1072,4 @@ interface AdminInterface
      */
      */
 //    NEXT_MAJOR: uncomment this method in 4.0
 //    NEXT_MAJOR: uncomment this method in 4.0
     // public function isDefaultFilter($name);
     // public function isDefaultFilter($name);
-
-    /*
-     * Returns a list of default filters.
-     *
-     * @return array
-     */
-//    NEXT_MAJOR: uncomment this method in 4.0
-    // public function getDefaultFilterValues();
 }
 }

+ 1 - 1
Controller/CoreController.php

@@ -119,7 +119,7 @@ class CoreController extends Controller
      * NEXT_MAJOR: remove this method.
      * NEXT_MAJOR: remove this method.
      *
      *
      * @deprecated since 3.0, to be removed in 4.0 and action methods will be adjusted.
      * @deprecated since 3.0, to be removed in 4.0 and action methods will be adjusted.
-     *             Use Symfony\Component\HttpFoundation\Request as an action argument.
+     *             Use Symfony\Component\HttpFoundation\Request as an action argument
      *
      *
      * @return Request
      * @return Request
      */
      */

+ 1 - 1
Tests/Helpers/PHPUnit_Framework_TestCase.php

@@ -14,7 +14,7 @@ namespace Sonata\AdminBundle\Tests\Helpers;
 /**
 /**
  * This is helpers class for supporting old and new PHPUnit versions.
  * This is helpers class for supporting old and new PHPUnit versions.
  *
  *
- * @todo NEXT_MAJOR: Remove this class when dropping support for < PHPUnit 5.4.
+ * @todo NEXT_MAJOR: Remove this class when dropping support for < PHPUnit 5.4
  *
  *
  * @author Oleksandr Savchenko <savchenko.oleksandr.ua@gmail.com>
  * @author Oleksandr Savchenko <savchenko.oleksandr.ua@gmail.com>
  */
  */