insight recommandations

This commit is contained in:
Simon Vieille 2015-03-05 17:51:23 +01:00
parent cbdc3109e3
commit 925ded4b7f
46 changed files with 197 additions and 236 deletions

View file

@ -35,5 +35,4 @@ class ModelConfiguration
{ {
return $this->blocks; return $this->blocks;
} }
} }

View file

@ -34,5 +34,4 @@ class AddBlockFieldsSubscriber implements EventSubscriberInterface
} }
} }
} }
} }

View file

@ -8,8 +8,6 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Finder\Finder; use Symfony\Component\Finder\Finder;
use Trinity\Bundle\ContentManagerBundle\Model\PageQuery;
class BuildIndexCommand extends ContainerAwareCommand class BuildIndexCommand extends ContainerAwareCommand
{ {
protected function configure() protected function configure()
@ -46,18 +44,12 @@ EOF
return $namespace.'\\'.str_replace('.php', 'Query', $file->getFilename()); return $namespace.'\\'.str_replace('.php', 'Query', $file->getFilename());
} }
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$dialog = $this->getDialogHelper(); $dialog = $this->getDialogHelper();
if ($input->isInteractive()) { if ($input->isInteractive()) {
if (!$dialog->askConfirmation( if (!$dialog->askConfirmation($output, $dialog->getQuestion('Do you confirm generation', 'yes', '?'), true)) {
$output,
$dialog->getQuestion('Do you confirm generation', 'yes', '?'),
true
)
) {
$output->writeln( $output->writeln(
array( array(
'', '',
@ -163,7 +155,6 @@ EOF
$indexed_elements++; $indexed_elements++;
} }
$output->writeln( $output->writeln(
array( array(
'<info>'.$query.'</info> number of indexed elements : <comment>'.$indexed_elements.'</comment>', '<info>'.$query.'</info> number of indexed elements : <comment>'.$indexed_elements.'</comment>',

View file

@ -2,14 +2,9 @@
namespace Trinity\Bundle\SearchBundle\Controller; namespace Trinity\Bundle\SearchBundle\Controller;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Trinity\Bundle\ContentManagerBundle\Controller\PageController; use Trinity\Bundle\ContentManagerBundle\Controller\PageController;
use Trinity\Bundle\ContentManagerBundle\Exception\NavigationNotFoundException;
use Trinity\Bundle\ContentManagerBundle\Exception\PageNotFoundException;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Trinity\Bundle\SearchBundle\Model\SearchObject; use Trinity\Bundle\SearchBundle\Model\SearchObject;
@ -17,10 +12,8 @@ use Trinity\Bundle\ContentManagerBundle\Model\PageQuery;
use Zend\Search\Lucene\Index\Term; use Zend\Search\Lucene\Index\Term;
use Zend\Search\Lucene\Search\Query\Boolean as ZendBooleanQuery; use Zend\Search\Lucene\Search\Query\Boolean as ZendBooleanQuery;
use Zend\Search\Lucene\Search\Query\Fuzzy as FuzzyQuery; use Zend\Search\Lucene\Search\Query\Fuzzy as FuzzyQuery;
use Zend\Search\Lucene\Search\Query\MultiTerm;
use Zend\Search\Lucene\Search\QueryParser; use Zend\Search\Lucene\Search\QueryParser;
class SearchController extends PageController class SearchController extends PageController
{ {

View file

@ -23,7 +23,6 @@ class Configuration implements ConfigurationInterface
// Here you should define the parameters that are allowed to // Here you should define the parameters that are allowed to
// configure your bundle. See the documentation linked above for // configure your bundle. See the documentation linked above for
// more information on that topic. // more information on that topic.
return $treeBuilder; return $treeBuilder;
} }
} }

View file

@ -1,10 +1,8 @@
<?php <?php
namespace Trinity\Bundle\SearchBundle\EventListener; namespace Trinity\Bundle\SearchBundle\EventListener;
use Ivory\LuceneSearchBundle\Model\Field;
use Symfony\Component\DependencyInjection\Container; use Symfony\Component\DependencyInjection\Container;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Trinity\Bundle\ContentManagerBundle\Model\Page;
use Trinity\Bundle\SearchBundle\Event\LuceneEvent; use Trinity\Bundle\SearchBundle\Event\LuceneEvent;
use Trinity\Bundle\SearchBundle\TrinitySearchEvents; use Trinity\Bundle\SearchBundle\TrinitySearchEvents;
use ZendSearch\Lucene\Document; use ZendSearch\Lucene\Document;

View file

@ -2,7 +2,6 @@
namespace Trinity\Bundle\SearchBundle\Model; namespace Trinity\Bundle\SearchBundle\Model;
class SearchObject class SearchObject
{ {
protected $object; protected $object;

View file

@ -4,8 +4,6 @@ namespace Trinity\Bundle\SearchBundle\Page;
use Pagerfanta\Adapter\ArrayAdapter; use Pagerfanta\Adapter\ArrayAdapter;
use Pagerfanta\Exception\NotValidCurrentPageException; use Pagerfanta\Exception\NotValidCurrentPageException;
use Symfony\Component\Form\Extension\Core\DataTransformer\ArrayToPartsTransformer;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Trinity\Bundle\ContentManagerBundle\Model\Page; use Trinity\Bundle\ContentManagerBundle\Model\Page;
use Trinity\Bundle\ContentManagerBundle\Model\SeoPageInterface; use Trinity\Bundle\ContentManagerBundle\Model\SeoPageInterface;
use Trinity\Bundle\ContentManagerBundle\Model\PageableInterface; use Trinity\Bundle\ContentManagerBundle\Model\PageableInterface;
@ -27,7 +25,6 @@ class SearchPage extends Page implements SeoPageInterface, PageableInterface
->setDefaultControllerClass('Trinity\Bundle\SearchBundle\Controller\SearchController::indexAction'); ->setDefaultControllerClass('Trinity\Bundle\SearchBundle\Controller\SearchController::indexAction');
} }
public function __construct($template = null) public function __construct($template = null)
{ {
parent::__construct(null !== $template ? $template : 'TrinitySearchBundle:Search:index.html.twig'); parent::__construct(null !== $template ? $template : 'TrinitySearchBundle:Search:index.html.twig');

View file

@ -2,20 +2,23 @@
namespace Trinity\Bundle\SearchBundle\Twig\Extension; namespace Trinity\Bundle\SearchBundle\Twig\Extension;
class HighlightExtension extends \Twig_Extension { class HighlightExtension extends \Twig_Extension
{
public function getFilters() { public function getFilters()
{
return array( return array(
'highlight' => new \Twig_Filter_Method($this, 'highlight'), 'highlight' => new \Twig_Filter_Method($this, 'highlight'),
); );
} }
public function highlight($sentence, $expr) { public function highlight($sentence, $expr)
{
$expr = explode(' ', $expr); $expr = explode(' ', $expr);
foreach ($expr as $word) { foreach ($expr as $word) {
$sentence = preg_replace('/(' . $word . ')/i', $sentence = preg_replace('/(' . $word . ')/i',
'<span class="bold">\1</span>', $sentence); '<span class="bold">\1</span>', $sentence);
} }
return $sentence; return $sentence;
} }

View file

@ -23,7 +23,6 @@ class Configuration implements ConfigurationInterface
// Here you should define the parameters that are allowed to // Here you should define the parameters that are allowed to
// configure your bundle. See the documentation linked above for // configure your bundle. See the documentation linked above for
// more information on that topic. // more information on that topic.
return $treeBuilder; return $treeBuilder;
} }
} }

View file

@ -23,7 +23,6 @@ class Configuration implements ConfigurationInterface
// Here you should define the parameters that are allowed to // Here you should define the parameters that are allowed to
// configure your bundle. See the documentation linked above for // configure your bundle. See the documentation linked above for
// more information on that topic. // more information on that topic.
return $treeBuilder; return $treeBuilder;
} }
} }

View file

@ -3,9 +3,6 @@
namespace Trinity\Bundle\SlideshowBundle\Form\Extension\Type; namespace Trinity\Bundle\SlideshowBundle\Form\Extension\Type;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormView;
use Symfony\Component\OptionsResolver\OptionsResolverInterface;
class FileImageType extends AbstractType class FileImageType extends AbstractType
{ {
@ -17,7 +14,6 @@ class FileImageType extends AbstractType
return 'file'; return 'file';
} }
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
@ -26,4 +22,3 @@ class FileImageType extends AbstractType
return 'file_image'; return 'file_image';
} }
} }

