Skip to content

Commit

Permalink
Merge pull request #326 from sonata-project/analysis-qo7lDK
Browse files Browse the repository at this point in the history
Applied fixes from StyleCI
  • Loading branch information
core23 committed Jul 28, 2016
2 parents 2d111b8 + dd4cd7a commit c1521f0
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Block/BlockContextManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ public function get($meta, array $settings = array())
* @param BlockInterface $block
*
* @deprecated since version 2.3, to be renamed in 3.0.
* Use the method configureSettings instead.
* Use the method configureSettings instead
*/
protected function setDefaultSettings(OptionsResolverInterface $optionsResolver, BlockInterface $block)
{
Expand Down
2 changes: 1 addition & 1 deletion Block/BlockServiceInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function getName();
*
* @deprecated since version 2.3, to be renamed in 3.0.
* Use the method configureSettings instead.
* This method will be added to the BlockServiceInterface with SonataBlockBundle 3.0.
* This method will be added to the BlockServiceInterface with SonataBlockBundle 3.0
*/
public function setDefaultSettings(OptionsResolverInterface $resolver);

Expand Down
4 changes: 2 additions & 2 deletions Templating/Helper/BlockHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public function getName()

/**
* @param string $media Unused, only kept to not break existing code
* @param string $basePath Base path to prepend to the stylesheet urls.
* @param string $basePath Base path to prepend to the stylesheet urls
*
* @return array|string
*/
Expand All @@ -141,7 +141,7 @@ public function includeJavascripts($media, $basePath = '')

/**
* @param string $media The css media type to use: all|screen|...
* @param string $basePath Base path to prepend to the stylesheet urls.
* @param string $basePath Base path to prepend to the stylesheet urls
*
* @return array|string
*/
Expand Down
2 changes: 1 addition & 1 deletion Tests/Block/AbstractBlockServiceTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
);

/**
* @deprecated Deprecated since version 3.1. Use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase instead.
* @deprecated Deprecated since version 3.1. Use Sonata\BlockBundle\Test\AbstractBlockServiceTestCase instead
*/
abstract class AbstractBlockServiceTest extends AbstractBlockServiceTestCase
{
Expand Down
2 changes: 1 addition & 1 deletion Tests/Block/Service/BaseTestBlockService.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
);

/**
* @deprecated Deprecated since version 3.1 and will be removed in 4.0.
* @deprecated Deprecated since version 3.1 and will be removed in 4.0
*/
class BaseTestBlockService extends \PHPUnit_Framework_TestCase
{
Expand Down
2 changes: 1 addition & 1 deletion Tests/Block/Service/FakeTemplating.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
);

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

0 comments on commit c1521f0

Please sign in to comment.