Skip to content

Commit

Permalink
Merge pull request ezsystems#176 from clash82/psr2
Browse files Browse the repository at this point in the history 
Switch coding standards to PSR-2
  • Loading branch information
@andrerom
andrerom committed Aug 28, 2015
2 parents 65b0457 + c2c016b commit fefb7b0
Show file tree
Hide file tree
Showing 30 changed files with 449 additions and 495 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Expand Up @@ -2,4 +2,4 @@
/.idea/
composer.lock
composer.phar

.php_cs.cache
27 changes: 27 additions & 0 deletions .php_cs
View file
@@ -0,0 +1,27 @@
<?php

return Symfony\CS\Config\Config::create()
->setUsingLinter(false)
->setUsingCache(true)
->level(Symfony\CS\FixerInterface::SYMFONY_LEVEL)
->fixers([
'concat_with_spaces',
'-concat_without_spaces',
'-empty_return',
'-phpdoc_params',
'-phpdoc_separation',
'-phpdoc_to_comment',
'-spaces_cast',
'-blankline_after_open_tag',
'-single_blank_line_before_namespace',
])
->finder(
Symfony\CS\Finder\DefaultFinder::create()
->in(__DIR__)
->exclude([
'vendor',
'Resources'
])
->files()->name('*.php')
)
;
128 changes: 61 additions & 67 deletions Controller/DemoController.php
View file
Expand Up @@ -6,7 +6,6 @@
* @license For full copyright and license information view LICENSE file distributed with this source code.
* @version //autogentag//
*/

namespace EzSystems\DemoBundle\Controller;