View file

@ -3,8 +3,6 @@
namespace Trinity\Bundle\SlideshowBundle\Form\Extension\Type; namespace Trinity\Bundle\SlideshowBundle\Form\Extension\Type;
use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormInterface;
use Symfony\Component\Form\FormView;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
class PersoType extends AbstractType class PersoType extends AbstractType
@ -51,4 +49,3 @@ class PersoType extends AbstractType
return 'perso'; return 'perso';
} }
} }

View file

@ -6,7 +6,6 @@ use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormView;
use Symfony\Component\Form\FormInterface; use Symfony\Component\Form\FormInterface;
use Trinity\Bundle\SlideshowBundle\Block\SlideshowItemsContainerBlock; use Trinity\Bundle\SlideshowBundle\Block\SlideshowItemsContainerBlock;
use Trinity\Bundle\SlideshowBundle\Model\SlideshowItemQuery;
use Trinity\Bundle\ContentManagerBundle\Form\Type\BlockType; use Trinity\Bundle\ContentManagerBundle\Form\Type\BlockType;
class SlideshowItemsContainerBlockType extends BlockType class SlideshowItemsContainerBlockType extends BlockType
@ -48,7 +47,6 @@ class SlideshowItemsContainerBlockType extends BlockType
)); ));
} }
public function getName() public function getName()
{ {
return 'slideshow_items_container_block'; return 'slideshow_items_container_block';

View file

@ -2,9 +2,6 @@
namespace Trinity\Bundle\UserBundle\Controller; namespace Trinity\Bundle\UserBundle\Controller;
use \Symfony\Component\HttpFoundation\Request;
use \Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Security\Core\SecurityContext;
use \FOS\UserBundle\Controller\SecurityController as BaseSecurityController; use \FOS\UserBundle\Controller\SecurityController as BaseSecurityController;
class SecurityController extends BaseSecurityController class SecurityController extends BaseSecurityController

View file

@ -15,7 +15,6 @@ use Symfony\Component\HttpFoundation\Request;
use Trinity\Bundle\UserBundle\Configuration\UserLogCrudConfiguration as CrudConfiguration; use Trinity\Bundle\UserBundle\Configuration\UserLogCrudConfiguration as CrudConfiguration;
use Trinity\Bundle\UserBundle\Form\Type\UserLogBatchType as BatchType; use Trinity\Bundle\UserBundle\Form\Type\UserLogBatchType as BatchType;
/** /**
* @Route("/admin/userlog") * @Route("/admin/userlog")
*/ */

View file

@ -32,5 +32,4 @@ class AddCodeFieldSubscriber implements EventSubscriberInterface
); );
} }
} }
} }

