Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Next major #335

Merged
merged 2 commits into from
Sep 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Block/AbstractBlockService.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
/**
* Class AbstractBlockService.
*
* NEXT_MAJOR: remove this class.
*
* @author Sullivan Senechal <soullivaneuh@gmail.com>
*
* @deprecated since 3.2, to be removed with 4.0
Expand Down
1 change: 1 addition & 0 deletions Block/BaseBlockService.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
/**
* BaseBlockService.
*
* NEXT_MAJOR: remove this class.
*
* @author Thomas Rabaix <thomas.rabaix@sonata-project.org>
*
Expand Down
2 changes: 2 additions & 0 deletions Block/BlockAdminServiceInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
);

/**
* NEXT_MAJOR: remove this interface.
*
* @deprecated since 3.2, to be removed with 4.0
*/
interface BlockAdminServiceInterface extends AdminBlockServiceInterface
Expand Down
2 changes: 2 additions & 0 deletions Block/BlockContextManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ public function get($meta, array $settings = array())
}

/**
* NEXT_MAJOR: remove this method.
*
* @param OptionsResolverInterface $optionsResolver
* @param BlockInterface $block
*
Expand Down
4 changes: 4 additions & 0 deletions Block/BlockServiceInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
/**
* Interface BlockServiceInterface.
*
* NEXT_MAJOR: remove this interface.
*
* @deprecated since 3.2, to be removed with 4.0
*/
interface BlockServiceInterface
Expand All @@ -38,6 +40,8 @@ public function getName();
/**
* Define the default options for the block.
*
* NEXT_MAJOR: rename this method.
*
* @param OptionsResolverInterface $resolver
*
* @deprecated since version 2.3, to be renamed in 3.0.
Expand Down
8 changes: 6 additions & 2 deletions Block/BlockServiceManagerInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ public function add($name, $service, $contexts = array());
public function get(BlockInterface $block);

/**
* @deprecated will be remove in 2.4, use the add method instead
* NEXT_MAJOR: remove this method.
*
* @deprecated will be removed in 2.4, use the add method instead
*
* @param array $blockServices
*/
Expand Down Expand Up @@ -67,7 +69,9 @@ public function has($name);
public function getService($name);

/**
* @deprecated will be remove in 2.4
* NEXT_MAJOR: remove this method.
*
* @deprecated will be removed in 2.4
*
* @return array
*/
Expand Down
2 changes: 2 additions & 0 deletions Tests/Block/AbstractBlockServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
);

/**
* NEXT_MAJOR: remove this class.
*
* @deprecated Deprecated since version 3.1. Use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase instead
*/
abstract class AbstractBlockServiceTest extends AbstractBlockServiceTestCase
Expand Down
2 changes: 2 additions & 0 deletions Tests/Block/Service/BaseTestBlockService.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
);

/**
* NEXT_MAJOR: remove this class.
*
* @deprecated Deprecated since version 3.1 and will be removed in 4.0
*/
class BaseTestBlockService extends \PHPUnit_Framework_TestCase
Expand Down
2 changes: 2 additions & 0 deletions Tests/Block/Service/FakeTemplating.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
);

/**
* NEXT_MAJOR: remove this class.
*
* @deprecated since version 3.1 and will be removed in 4.0. Use Sonata\BlockBundle\Test\FakeTemplating instead
*/
class FakeTemplating extends BaseTemplating
Expand Down