use eZ\Bundle\EzPublishCoreBundle\Controller;
Expand All @@ -22,41 +21,41 @@
class DemoController extends Controller
{
/**
* Renders page header links with cache control
* Renders page header links with cache control.
*
* @return \Symfony\Component\HttpFoundation\Response
*/
public function userLinksAction()
{
$response = new Response();
$response->setSharedMaxAge( 3600 );
$response->setVary( 'Cookie' );
$response->setSharedMaxAge(3600);
$response->setVary('Cookie');

return $this->render(
"eZDemoBundle::page_header_links.html.twig",
'eZDemoBundle::page_header_links.html.twig',
array(),
$response
);
}

/**
* Renders article with extra parameters that controls page elements visibility such as image and summary
* Renders article with extra parameters that controls page elements visibility such as image and summary.
*
* @param $locationId
* @param $viewType
* @param bool $layout
* @param array $params
* @return \Symfony\Component\HttpFoundation\Response
*/
public function showArticleAction( $locationId, $viewType, $layout = false, array $params = array() )
public function showArticleAction($locationId, $viewType, $layout = false, array $params = array())
{
return $this->get( 'ez_content' )->viewLocation(
return $this->get('ez_content')->viewLocation(
$locationId,
$viewType,
$layout,
array(
'showSummary' => $this->container->getParameter( 'ezdemo.article.full_view.show_summary' ),
'showImage' => $this->container->getParameter( 'ezdemo.article.full_view.show_image' )
'showSummary' => $this->container->getParameter('ezdemo.article.full_view.show_summary'),
'showImage' => $this->container->getParameter('ezdemo.article.full_view.show_image'),
) + $params
);
}
Expand All @@ -70,59 +69,58 @@ public function showArticleAction( $locationId, $viewType, $layout = false, arra
* @param \eZ\Publish\API\Repository\Values\Content\Location $location containing blog posts
* @return \Symfony\Component\HttpFoundation\Response
*/
public function listBlogPostsAction( Location $location, Request $request )
public function listBlogPostsAction(Location $location, Request $request)
{
$response = new Response();

// Setting default cache configuration (you can override it in you siteaccess config)
$response->setSharedMaxAge( $this->getConfigResolver()->getParameter( 'content.default_ttl' ) );
$response->setSharedMaxAge($this->getConfigResolver()->getParameter('content.default_ttl'));

// Make the response location cache aware for the reverse proxy
$response->headers->set( 'X-Location-Id', $location->id );
$response->setVary( 'X-User-Hash' );
$response->headers->set('X-Location-Id', $location->id);
$response->setVary('X-User-Hash');

$viewParameters = $request->attributes->get( 'viewParameters' );
$viewParameters = $request->attributes->get('viewParameters');

// Getting location and content from ezpublish dedicated services
$repository = $this->getRepository();
if ( $location->invisible )
{
throw new NotFoundHttpException( "Location #$location->id cannot be displayed as it is flagged as invisible." );
if ($location->invisible) {
throw new NotFoundHttpException("Location #$location->id cannot be displayed as it is flagged as invisible.");
}

$content = $repository
->getContentService()
->loadContentByContentInfo( $location->getContentInfo() );
->loadContentByContentInfo($location->getContentInfo());

// Getting language for the current siteaccess
$languages = $this->getConfigResolver()->getParameter( 'languages' );
$languages = $this->getConfigResolver()->getParameter('languages');

// Using the criteria helper (a demobundle custom service) to generate our query's criteria.
// This is a good practice in order to have less code in your controller.
$criteria = $this->get( 'ezdemo.criteria_helper' )->generateListBlogPostCriterion(
$criteria = $this->get('ezdemo.criteria_helper')->generateListBlogPostCriterion(
$location, $viewParameters, $languages
);

// Generating query
$query = new Query();
$query->query = $criteria;
$query->sortClauses = array(
new SortClause\Field( 'blog_post', 'publication_date', Query::SORT_DESC, $languages[0] )
new SortClause\Field('blog_post', 'publication_date', Query::SORT_DESC, $languages[0]),
);

// Initialize pagination.
$pager = new Pagerfanta(
new ContentSearchAdapter( $query, $this->getRepository()->getSearchService() )
new ContentSearchAdapter($query, $this->getRepository()->getSearchService())
);
$pager->setMaxPerPage( $this->container->getParameter( 'ezdemo.blog.blog_post_list.limit' ) );
$pager->setCurrentPage( $request->get( 'page', 1 ) );
$pager->setMaxPerPage($this->container->getParameter('ezdemo.blog.blog_post_list.limit'));
$pager->setCurrentPage($request->get('page', 1));

return $this->render(
'eZDemoBundle:full:blog.html.twig',
array(
'location' => $location,
'content' => $content,
'pagerBlog' => $pager
'pagerBlog' => $pager,
),
$response
);
Expand All @@ -141,162 +139,158 @@ public function listBlogPostsAction( Location $location, Request $request )
* @param array $params
* @return \Symfony\Component\HttpFoundation\Response
*/
public function showBlogPostAction( Location $location, $viewType, $layout = false, array $params = array() )
public function showBlogPostAction(Location $location, $viewType, $layout = false, array $params = array())
{
// We need the author, whatever the view type is.
$repository = $this->getRepository();
$author = $repository->getUserService()->loadUser( $location->getContentInfo()->ownerId );
$author = $repository->getUserService()->loadUser($location->getContentInfo()->ownerId);

// TODO once the keyword service is available, load the number of keyword for each keyword

// Delegate view rendering to the original ViewController
// (makes it possible to continue using defined template rules)
// We just add "author" to the list of variables exposed to the final template
return $this->get( 'ez_content' )->viewLocation(
return $this->get('ez_content')->viewLocation(
$location->id,
$viewType,
$layout,
array( 'author' => $author ) + $params
array('author' => $author) + $params
);
}

/**
* Displays content having similar tags as the given location
* Displays content having similar tags as the given location.
*
* @param \eZ\Publish\API\Repository\Values\Content\Location $location
* @return \Symfony\Component\HttpFoundation\Response
*/
public function viewTagRelatedContentAction( Location $location )
public function viewTagRelatedContentAction(Location $location)
{
// TODO once the keyword service is available replace this subrequest by a full symfony one

return $this->render(
'eZDemoBundle:parts:related_content.html.twig',
array( 'location' => $location )
array('location' => $location)
);
}

/**
* Displays description, tagcloud, tags, ezarchive and calendar
* of the parent's of a given location
* of the parent's of a given location.
*
* @param \eZ\Publish\API\Repository\Values\Content\Location $location
* @return \Symfony\Component\HttpFoundation\Response
*/
public function viewParentExtraInfoAction( Location $location )
public function viewParentExtraInfoAction(Location $location)
{
$repository = $this->getRepository();
$parentLocation = $repository->getLocationService()->loadLocation( $location->parentLocationId );
$parentLocation = $repository->getLocationService()->loadLocation($location->parentLocationId);

// TODO once the keyword service is available replace part this subrequest by a full symfony one

return $this->render(
'eZDemoBundle:parts/blog:extra_info.html.twig',
array( 'location' => $parentLocation )
array('location' => $parentLocation)
);
}

/**
* Displays description, tagcloud, tags, ezarchive and calendar for a given location
* Displays description, tagcloud, tags, ezarchive and calendar for a given location.
*
* @param \eZ\Publish\API\Repository\Values\Content\Location $location
* @return \Symfony\Component\HttpFoundation\Response
*/
public function viewExtraInfoAction( Location $location )
public function viewExtraInfoAction(Location $location)
{
// TODO once the keyword service is available replace part this subrequest by a full symfony one

return $this->render(
'eZDemoBundle:parts/blog:extra_info.html.twig',
array( 'location' => $location )
array('location' => $location)
);
}

/**
* Displays "tip a friend" link for a given location
* Displays "tip a friend" link for a given location.
*
* @param \eZ\Publish\API\Repository\Values\Content\Location $location
* @return \Symfony\Component\HttpFoundation\Response
*/
public function viewTipAFriendAction( Location $location )
public function viewTipAFriendAction(Location $location)
{
return $this->render(
'eZDemoBundle:parts/article:tip_a_friend.html.twig',
array( 'location' => $location )
array('location' => $location)
);
}

/**
* Displays star rating attribute for a given location
* Displays star rating attribute for a given location.
*
* @param \eZ\Publish\API\Repository\Values\Content\Location $location
* @return \Symfony\Component\HttpFoundation\Response
*/
public function viewStarRatingAction( Location $location )
public function viewStarRatingAction(Location $location)
{
return $this->render(
'eZDemoBundle:parts/article:star_rating.html.twig',
array( 'location' => $location )
array('location' => $location)
);
}

/**
* Displays breadcrumb for a given $locationId
* Displays breadcrumb for a given $locationId.
*
* @param \eZ\Publish\API\Repository\Values\Content\Location $location
* @return \Symfony\Component\HttpFoundation\Response
*/
public function viewBreadcrumbAction( Location $location )
public function viewBreadcrumbAction(Location $location)
{
/** @var WhiteOctober\BreadcrumbsBundle\Templating\Helper\BreadcrumbsHelper $breadcrumbs */
$breadcrumbs = $this->get( "white_october_breadcrumbs" );
$breadcrumbs = $this->get('white_october_breadcrumbs');

$locationService = $this->getRepository()->getLocationService();
$path = $location->path;

// The root location can be defined at site access level
$rootLocationId = $this->getConfigResolver()->getParameter( 'content.tree_root.location_id' );
$rootLocationId = $this->getConfigResolver()->getParameter('content.tree_root.location_id');

/** @var eZ\Publish\Core\Helper\TranslationHelper $translationHelper */
$translationHelper = $this->get( 'ezpublish.translation_helper' );
$translationHelper = $this->get('ezpublish.translation_helper');

$isRootLocation = false;

// Shift of location "1" from path as it is not a fully valid location and not readable by most users
array_shift( $path );
array_shift($path);

for ( $i = 0; $i < count( $path ); $i++ )
{
$location = $locationService->loadLocation( $path[$i] );
for ($i = 0; $i < count($path); ++$i) {
$location = $locationService->loadLocation($path[$i]);
// if root location hasn't been found yet
if ( !$isRootLocation )
{
if (!$isRootLocation) {
// If we reach the root location We begin to add item to the breadcrumb from it
if ( $location->id == $rootLocationId )
{
if ($location->id == $rootLocationId) {
$isRootLocation = true;
$breadcrumbs->addItem(
$translationHelper->getTranslatedContentNameByContentInfo( $location->contentInfo ),
$this->generateUrl( $location )
$translationHelper->getTranslatedContentNameByContentInfo($location->contentInfo),
$this->generateUrl($location)
);
}
}
// The root location has already been reached, so we can add items to the breadcrumb
else
{
else {
$breadcrumbs->addItem(
$translationHelper->getTranslatedContentNameByContentInfo( $location->contentInfo ),
$this->generateUrl( $location )
$translationHelper->getTranslatedContentNameByContentInfo($location->contentInfo),
$this->generateUrl($location)
);
}
}

// We don't want the breadcrumb to be displayed if we are on the frontpage
// which means we display it only if we have several items in it
if ( count( $breadcrumbs ) <= 1 )
{
if (count($breadcrumbs) <= 1) {
return new Response();
}

return $this->render(
'eZDemoBundle::breadcrumb.html.twig'
);
Expand Down

0 comments on commit fefb7b0

Please sign in to comment.