View file

@ -4,7 +4,6 @@ namespace Trinity\Bundle\UserBundle\Form\Type;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use FOS\UserBundle\Form\Type\ProfileFormType as BaseType; use FOS\UserBundle\Form\Type\ProfileFormType as BaseType;
use Trinity\Bundle\UserBundle\Form\Type\ProfileType;
class MyProfileType extends BaseType class MyProfileType extends BaseType
{ {
@ -29,4 +28,3 @@ class MyProfileType extends BaseType
return 'trinity_user_profile'; return 'trinity_user_profile';
} }
} }

View file

@ -6,8 +6,6 @@ use Propel\PropelBundle\Form\BaseAbstractType;
use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface;
use \Trinity\Bundle\UserBundle\Form\Type\ProfileType;
class UserType extends BaseAbstractType class UserType extends BaseAbstractType
{ {
/** /**
@ -110,5 +108,3 @@ class UserType extends BaseAbstractType
return array_keys(self::getRoles()); return array_keys(self::getRoles());
} }
} }

View file

@ -23,7 +23,6 @@ class Configuration implements ConfigurationInterface
// Here you should define the parameters that are allowed to // Here you should define the parameters that are allowed to
// configure your bundle. See the documentation linked above for // configure your bundle. See the documentation linked above for
// more information on that topic. // more information on that topic.
return $treeBuilder; return $treeBuilder;
} }
} }

View file

@ -117,6 +117,7 @@ if (\$this->isColumnModified($const) && \$this->{$this->getColumnGetter()}()) {
\$this->{$this->getColumnSetter()}(\$this->createSlug()); \$this->{$this->getColumnSetter()}(\$this->createSlug());
}"; }";
} }
return $script; return $script;
} }

View file

@ -5,7 +5,6 @@ use I18nBehavior;
use ReflectionObject; use ReflectionObject;
use SluggableBehavior; use SluggableBehavior;
class I18nSluggableBehavior extends I18nBehavior class I18nSluggableBehavior extends I18nBehavior
{ {

View file

@ -19,6 +19,7 @@ class UploadableBehavior extends \Behavior
if ($this->getTable()->getColumn($columnName)) { if ($this->getTable()->getColumn($columnName)) {
return 'get'.$this->getTable()->getColumn($columnName)->getPhpName(); return 'get'.$this->getTable()->getColumn($columnName)->getPhpName();
} }
return PropelUtils::getGetter($columnName); return PropelUtils::getGetter($columnName);
} }
@ -27,6 +28,7 @@ class UploadableBehavior extends \Behavior
if ($this->getTable()->getColumn($columnName)) { if ($this->getTable()->getColumn($columnName)) {
return 'set'.$this->getTable()->getColumn($columnName)->getPhpName(); return 'set'.$this->getTable()->getColumn($columnName)->getPhpName();
} }
return PropelUtils::getSetter($columnName); return PropelUtils::getSetter($columnName);
} }
@ -133,6 +135,7 @@ class UploadableBehavior extends \Behavior
$this->addI18nWebPathMethod($script); $this->addI18nWebPathMethod($script);
$this->addHasUploadedFieldMethod($script); $this->addHasUploadedFieldMethod($script);
$this->addGetterAsFile($script); $this->addGetterAsFile($script);
return $script; return $script;
} }
@ -143,6 +146,7 @@ class UploadableBehavior extends \Behavior
$camel_field = PropelUtils::camelCase($field); $camel_field = PropelUtils::camelCase($field);
$script .= sprintf('$this->upload%s();%s', $camel_field, PHP_EOL); $script .= sprintf('$this->upload%s();%s', $camel_field, PHP_EOL);
} }
return $script; return $script;
} }
@ -153,6 +157,7 @@ class UploadableBehavior extends \Behavior
$camel_field = PropelUtils::camelCase($field); $camel_field = PropelUtils::camelCase($field);
$script .= sprintf('$this->save%sFile();%s', $camel_field, PHP_EOL); $script .= sprintf('$this->save%sFile();%s', $camel_field, PHP_EOL);
} }
return $script; return $script;
} }
@ -163,6 +168,7 @@ class UploadableBehavior extends \Behavior
$camel_field = PropelUtils::camelCase($field); $camel_field = PropelUtils::camelCase($field);
$script .= sprintf('$this->save%sFile();%s', $camel_field, PHP_EOL); $script .= sprintf('$this->save%sFile();%s', $camel_field, PHP_EOL);
} }
return $script; return $script;
} }
@ -179,6 +185,7 @@ if (\$this->delete_$field) {
EOL; EOL;
} }
return $script; return $script;
} }
@ -192,11 +199,10 @@ EOL;
$script .= sprintf('$this->remove%s();%s', $camel_field, PHP_EOL); $script .= sprintf('$this->remove%s();%s', $camel_field, PHP_EOL);
$script .= ' '.PHP_EOL; $script .= ' '.PHP_EOL;
} }
return $script; return $script;
} }
protected function addAttributes(&$script) protected function addAttributes(&$script)
{ {
$dirs = var_export($this->dirs, true); $dirs = var_export($this->dirs, true);
@ -312,6 +318,7 @@ EOS;
{ {
if (null === \$this->$field && !\$this->delete_$field && null !== \$this->rollback_$field) { if (null === \$this->$field && !\$this->delete_$field && null !== \$this->rollback_$field) {
\$this->$field = \$this->rollback_$field; // keep the file \$this->$field = \$this->rollback_$field; // keep the file
return true; return true;
} }
@ -547,6 +554,7 @@ EOS;
$upload $upload
EOS; EOS;
} }
return $script; return $script;
} }
@ -572,6 +580,7 @@ public static function getUploadDir(\$field)
} }
EOS; EOS;
return $script; return $script;
} }

View file

@ -37,4 +37,3 @@ class TestCase extends \PHPUnit_Framework_TestCase
return self::getApplication()->run(new \Symfony\Component\Console\Input\StringInput($command)); return self::getApplication()->run(new \Symfony\Component\Console\Input\StringInput($command));
} }
} }

View file

@ -34,4 +34,3 @@ class WebTestCase extends BaseWebTestCase
return self::getApplication()->run(new \Symfony\Component\Console\Input\StringInput($command)); return self::getApplication()->run(new \Symfony\Component\Console\Input\StringInput($command));
} }
} }