diff --git a/Bundle/BlogBundle/Controller/ArticleController.php b/Bundle/BlogBundle/Controller/ArticleController.php index dfb1b0fb4..fa2cd4232 100644 --- a/Bundle/BlogBundle/Controller/ArticleController.php +++ b/Bundle/BlogBundle/Controller/ArticleController.php @@ -204,7 +204,9 @@ public function deleteAction(Article $article) $response = [ 'success' => true, - 'url' => $this->generateUrl('victoire_core_page_show', [ + 'url' => $this->generateUrl( + 'victoire_core_page_show', + [ 'url' => $blogViewReference->getUrl(), ] ), diff --git a/Bundle/BlogBundle/Controller/BlogController.php b/Bundle/BlogBundle/Controller/BlogController.php index 5e3558356..fa13cd422 100644 --- a/Bundle/BlogBundle/Controller/BlogController.php +++ b/Bundle/BlogBundle/Controller/BlogController.php @@ -235,13 +235,13 @@ public function categoryAction(Request $request, BasePage $blog) return new Response( $this->container->get('templating')->render( - $this->getBaseTemplatePath().':Tabs/_category.html.twig', - [ - 'blog' => $blog, - 'form' => $form->createView(), - 'businessProperties' => $businessProperties, - ] - ) + $this->getBaseTemplatePath().':Tabs/_category.html.twig', + [ + 'blog' => $blog, + 'form' => $form->createView(), + 'businessProperties' => $businessProperties, + ] + ) ); } diff --git a/Bundle/BlogBundle/Filter/DateFilter.php b/Bundle/BlogBundle/Filter/DateFilter.php index 98cc2bc19..102fa7fc3 100644 --- a/Bundle/BlogBundle/Filter/DateFilter.php +++ b/Bundle/BlogBundle/Filter/DateFilter.php @@ -113,7 +113,9 @@ public function buildForm(FormBuilderInterface $builder, array $options) } $builder ->add( - 'year', ChoiceType::class, [ + 'year', + ChoiceType::class, + [ 'label' => false, 'choices' => $years, 'required' => false, diff --git a/Bundle/BlogBundle/Form/ArticleType.php b/Bundle/BlogBundle/Form/ArticleType.php index 8d33c0cfd..4e9552612 100644 --- a/Bundle/BlogBundle/Form/ArticleType.php +++ b/Bundle/BlogBundle/Form/ArticleType.php @@ -210,9 +210,9 @@ protected function manageTemplate($blog_id, $form) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'data_class' => 'Victoire\Bundle\BlogBundle\Entity\Article', - 'translation_domain' => 'victoire', - 'cascade_validation' => true, - ]); + 'data_class' => 'Victoire\Bundle\BlogBundle\Entity\Article', + 'translation_domain' => 'victoire', + 'cascade_validation' => true, + ]); } } diff --git a/Bundle/BlogBundle/Form/CategoryType.php b/Bundle/BlogBundle/Form/CategoryType.php index e389ea9fe..d3b1e5ba3 100644 --- a/Bundle/BlogBundle/Form/CategoryType.php +++ b/Bundle/BlogBundle/Form/CategoryType.php @@ -24,16 +24,19 @@ class CategoryType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder - ->add('title', TextType::class, [ - 'label' => 'blog.form.title.label', - 'required' => true, - 'constraints' => [ - new \Symfony\Component\Validator\Constraints\NotBlank(), - ], - 'attr' => [ - 'class' => 'vic-blogCategoryWidget-formControl', + ->add( + 'title', + TextType::class, + [ + 'label' => 'blog.form.title.label', + 'required' => true, + 'constraints' => [ + new \Symfony\Component\Validator\Constraints\NotBlank(), + ], + 'attr' => [ + 'class' => 'vic-blogCategoryWidget-formControl', ], - ] + ] ) ->add('description', TextType::class, [ 'label' => 'blog.form.description.label', diff --git a/Bundle/BlogBundle/Form/ChooseBlogType.php b/Bundle/BlogBundle/Form/ChooseBlogType.php index cea60723d..9a278a978 100644 --- a/Bundle/BlogBundle/Form/ChooseBlogType.php +++ b/Bundle/BlogBundle/Form/ChooseBlogType.php @@ -54,7 +54,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) $builder->addEventListener( FormEvents::PRE_SET_DATA, - function (FormEvent $event) use ($currentLocale, $currentBlog, $localesNb, $blogsNb) { + function (FormEvent $event) use ($currentLocale, $currentBlog) { $data = $event->getData(); $event->setData([ 'locale' => $data['locale'] !== null ? $data['locale'] : $currentLocale, @@ -67,7 +67,7 @@ function (FormEvent $event) use ($currentLocale, $currentBlog, $localesNb, $blog if ($localesNb > 1 && $blogsNb > 1) { $builder->addEventListener( FormEvents::PRE_SUBMIT, - function (FormEvent $event) use ($currentLocale, $currentBlog, $blogsNb, $localesNb) { + function (FormEvent $event) use ($currentLocale, $currentBlog , $localesNb) { $data = $event->getData(); $currentLocale = $data['locale'] !== null ? $data['locale'] : $currentLocale; $availableBlogs = $localesNb > 1 ? $this->blogRepository->getBlogsForLocale($currentLocale) : $this->blogRepository->findAll(); @@ -96,7 +96,9 @@ public function addLocaleField($builder, $currentLocale, $availableLocales) ]; } - $builder->add('locale', $localesNb > 1 ? ChoiceType::class : HiddenType::class, + $builder->add( + 'locale', + $localesNb > 1 ? ChoiceType::class : HiddenType::class, array_merge( [ 'label' => 'victoire.blog.choose.locale.label', @@ -135,7 +137,9 @@ public function addBlogField($builder, Blog $currentBlog, $availableBlogs, $curr ]; } - $builder->add('blog', $blogsNb > 1 ? ChoiceType::class : EntityHiddenType::class, + $builder->add( + 'blog', + $blogsNb > 1 ? ChoiceType::class : EntityHiddenType::class, array_merge( [ 'label' => 'victoire.blog.choose.blog.label', diff --git a/Bundle/BlogBundle/Listener/ArticleMenuListener.php b/Bundle/BlogBundle/Listener/ArticleMenuListener.php index 843f7e832..10db5edc4 100644 --- a/Bundle/BlogBundle/Listener/ArticleMenuListener.php +++ b/Bundle/BlogBundle/Listener/ArticleMenuListener.php @@ -38,7 +38,8 @@ public function addContextual($event) $bottomRightNavbar = $this->menuBuilder->getBottomRightNavbar(); - $bottomRightNavbar->addChild('menu.page.settings', + $bottomRightNavbar->addChild( + 'menu.page.settings', [ 'route' => 'victoire_blog_article_settings', 'routeParameters' => [ diff --git a/Bundle/BlogBundle/Listener/BlogMenuListener.php b/Bundle/BlogBundle/Listener/BlogMenuListener.php index 9dfd981a8..e415bb2af 100644 --- a/Bundle/BlogBundle/Listener/BlogMenuListener.php +++ b/Bundle/BlogBundle/Listener/BlogMenuListener.php @@ -66,7 +66,7 @@ public function addBlogContextual($event) [ 'route' => 'victoire_blog_article_new', 'routeParameters' => ['id' => $event->getPage()->getId()], - ] + ] )->setLinkAttribute('data-toggle', 'vic-modal'); } diff --git a/Bundle/BusinessEntityBundle/Annotation/AnnotationDriver.php b/Bundle/BusinessEntityBundle/Annotation/AnnotationDriver.php index 079ec7e4e..be8c221f9 100644 --- a/Bundle/BusinessEntityBundle/Annotation/AnnotationDriver.php +++ b/Bundle/BusinessEntityBundle/Annotation/AnnotationDriver.php @@ -313,22 +313,22 @@ protected function loadReceiverProperties(\ReflectionClass $class) foreach ($annotations as $key => $annotationObj) { if ($annotationObj instanceof Column && $annotationObj->nullable === false) { throw new Exception(sprintf( - 'Property "%s" in class "%s" has a @ReceiverProperty annotation and by consequence must have "nullable=true" for ORM\Column annotation', - $refProperty->name, - $refProperty->class - )); + 'Property "%s" in class "%s" has a @ReceiverProperty annotation and by consequence must have "nullable=true" for ORM\Column annotation', + $refProperty->name, + $refProperty->class + )); } elseif ($annotationObj instanceof NotBlank) { throw new Exception(sprintf( - 'Property "%s" in class "%s" has a @ReceiverProperty annotation and by consequence can not use NotBlank annotation', - $refProperty->name, - $refProperty->class - )); + 'Property "%s" in class "%s" has a @ReceiverProperty annotation and by consequence can not use NotBlank annotation', + $refProperty->name, + $refProperty->class + )); } elseif ($annotationObj instanceof NotNull) { throw new Exception(sprintf( - 'Property "%s" in class "%s" has a @ReceiverProperty annotation and by consequence can not use NotNull annotation', - $refProperty->name, - $refProperty->class - )); + 'Property "%s" in class "%s" has a @ReceiverProperty annotation and by consequence can not use NotNull annotation', + $refProperty->name, + $refProperty->class + )); } elseif ($annotationObj instanceof ReceiverPropertyAnnotation && $annotationObj->isRequired()) { $receiverProperty->setRequired(true); } diff --git a/Bundle/BusinessEntityBundle/EventSubscriber/BusinessEntitySubscriber.php b/Bundle/BusinessEntityBundle/EventSubscriber/BusinessEntitySubscriber.php index d169e40f9..8b5f9f642 100644 --- a/Bundle/BusinessEntityBundle/EventSubscriber/BusinessEntitySubscriber.php +++ b/Bundle/BusinessEntityBundle/EventSubscriber/BusinessEntitySubscriber.php @@ -37,10 +37,10 @@ class BusinessEntitySubscriber implements EventSubscriber * @param EventDispatcherInterface $dispatcher */ public function __construct( - BusinessPageBuilder $businessPageBuilder, - BusinessEntityHelper $businessEntityHelper, - BusinessPageHelper $businessPageHelper, - EventDispatcherInterface $dispatcher + BusinessPageBuilder $businessPageBuilder, + BusinessEntityHelper $businessEntityHelper, + BusinessPageHelper $businessPageHelper, + EventDispatcherInterface $dispatcher ) { $this->businessPageBuilder = $businessPageBuilder; $this->businessEntityHelper = $businessEntityHelper; diff --git a/Bundle/BusinessEntityBundle/Helper/BusinessEntityHelper.php b/Bundle/BusinessEntityBundle/Helper/BusinessEntityHelper.php index 6af0e40e4..6cc481df6 100644 --- a/Bundle/BusinessEntityBundle/Helper/BusinessEntityHelper.php +++ b/Bundle/BusinessEntityBundle/Helper/BusinessEntityHelper.php @@ -2,7 +2,6 @@ namespace Victoire\Bundle\BusinessEntityBundle\Helper; -use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManagerInterface; use Victoire\Bundle\BusinessEntityBundle\Entity\BusinessEntity; use Victoire\Bundle\BusinessEntityBundle\Entity\BusinessProperty; diff --git a/Bundle/BusinessEntityBundle/Security/Voter/BusinessEntityOwnerVoter.php b/Bundle/BusinessEntityBundle/Security/Voter/BusinessEntityOwnerVoter.php index 1c126bdd7..3eeac3241 100644 --- a/Bundle/BusinessEntityBundle/Security/Voter/BusinessEntityOwnerVoter.php +++ b/Bundle/BusinessEntityBundle/Security/Voter/BusinessEntityOwnerVoter.php @@ -39,7 +39,8 @@ protected function supports($attribute, $subject) protected function voteOnAttribute($attribute, $subject, TokenInterface $token) { return $token->getUser() instanceof $this->userClass - && ($token->getUser()->hasRole('ROLE_VICTOIRE') + && ( + $token->getUser()->hasRole('ROLE_VICTOIRE') || $token->getUser()->hasRole('ROLE_VICTOIRE_DEVELOPER') || $subject->getAuthor() === $token->getUser() ); diff --git a/Bundle/BusinessPageBundle/Builder/BusinessPageBuilder.php b/Bundle/BusinessPageBundle/Builder/BusinessPageBuilder.php index 4482aeeb5..6a7ed627d 100644 --- a/Bundle/BusinessPageBundle/Builder/BusinessPageBuilder.php +++ b/Bundle/BusinessPageBundle/Builder/BusinessPageBuilder.php @@ -45,11 +45,13 @@ class BusinessPageBuilder * @param ParameterConverter $parameterConverter * @param EntityProxyProvider $entityProxyProvider */ - public function __construct(BusinessEntityHelper $businessEntityHelper, + public function __construct( + BusinessEntityHelper $businessEntityHelper, UrlBuilder $urlBuilder, ParameterConverter $parameterConverter, EntityProxyProvider $entityProxyProvider, - ViewReferenceBuilder $viewReferenceBuilder) + ViewReferenceBuilder $viewReferenceBuilder + ) { $this->businessEntityHelper = $businessEntityHelper; $this->urlBuilder = $urlBuilder; diff --git a/Bundle/BusinessPageBundle/Controller/BusinessTemplateController.php b/Bundle/BusinessPageBundle/Controller/BusinessTemplateController.php index 7ccff1378..7e77b8da6 100644 --- a/Bundle/BusinessPageBundle/Controller/BusinessTemplateController.php +++ b/Bundle/BusinessPageBundle/Controller/BusinessTemplateController.php @@ -57,15 +57,15 @@ public function indexAction() } return new JsonResponse([ - 'html' => $this->container->get('templating')->render( - 'VictoireBusinessPageBundle:BusinessEntity:index.html.twig', - [ - 'businessEntities' => $businessEntities, - 'BusinessTemplates' => $BusinessTemplates, - ] - ), - 'success' => true, - ]); + 'html' => $this->container->get('templating')->render( + 'VictoireBusinessPageBundle:BusinessEntity:index.html.twig', + [ + 'businessEntities' => $businessEntities, + 'BusinessTemplates' => $BusinessTemplates, + ] + ), + 'success' => true, + ]); } /** diff --git a/Bundle/BusinessPageBundle/Listener/BusinessPageMenuListener.php b/Bundle/BusinessPageBundle/Listener/BusinessPageMenuListener.php index 3c03b017f..7e8d6f046 100644 --- a/Bundle/BusinessPageBundle/Listener/BusinessPageMenuListener.php +++ b/Bundle/BusinessPageBundle/Listener/BusinessPageMenuListener.php @@ -67,7 +67,8 @@ public function addContextual($event) $bottomRightNavbar = $this->menuBuilder->getBottomRightNavbar(); //if there is a template, we add the link in the top bar - $bottomRightNavbar->addChild('menu.page.settings', + $bottomRightNavbar->addChild( + 'menu.page.settings', [ 'route' => 'victoire_business_template_edit', 'routeParameters' => ['id' => $event->getPage()->getId()], @@ -76,7 +77,8 @@ public function addContextual($event) ], ] )->setLinkAttribute('data-toggle', 'vic-modal'); - $bottomRightNavbar->addChild('menu.page.seoSettings', + $bottomRightNavbar->addChild( + 'menu.page.seoSettings', [ 'route' => 'victoire_seo_pageSeo_settings', 'routeParameters' => ['id' => $event->getPage()->getId()], diff --git a/Bundle/ConfigBundle/Favicon/FaviconConfigDumper.php b/Bundle/ConfigBundle/Favicon/FaviconConfigDumper.php index 3872b9cce..12aa4fcd6 100644 --- a/Bundle/ConfigBundle/Favicon/FaviconConfigDumper.php +++ b/Bundle/ConfigBundle/Favicon/FaviconConfigDumper.php @@ -43,10 +43,11 @@ public function dump(GlobalConfig $globalConfig, string $path = 'faviconConfig.j try { $fileSystem->dumpFile( - $path, $this->environment->render('VictoireConfigBundle:global:faviconConfig.json.twig', [ - 'globalConfig' => $globalConfig, - 'webDir' => $this->webDir, - ]) + $path, + $this->environment->render('VictoireConfigBundle:global:faviconConfig.json.twig', [ + 'globalConfig' => $globalConfig, + 'webDir' => $this->webDir, + ]) ); return $path; diff --git a/Bundle/ConfigBundle/Favicon/FaviconGenerator.php b/Bundle/ConfigBundle/Favicon/FaviconGenerator.php index 23be15674..4d1e592f9 100644 --- a/Bundle/ConfigBundle/Favicon/FaviconGenerator.php +++ b/Bundle/ConfigBundle/Favicon/FaviconGenerator.php @@ -105,10 +105,10 @@ public function generateFromConfigFile(string $configPath) throw new GenerateFaviconException( sprintf( - 'An issue occured with the real favicon generation, you can dive into the %s file', - $faviconRequestPath - ) - ); + 'An issue occured with the real favicon generation, you can dive into the %s file', + $faviconRequestPath + ) + ); } catch (FileNotFoundException | ProcessFailedException $e) { throw $e; } diff --git a/Bundle/CoreBundle/Builder/ViewCssBuilder.php b/Bundle/CoreBundle/Builder/ViewCssBuilder.php index 60b8ddd8c..552605c4e 100644 --- a/Bundle/CoreBundle/Builder/ViewCssBuilder.php +++ b/Bundle/CoreBundle/Builder/ViewCssBuilder.php @@ -61,12 +61,12 @@ public function generateViewCss(View $view, array $widgets) foreach ($widgets as $widget) { $style = $this->container->get('templating')->render( - 'VictoireCoreBundle:Widget:style/style.html.twig', - [ - 'widget' => $widget, - 'victoire_twig_responsive' => $this->victoireTwigResponsive, - ] - ); + 'VictoireCoreBundle:Widget:style/style.html.twig', + [ + 'widget' => $widget, + 'victoire_twig_responsive' => $this->victoireTwigResponsive, + ] + ); $css .= trim($style); } diff --git a/Bundle/CoreBundle/Command/WidgetCssGenerateCommand.php b/Bundle/CoreBundle/Command/WidgetCssGenerateCommand.php index 22679d770..7a8fd2525 100644 --- a/Bundle/CoreBundle/Command/WidgetCssGenerateCommand.php +++ b/Bundle/CoreBundle/Command/WidgetCssGenerateCommand.php @@ -13,7 +13,7 @@ class WidgetCssGenerateCommand extends ContainerAwareCommand { - /** @var EntityManager $entityManager */ + /** @var EntityManager */ private $entityManager; /** diff --git a/Bundle/CoreBundle/Controller/VictoireAlertifyControllerTrait.php b/Bundle/CoreBundle/Controller/VictoireAlertifyControllerTrait.php index 29af1527f..fbb296231 100644 --- a/Bundle/CoreBundle/Controller/VictoireAlertifyControllerTrait.php +++ b/Bundle/CoreBundle/Controller/VictoireAlertifyControllerTrait.php @@ -22,10 +22,10 @@ public function alert($content, $type = 'success') } $content = array_merge($content, [ - 'context' => 'victoire', - 'layout' => 'growl', - 'effect' => 'jelly', - ]); + 'context' => 'victoire', + 'layout' => 'growl', + 'effect' => 'jelly', + ]); $this->container->get('alertify')->alert($content, $type); } diff --git a/Bundle/CoreBundle/DependencyInjection/VictoireCoreExtension.php b/Bundle/CoreBundle/DependencyInjection/VictoireCoreExtension.php index 2b06d4696..b2b0dcb7a 100644 --- a/Bundle/CoreBundle/DependencyInjection/VictoireCoreExtension.php +++ b/Bundle/CoreBundle/DependencyInjection/VictoireCoreExtension.php @@ -45,46 +45,59 @@ public function load(array $configs, ContainerBuilder $container) } $container->setParameter( - 'victoire_core.cache_dir', $config['cache_dir'] + 'victoire_core.cache_dir', + $config['cache_dir'] ); $container->setParameter( - 'victoire_core.business_entity_debug', $config['business_entity_debug'] + 'victoire_core.business_entity_debug', + $config['business_entity_debug'] ); if (array_key_exists('templates', $config)) { $container->setParameter( - 'victoire_core.templates', $config['templates'] + 'victoire_core.templates', + $config['templates'] ); } else { $container->setParameter( - 'victoire_core.templates', '' + 'victoire_core.templates', + '' ); } $container->setParameter( - 'victoire_core.widgets', $config['widgets'] + 'victoire_core.widgets', + $config['widgets'] ); $container->setParameter( - 'victoire_core.layouts', $config['layouts'] + 'victoire_core.layouts', + $config['layouts'] ); $container->setParameter( - 'victoire_core.modal_layouts', $config['modal_layouts'] + 'victoire_core.modal_layouts', + $config['modal_layouts'] ); $container->setParameter( - 'victoire_core.slots', $config['slots'] + 'victoire_core.slots', + $config['slots'] ); $container->setParameter( - 'victoire_core.user_class', $config['user_class'] + 'victoire_core.user_class', + $config['user_class'] ); $container->setParameter( - 'victoire_core.base_paths', $config['base_paths'] + 'victoire_core.base_paths', + $config['base_paths'] ); $container->setParameter( - 'victoire_core.entity_finder_regex', $config['entity_finder_regex'] + 'victoire_core.entity_finder_regex', + $config['entity_finder_regex'] ); $container->setParameter( - 'victoire_core.businessTemplates', $config['businessTemplates'] + 'victoire_core.businessTemplates', + $config['businessTemplates'] ); $container->setParameter( - 'victoire_core.domain_name', $config['domain_name'] + 'victoire_core.domain_name', + $config['domain_name'] ); } } diff --git a/Bundle/CoreBundle/EventSubscriber/EntityProxySubscriber.php b/Bundle/CoreBundle/EventSubscriber/EntityProxySubscriber.php index 80f6c6147..7a5ca035d 100644 --- a/Bundle/CoreBundle/EventSubscriber/EntityProxySubscriber.php +++ b/Bundle/CoreBundle/EventSubscriber/EntityProxySubscriber.php @@ -49,10 +49,11 @@ public static function loadClassMetadata($eventArgs) if ($metadatas->name === 'Victoire\Bundle\CoreBundle\Entity\EntityProxy') { foreach (self::$cacheReader->getBusinessClasses() as $entity) { if (!$metadatas->hasAssociation($entity->getId())) { - $metadatas->mapOneToOne([ - 'fieldName' => $entity->getId(), - 'targetEntity' => $entity->getClass(), - 'cascade' => ['persist'], + $metadatas->mapOneToOne( + [ + 'fieldName' => $entity->getId(), + 'targetEntity' => $entity->getClass(), + 'cascade' => ['persist'], ] ); $metadatas->associationMappings[$entity->getId()]['joinColumns'][0]['onDelete'] = 'CASCADE'; diff --git a/Bundle/CoreBundle/Form/ViewType.php b/Bundle/CoreBundle/Form/ViewType.php index adae8163b..6e0a849d8 100644 --- a/Bundle/CoreBundle/Form/ViewType.php +++ b/Bundle/CoreBundle/Form/ViewType.php @@ -97,7 +97,10 @@ public function buildForm(FormBuilderInterface $builder, array $options) }; } - $form->add('parent', null, [ + $form->add( + 'parent', + null, + [ 'class' => 'Victoire\Bundle\PageBundle\Entity\BasePage', 'label' => 'form.view.type.parent.label', 'query_builder' => $getAllPageWithoutMe, diff --git a/Bundle/CoreBundle/Form/WidgetType.php b/Bundle/CoreBundle/Form/WidgetType.php index ecfee5892..5092d3ea3 100644 --- a/Bundle/CoreBundle/Form/WidgetType.php +++ b/Bundle/CoreBundle/Form/WidgetType.php @@ -126,7 +126,7 @@ function (FormEvent $event) use ($options) { ); $builder->addEventListener( FormEvents::POST_SUBMIT, - function (FormEvent $event) use ($options) { + function (FormEvent $event) { $widget = $event->getData(); /** @var Criteria $criteria */ foreach ($widget->getCriterias() as $criteria) { diff --git a/Bundle/CoreBundle/Listener/BackendMenuListener.php b/Bundle/CoreBundle/Listener/BackendMenuListener.php index 0ef208507..0f4702c2b 100644 --- a/Bundle/CoreBundle/Listener/BackendMenuListener.php +++ b/Bundle/CoreBundle/Listener/BackendMenuListener.php @@ -41,7 +41,9 @@ public function addGlobal(Event $event) { $this->mainItem = $this->menuBuilder->getLeftNavbar(); - $this->mainItem->addChild('hamburger_menu.backend.back_home', [ + $this->mainItem->addChild( + 'hamburger_menu.backend.back_home', + [ 'route' => 'victoire_core_homepage_show', ] ); diff --git a/Bundle/CoreBundle/Menu/MenuBuilder.php b/Bundle/CoreBundle/Menu/MenuBuilder.php index 2f97a5621..73217075b 100644 --- a/Bundle/CoreBundle/Menu/MenuBuilder.php +++ b/Bundle/CoreBundle/Menu/MenuBuilder.php @@ -45,7 +45,9 @@ public function __construct(FactoryInterface $factory, AuthorizationChecker $aut */ public function initTopNavbar() { - $this->topNavbar = $this->factory->createItem('root', [ + $this->topNavbar = $this->factory->createItem( + 'root', + [ 'childrenAttributes' => [ 'id' => 'v-navbar-top', 'class' => 'v-menu', @@ -63,7 +65,9 @@ public function initTopNavbar() */ public function initBottomLeftNavbar() { - $this->bottomLeftNavbar = $this->factory->createItem('root', [ + $this->bottomLeftNavbar = $this->factory->createItem( + 'root', + [ 'childrenAttributes' => [ 'id' => 'v-footer-navbar-bottom-left', ], @@ -105,7 +109,9 @@ public function initBottomLeftNavbar() */ public function initBottomRightNavbar() { - $this->bottomRightNavbar = $this->factory->createItem('root', [ + $this->bottomRightNavbar = $this->factory->createItem( + 'root', + [ 'childrenAttributes' => [ 'id' => 'v-footer-navbar-bottom-right', ], @@ -146,7 +152,9 @@ public function initBottomRightNavbar() */ public function initFloatActionNavbar() { - $this->floatActionNavbar = $this->factory->createItem('root', [ + $this->floatActionNavbar = $this->factory->createItem( + 'root', + [ 'childrenAttributes' => [ 'id' => 'v-float-container', ], diff --git a/Bundle/CoreBundle/Repository/StateFullRepositoryTrait.php b/Bundle/CoreBundle/Repository/StateFullRepositoryTrait.php index 7b54f2390..9e2758cb1 100644 --- a/Bundle/CoreBundle/Repository/StateFullRepositoryTrait.php +++ b/Bundle/CoreBundle/Repository/StateFullRepositoryTrait.php @@ -12,7 +12,7 @@ */ trait StateFullRepositoryTrait { - /** @var QueryBuilder $qb */ + /** @var QueryBuilder */ protected $qb; /** diff --git a/Bundle/CoreBundle/Repository/ViewRepository.php b/Bundle/CoreBundle/Repository/ViewRepository.php index e2054ba41..119687ae8 100644 --- a/Bundle/CoreBundle/Repository/ViewRepository.php +++ b/Bundle/CoreBundle/Repository/ViewRepository.php @@ -91,7 +91,8 @@ public function findByViewReferences(array $viewReferences) $viewReferences, function ($e) use ($pageId) { return $e->getViewId() == $pageId; - }); + } + ); if (!empty($viewReference[0])) { $page->setCurrentLocale($viewReference[0]->getLocale()); } diff --git a/Bundle/CoreBundle/Twig/Extension/RoutingExtension.php b/Bundle/CoreBundle/Twig/Extension/RoutingExtension.php index fa75be5cf..fc9d9e388 100644 --- a/Bundle/CoreBundle/Twig/Extension/RoutingExtension.php +++ b/Bundle/CoreBundle/Twig/Extension/RoutingExtension.php @@ -74,11 +74,15 @@ public function getPath($name, $parameters = [], $relative = false) ]); $errorPage = $this->errorPageRepository->findOneByCode(404); $parameters['url'] = $this->generator->generate( - 'victoire_core_page_show', array_merge([ - '_locale' => $requestLocale, - 'url' => $errorPage ? $errorPage->getSlug() : '', - ], $parameters - )); + 'victoire_core_page_show', + array_merge( + [ + '_locale' => $requestLocale, + 'url' => $errorPage ? $errorPage->getSlug() : '', + ], + $parameters + ) + ); } $name = 'victoire_core_page_show'; diff --git a/Bundle/FilterBundle/DependencyInjection/Compiler/FilterCompilerPass.php b/Bundle/FilterBundle/DependencyInjection/Compiler/FilterCompilerPass.php index 3cf313d7d..66b330849 100644 --- a/Bundle/FilterBundle/DependencyInjection/Compiler/FilterCompilerPass.php +++ b/Bundle/FilterBundle/DependencyInjection/Compiler/FilterCompilerPass.php @@ -25,7 +25,9 @@ public function process(ContainerBuilder $container) ); foreach ($taggedServices as $id => $attributes) { - $definition->addMethodCall('addFilter', [ + $definition->addMethodCall( + 'addFilter', + [ new Reference($id), ] ); diff --git a/Bundle/I18nBundle/Command/ImportViewTranslationsCommand.php b/Bundle/I18nBundle/Command/ImportViewTranslationsCommand.php index 2fe28bbdf..85b0f1e6a 100644 --- a/Bundle/I18nBundle/Command/ImportViewTranslationsCommand.php +++ b/Bundle/I18nBundle/Command/ImportViewTranslationsCommand.php @@ -8,7 +8,6 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Victoire\Bundle\CoreBundle\Entity\View; class ImportViewTranslationsCommand extends ContainerAwareCommand { diff --git a/Bundle/I18nBundle/DependencyInjection/VictoireI18nExtension.php b/Bundle/I18nBundle/DependencyInjection/VictoireI18nExtension.php index a63854771..ebb2fbc51 100644 --- a/Bundle/I18nBundle/DependencyInjection/VictoireI18nExtension.php +++ b/Bundle/I18nBundle/DependencyInjection/VictoireI18nExtension.php @@ -28,19 +28,24 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('services.yml'); $container->setParameter( - 'victoire_i18n.available_locales', $config['available_locales'] + 'victoire_i18n.available_locales', + $config['available_locales'] ); $container->setParameter( - 'victoire_i18n.locale_pattern_table', $config['locale_pattern_table'] + 'victoire_i18n.locale_pattern_table', + $config['locale_pattern_table'] ); $container->setParameter( - 'victoire_i18n.victoire_locale', $config['victoire_locale'] + 'victoire_i18n.victoire_locale', + $config['victoire_locale'] ); $container->setParameter( - 'victoire_i18n.users_locale.domains', $config['users_locale_domains'] + 'victoire_i18n.users_locale.domains', + $config['users_locale_domains'] ); $container->setParameter( - 'victoire_i18n.locale_pattern', $config['locale_pattern'] + 'victoire_i18n.locale_pattern', + $config['locale_pattern'] ); } diff --git a/Bundle/MediaBundle/Controller/ChooserController.php b/Bundle/MediaBundle/Controller/ChooserController.php index 9277ff6d0..bd01d6bc5 100644 --- a/Bundle/MediaBundle/Controller/ChooserController.php +++ b/Bundle/MediaBundle/Controller/ChooserController.php @@ -71,15 +71,15 @@ public function chooserShowFolderAction(Request $request, $folderId) } return $this->render('@VictoireMedia/Chooser/chooserShowFolder.html.twig', [ - 'mediamanager' => $mediaHandler, - 'handler' => $handler, - 'folder' => $folder, - 'folders' => $folders, - 'forms' => [ - 'fileform' => $this->createTypeFormView($mediaHandler, FileType::class), - 'videoform' => $this->createTypeFormView($mediaHandler, RemoteVideoType::class), - 'slideform' => $this->createTypeFormView($mediaHandler, RemoteSlideType::class), - ], + 'mediamanager' => $mediaHandler, + 'handler' => $handler, + 'folder' => $folder, + 'folders' => $folders, + 'forms' => [ + 'fileform' => $this->createTypeFormView($mediaHandler, FileType::class), + 'videoform' => $this->createTypeFormView($mediaHandler, RemoteVideoType::class), + 'slideform' => $this->createTypeFormView($mediaHandler, RemoteSlideType::class), + ], ]); } diff --git a/Bundle/MediaBundle/Controller/MediaController.php b/Bundle/MediaBundle/Controller/MediaController.php index 15bca4c1f..e33dfb994 100644 --- a/Bundle/MediaBundle/Controller/MediaController.php +++ b/Bundle/MediaBundle/Controller/MediaController.php @@ -60,12 +60,12 @@ public function showAction(Request $request, $mediaId) $showTemplate = $mediaManager->getHandler($media)->getShowTemplate($media); return $this->render($showTemplate, [ - 'handler' => $handler, - 'mediamanager' => $this->get('victoire_media.media_manager'), - 'editform' => $form->createView(), - 'media' => $media, - 'helper' => $helper, - 'folder' => $folder, ]); + 'handler' => $handler, + 'mediamanager' => $this->get('victoire_media.media_manager'), + 'editform' => $form->createView(), + 'media' => $media, + 'helper' => $helper, + 'folder' => $folder, ]); } /** diff --git a/Bundle/MediaBundle/Form/BulkUploadType.php b/Bundle/MediaBundle/Form/BulkUploadType.php index bd744b3e7..872098445 100644 --- a/Bundle/MediaBundle/Form/BulkUploadType.php +++ b/Bundle/MediaBundle/Form/BulkUploadType.php @@ -30,7 +30,9 @@ class BulkUploadType extends AbstractType public function buildForm(FormBuilderInterface $builder, array $options) { $builder->add( - 'files', 'file', [ + 'files', + 'file', + [ 'required' => false, 'attr' => [ 'accept' => $this->accept, diff --git a/Bundle/MediaBundle/Form/FolderType.php b/Bundle/MediaBundle/Form/FolderType.php index ef68c852d..58d08482e 100644 --- a/Bundle/MediaBundle/Form/FolderType.php +++ b/Bundle/MediaBundle/Form/FolderType.php @@ -50,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) return $qb; }, - ]); + ]); } /** diff --git a/Bundle/MediaBundle/Form/RemoteSlide/RemoteSlideType.php b/Bundle/MediaBundle/Form/RemoteSlide/RemoteSlideType.php index 734dbb86f..7e19dc44d 100644 --- a/Bundle/MediaBundle/Form/RemoteSlide/RemoteSlideType.php +++ b/Bundle/MediaBundle/Form/RemoteSlide/RemoteSlideType.php @@ -38,7 +38,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) public function configureOptions(OptionsResolver $resolver) { $resolver->setDefaults([ - 'data_class' => 'Victoire\Bundle\MediaBundle\Helper\RemoteSlide\RemoteSlideHelper', + 'data_class' => 'Victoire\Bundle\MediaBundle\Helper\RemoteSlide\RemoteSlideHelper', ]); } } diff --git a/Bundle/MediaBundle/Helper/File/FileHandler.php b/Bundle/MediaBundle/Helper/File/FileHandler.php index f0b4f0b65..3dfe74349 100644 --- a/Bundle/MediaBundle/Helper/File/FileHandler.php +++ b/Bundle/MediaBundle/Helper/File/FileHandler.php @@ -2,7 +2,6 @@ namespace Victoire\Bundle\MediaBundle\Helper\File; -use Gaufrette\Adapter\Local; use Gaufrette\Filesystem; use Gedmo\Sluggable\Util\Urlizer; use Symfony\Component\HttpFoundation\File\File; @@ -207,9 +206,9 @@ public function getShowTemplate(Media $media) public function getAddFolderActions() { return [ - self::TYPE => [ - 'type' => self::TYPE, - 'name' => 'media.file.add', ], + self::TYPE => [ + 'type' => self::TYPE, + 'name' => 'media.file.add', ], ]; } } diff --git a/Bundle/MediaBundle/Helper/RemoteSlide/RemoteSlideHandler.php b/Bundle/MediaBundle/Helper/RemoteSlide/RemoteSlideHandler.php index 8a7be8d16..237736453 100644 --- a/Bundle/MediaBundle/Helper/RemoteSlide/RemoteSlideHandler.php +++ b/Bundle/MediaBundle/Helper/RemoteSlide/RemoteSlideHandler.php @@ -120,11 +120,11 @@ public function updateMedia(Media $media) public function getAddUrlFor(array $params = []) { return [ - 'slide' => [ - 'path' => 'VictoireMediaBundle_folder_slidecreate', - 'params' => [ - 'folderId' => $params['folderId'], - ], + 'slide' => [ + 'path' => 'VictoireMediaBundle_folder_slidecreate', + 'params' => [ + 'folderId' => $params['folderId'], + ], ], ]; } @@ -186,9 +186,9 @@ public function getImageUrl(Media $media, $basepath) public function getAddFolderActions() { return [ - self::TYPE => [ - 'type' => self::TYPE, - 'name' => 'media.slide.add', ], - ]; + self::TYPE => [ + 'type' => self::TYPE, + 'name' => 'media.slide.add', ], + ]; } } diff --git a/Bundle/SeoBundle/Controller/PageSeoController.php b/Bundle/SeoBundle/Controller/PageSeoController.php index 0ab7c599b..cd8761abf 100644 --- a/Bundle/SeoBundle/Controller/PageSeoController.php +++ b/Bundle/SeoBundle/Controller/PageSeoController.php @@ -106,9 +106,12 @@ public function settingsPostAction(Request $request, View $view) */ private function createSettingsForm(PageSeo $pageSeo, View $view) { - return $this->get('form.factory')->create(PageSeoType::class, $pageSeo, + return $this->get('form.factory')->create( + PageSeoType::class, + $pageSeo, [ - 'action' => $this->get('router')->generate('victoire_seo_pageSeo_settings_post', + 'action' => $this->get('router')->generate( + 'victoire_seo_pageSeo_settings_post', [ 'id' => $view->getId(), ] diff --git a/Bundle/SeoBundle/Controller/RedirectionController.php b/Bundle/SeoBundle/Controller/RedirectionController.php index 708e7590b..401470bbc 100644 --- a/Bundle/SeoBundle/Controller/RedirectionController.php +++ b/Bundle/SeoBundle/Controller/RedirectionController.php @@ -50,7 +50,8 @@ public function indexAction(Request $request) /** @var Redirection[] $redirection */ foreach ($redirections as $redirection) { - $forms[$redirection->getId()] = $this->getRedirectionForm($redirection, + $forms[$redirection->getId()] = $this->getRedirectionForm( + $redirection, sprintf('#redirection-%d-item-container', $redirection->getId()) )->createView(); } diff --git a/Bundle/SeoBundle/DependencyInjection/VictoireSeoExtension.php b/Bundle/SeoBundle/DependencyInjection/VictoireSeoExtension.php index 92f07e1c6..eead6dfda 100644 --- a/Bundle/SeoBundle/DependencyInjection/VictoireSeoExtension.php +++ b/Bundle/SeoBundle/DependencyInjection/VictoireSeoExtension.php @@ -29,7 +29,8 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('services.yml'); $container->setParameter( - 'victoire_seo.analytics', $config['analytics'] + 'victoire_seo.analytics', + $config['analytics'] ); } } diff --git a/Bundle/SeoBundle/Form/PageSeoType.php b/Bundle/SeoBundle/Form/PageSeoType.php index fc31a2d42..0ad29631a 100644 --- a/Bundle/SeoBundle/Form/PageSeoType.php +++ b/Bundle/SeoBundle/Form/PageSeoType.php @@ -9,7 +9,6 @@ use Symfony\Component\OptionsResolver\OptionsResolver; use Victoire\Bundle\FormBundle\Form\Type\LinkType; use Victoire\Bundle\MediaBundle\Form\Type\MediaType; -use Victoire\Bundle\SeoBundle\Entity\PageSeo; use Victoire\Bundle\SeoBundle\Entity\PageSeoTranslation; class PageSeoType extends AbstractType @@ -77,19 +76,19 @@ public function buildForm(FormBuilderInterface $builder, array $options) ], ], 'twitterCard' => [ - 'field_type' => ChoiceType::class, - 'label' => 'form.pageSeo.twitterCard.label', - 'choices' => [ - 'form.pageSeo.twitterCard.summary.label' => 'summary', - 'form.pageSeo.twitterCard.summary_large_image.label' => 'summary_large_image', - 'form.pageSeo.twitterCard.photo.label' => 'photo', - 'form.pageSeo.twitterCard.app.label' => 'app', - 'form.pageSeo.twitterCard.player.label' => 'player', - 'form.pageSeo.twitterCard.product.label' => 'product', - ], - 'choices_as_values' => true, - 'preferred_choices' => ['summary'], - 'vic_help_block' => 'form.pageSeo.twitterCard.vic_help_block', + 'field_type' => ChoiceType::class, + 'label' => 'form.pageSeo.twitterCard.label', + 'choices' => [ + 'form.pageSeo.twitterCard.summary.label' => 'summary', + 'form.pageSeo.twitterCard.summary_large_image.label' => 'summary_large_image', + 'form.pageSeo.twitterCard.photo.label' => 'photo', + 'form.pageSeo.twitterCard.app.label' => 'app', + 'form.pageSeo.twitterCard.player.label' => 'player', + 'form.pageSeo.twitterCard.product.label' => 'product', + ], + 'choices_as_values' => true, + 'preferred_choices' => ['summary'], + 'vic_help_block' => 'form.pageSeo.twitterCard.vic_help_block', ], 'twitterUrl' => [ 'label' => 'form.pageSeo.twitterUrl.label', diff --git a/Bundle/SitemapBundle/Command/GenerateCommand.php b/Bundle/SitemapBundle/Command/GenerateCommand.php index 99a4c7fa1..45956b2c4 100644 --- a/Bundle/SitemapBundle/Command/GenerateCommand.php +++ b/Bundle/SitemapBundle/Command/GenerateCommand.php @@ -55,10 +55,12 @@ protected function getLocalesFromInput(InputInterface $input) if ($locale != 'all') { //validate the given locale is a valid locale if (!array_search($locale, $locales)) { - throw new \Exception(sprintf( - 'The given locale %s doesn\'t exist (%s)', - $locale, - implode($locales)) + throw new \Exception( + sprintf( + 'The given locale %s doesn\'t exist (%s)', + $locale, + implode($locales) + ) ); } $locales = [$locale]; diff --git a/Bundle/SitemapBundle/Controller/SitemapController.php b/Bundle/SitemapBundle/Controller/SitemapController.php index e8573995b..c0bca9ba1 100644 --- a/Bundle/SitemapBundle/Controller/SitemapController.php +++ b/Bundle/SitemapBundle/Controller/SitemapController.php @@ -2,7 +2,6 @@ namespace Victoire\Bundle\SitemapBundle\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\JsonResponse; @@ -126,8 +125,13 @@ public function changePriorityAction(Request $request, BasePage $page) */ protected function createSitemapPriorityType(BasePage $page, PageSeo $pageSeo) { - $form = $this->createForm(SitemapPriorityPageSeoType::class, $pageSeo, [ - 'action' => $this->generateUrl('victoire_sitemap_changePriority', [ + $form = $this->createForm( + SitemapPriorityPageSeoType::class, + $pageSeo, + [ + 'action' => $this->generateUrl( + 'victoire_sitemap_changePriority', + [ 'id' => $page->getId(), ] ), diff --git a/Bundle/TemplateBundle/Controller/TemplateController.php b/Bundle/TemplateBundle/Controller/TemplateController.php index c236897af..31f5a0214 100644 --- a/Bundle/TemplateBundle/Controller/TemplateController.php +++ b/Bundle/TemplateBundle/Controller/TemplateController.php @@ -148,11 +148,11 @@ public function settingsAction(Request $request, $template) $em->flush(); return new JsonResponse( - [ - 'success' => true, - 'url' => $this->generateUrl('victoire_template_show', ['id' => $template->getId()]), - ] - ); + [ + 'success' => true, + 'url' => $this->generateUrl('victoire_template_show', ['id' => $template->getId()]), + ] + ); } return new JsonResponse( diff --git a/Bundle/TemplateBundle/Listener/TemplateMenuListener.php b/Bundle/TemplateBundle/Listener/TemplateMenuListener.php index 798259758..5f2575017 100644 --- a/Bundle/TemplateBundle/Listener/TemplateMenuListener.php +++ b/Bundle/TemplateBundle/Listener/TemplateMenuListener.php @@ -35,7 +35,8 @@ public function addContextual($event) $template = $event->getTemplate(); //this contextual menu appears only for template - $menuBottomRight->addChild('menu.template.settings', + $menuBottomRight->addChild( + 'menu.template.settings', [ 'route' => 'victoire_template_settings', 'routeParameters' => ['id' => $template->getId()], diff --git a/Bundle/TwigBundle/Controller/ExceptionController.php b/Bundle/TwigBundle/Controller/ExceptionController.php index 669530f50..dcaed605a 100644 --- a/Bundle/TwigBundle/Controller/ExceptionController.php +++ b/Bundle/TwigBundle/Controller/ExceptionController.php @@ -84,7 +84,7 @@ public function showAction(Request $request, FlattenException $exception, DebugL $page = $this->em->getRepository('VictoireTwigBundle:ErrorPage')->findOneByCode($code); if ($page) { return $this->forward('VictoireTwigBundle:ErrorPage:show', [ - 'code' => $page->getCode(), + 'code' => $page->getCode(), ]); } } diff --git a/Bundle/TwigBundle/DependencyInjection/VictoireTwigExtension.php b/Bundle/TwigBundle/DependencyInjection/VictoireTwigExtension.php index 7ec291c03..43bd53d97 100644 --- a/Bundle/TwigBundle/DependencyInjection/VictoireTwigExtension.php +++ b/Bundle/TwigBundle/DependencyInjection/VictoireTwigExtension.php @@ -26,7 +26,8 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('services.xml'); $container->setParameter( - 'victoire_twig.responsive', $config['responsive'] + 'victoire_twig.responsive', + $config['responsive'] ); } } diff --git a/Bundle/UIBundle/Command/FetchAssetsCommand.php b/Bundle/UIBundle/Command/FetchAssetsCommand.php index 5895c970a..8d6453deb 100644 --- a/Bundle/UIBundle/Command/FetchAssetsCommand.php +++ b/Bundle/UIBundle/Command/FetchAssetsCommand.php @@ -24,25 +24,29 @@ public function configure() $this ->setName('victoire:ui:fetchAssets') - ->addArgument('victoireUIConfigPath', + ->addArgument( + 'victoireUIConfigPath', InputArgument::OPTIONAL, 'The victoire vendor path', 'vendor/victoire/victoire/Bundle/UIBundle/Resources/config' ) - ->addArgument('bowerPath', + ->addArgument( + 'bowerPath', InputArgument::OPTIONAL, 'The bower path', 'bower' ) - ->addArgument('yarnPath', + ->addArgument( + 'yarnPath', InputArgument::OPTIONAL, 'The yarn path', 'yarn' ) - ->addOption('force', + ->addOption( + 'force', null, InputOption::VALUE_NONE, - 'If dependencies are installed, it reinstalls all installed components. It also forces installation even when there are non-bower directories with the same name in the components directory. Also bypasses the cache and overwrites to the cache anyway.' + 'If dependencies are installed, it reinstalls all installed components. It also forces installation even when there are non-bower directories with the same name in the components directory. Also bypasses the cache and overwrites to the cache anyway.' ) ->setDescription('Fetch every assets (with bower and npm)'); } diff --git a/Bundle/UIBundle/Resources/config/package.json b/Bundle/UIBundle/Resources/config/package.json index cd6b513b6..c17eb0a02 100644 --- a/Bundle/UIBundle/Resources/config/package.json +++ b/Bundle/UIBundle/Resources/config/package.json @@ -24,7 +24,7 @@ "gulp-sourcemaps": "^2.1.1", "gulp-util": "^3.0.8", "highlight.js": "^9.9.0", - "node-sass": "^3.10.1", + "node-sass": "^4.13.1", "webpack": "^2.2.1" }, "dependencies": { diff --git a/Bundle/UIBundle/Resources/config/yarn.lock b/Bundle/UIBundle/Resources/config/yarn.lock index 67b71f478..cd8bdc9bc 100644 --- a/Bundle/UIBundle/Resources/config/yarn.lock +++ b/Bundle/UIBundle/Resources/config/yarn.lock @@ -20,13 +20,22 @@ ajv-keywords@^1.1.1: version "1.5.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c" -ajv@^4.7.0, ajv@^4.9.1: +ajv@^4.7.0: version "4.11.4" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.4.tgz#ebf3a55d4b132ea60ff5847ae85d2ef069960b45" dependencies: co "^4.6.0" json-stable-stringify "^1.0.1" +ajv@^6.12.3: + version "6.12.4" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234" + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + align-text@^0.1.1, align-text@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/align-text/-/align-text-0.1.4.tgz#0cd90a561093f35d0a99256c22b7069433fad117" @@ -123,10 +132,6 @@ asn1@~0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.3.tgz#dac8787713c9966849fc8180777ebe9c1ddf3b86" -assert-plus@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234" - assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" @@ -176,13 +181,13 @@ autoprefixer@^6.0.0: postcss "^5.2.15" postcss-value-parser "^3.2.3" -aws-sign2@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.6.0.tgz#14342dd38dbcc94d0e5b87d763cd63612c0e794f" +aws-sign2@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" -aws4@^1.2.1: - version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" +aws4@^1.8.0: + version "1.10.1" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz#e1e82e4f3e999e2cfd61b161280d16a111f86428" babel-code-frame@^6.22.0: version "6.22.0" @@ -650,12 +655,6 @@ boolbase@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" -boom@2.x.x: - version "2.10.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f" - dependencies: - hoek "2.x.x" - brace-expansion@^1.0.0: version "1.1.6" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.6.tgz#7197d7eaa9b87e648390ea61fc66c84427420df9" @@ -954,9 +953,9 @@ colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" -combined-stream@^1.0.5, combined-stream@~1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.5.tgz#938370a57b4a51dea2c77c15d5c5fdf895164009" +combined-stream@^1.0.6, combined-stream@~1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" dependencies: delayed-stream "~1.0.0" @@ -1034,12 +1033,6 @@ cross-spawn@^3.0.0: lru-cache "^4.0.1" which "^1.2.9" -cryptiles@2.x.x: - version "2.0.5" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-2.0.5.tgz#3bdfecdc608147c1c67202fa291e7dca59eaa3b8" - dependencies: - boom "2.x.x" - crypto-browserify@^3.11.0: version "3.11.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.11.0.tgz#3652a0906ab9b2a7e0c3ce66a408e957a2485522" @@ -1138,6 +1131,12 @@ defaults@^1.0.0: dependencies: clone "^1.0.2" +define-properties@^1.1.2: + version "1.1.3" + resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" + dependencies: + object-keys "^1.0.12" + delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -1331,10 +1330,14 @@ expand-tilde@^1.2.1, expand-tilde@^1.2.2: dependencies: os-homedir "^1.0.1" -extend@^3.0.0, extend@~3.0.0: +extend@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.0.tgz#5a474353b9f3353ddd8176dfd37b91c83a46f1d4" +extend@~3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" + extglob@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1" @@ -1352,6 +1355,14 @@ fancy-log@^1.1.0, fancy-log@^1.2.0: chalk "^1.1.1" time-stamp "^1.0.0" +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + filename-regex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.0.tgz#996e3e80479b98b9897f15a8a58b3d084e926775" @@ -1432,12 +1443,12 @@ forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" -form-data@~2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.1.2.tgz#89c3534008b97eada4cbb157d58f6f5df025eae4" +form-data@~2.3.2: + version "2.3.3" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" dependencies: asynckit "^0.4.0" - combined-stream "^1.0.5" + combined-stream "^1.0.6" mime-types "^2.1.12" fs-exists-sync@^0.1.0: @@ -1481,6 +1492,10 @@ fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.10: mkdirp ">=0.5 0" rimraf "2" +function-bind@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" + gauge@~2.7.1: version "2.7.3" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.3.tgz#1c23855f962f17b3ad3d0dc7443f304542edfe09" @@ -1575,14 +1590,14 @@ glob@^4.3.1: minimatch "^2.0.1" once "^1.3.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@~7.1.1: - version "7.1.1" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" +glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1: + version "7.1.6" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" inherits "2" - minimatch "^3.0.2" + minimatch "^3.0.4" once "^1.3.0" path-is-absolute "^1.0.0" @@ -1841,16 +1856,16 @@ gzip-size@^3.0.0: dependencies: duplexer "^0.1.1" -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" +har-schema@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" -har-validator@~4.2.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" +har-validator@~5.1.3: + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" + ajv "^6.12.3" + har-schema "^2.0.0" has-ansi@^0.1.0: version "0.1.0" @@ -1874,6 +1889,10 @@ has-gulplog@^0.1.0: dependencies: sparkles "^1.0.0" +has-symbols@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -1884,15 +1903,6 @@ hash.js@^1.0.0, hash.js@^1.0.3: dependencies: inherits "^2.0.1" -hawk@~3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" - dependencies: - boom "2.x.x" - cryptiles "2.x.x" - hoek "2.x.x" - sntp "1.x.x" - highlight.js: version "9.9.0" resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.9.0.tgz#b9995dcfdc2773e307a34f0460d92b9a474782c0" @@ -1905,10 +1915,6 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoek@2.x.x: - version "2.16.3" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" - home-or-tmp@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-2.0.0.tgz#e36c3f2d2cae7d746a857e38d18d5f32a7882db8" @@ -1937,11 +1943,11 @@ htmlparser2@^3.9.1: inherits "^2.0.1" readable-stream "^2.0.2" -http-signature@~1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.1.1.tgz#df72e267066cd0ac67fb76adf8e134a8fbcf91bf" +http-signature@~1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" dependencies: - assert-plus "^0.2.0" + assert-plus "^1.0.0" jsprim "^1.2.2" sshpk "^1.7.0" @@ -2137,6 +2143,10 @@ jodid25519@^1.0.0: dependencies: jsbn "~0.1.0" +js-base64@^2.1.8: + version "2.6.4" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" + js-base64@^2.1.9: version "2.1.9" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.1.9.tgz#f0e80ae039a4bd654b5f281fc93f04a914a7fcce" @@ -2161,6 +2171,10 @@ json-loader@^0.5.4: version "0.5.4" resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.4.tgz#8baa1365a632f58a3c46d20175fc6002c96e37de" +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -2357,7 +2371,7 @@ lodash._shimkeys@~2.4.1: dependencies: lodash._objecttypes "~2.4.1" -lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0: +lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -2541,9 +2555,9 @@ lodash.values@~2.4.1: dependencies: lodash.keys "~2.4.1" -lodash@^4.0.0, lodash@^4.14.0, lodash@^4.2.0: - version "4.17.4" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" +lodash@^4.0.0, lodash@^4.14.0, lodash@^4.17.15, lodash@^4.2.0: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" lodash@~1.0.1: version "1.0.2" @@ -2674,16 +2688,26 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" +mime-db@1.44.0: + version "1.44.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz#fa11c5eb0aca1334b4233cb4d52f10c5a6272f92" + mime-db@~1.26.0: version "1.26.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.26.0.tgz#eaffcd0e4fc6935cf8134da246e2e6c35305adff" -mime-types@^2.1.12, mime-types@~2.1.7: +mime-types@^2.1.12: version "2.1.14" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.14.tgz#f7ef7d97583fcaf3b7d282b6f8b5679dab1e94ee" dependencies: mime-db "~1.26.0" +mime-types@~2.1.19: + version "2.1.27" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz#47949f98e279ea53119f5722e0f34e529bec009f" + dependencies: + mime-db "1.44.0" + minimalistic-assert@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" @@ -2692,7 +2716,7 @@ minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" -"minimatch@2 || 3": +"minimatch@2 || 3", minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: @@ -2749,9 +2773,9 @@ multipipe@^0.1.0, multipipe@^0.1.2: dependencies: duplexer2 "0.0.2" -nan@^2.3.0, nan@^2.3.2: - version "2.5.1" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.1.tgz#d5b01691253326a97a2bbee9e61c55d8d60351e2" +nan@^2.13.2, nan@^2.3.0, nan@^2.3.2: + version "2.14.1" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz#d7be34dfa3105b91494c3147089315eff8874b01" natives@^1.1.0: version "1.1.0" @@ -2763,21 +2787,20 @@ node-emoji@^1.4.1: dependencies: string.prototype.codepointat "^0.2.0" -node-gyp@^3.3.1: - version "3.5.0" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.5.0.tgz#a8fe5e611d079ec16348a3eb960e78e11c85274a" +node-gyp@^3.3.1, node-gyp@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c" dependencies: fstream "^1.0.0" glob "^7.0.3" graceful-fs "^4.1.2" - minimatch "^3.0.2" mkdirp "^0.5.0" nopt "2 || 3" npmlog "0 || 1 || 2 || 3 || 4" osenv "0" - request "2" + request "^2.87.0" rimraf "2" - semver "2.x || 3.x || 4 || 5" + semver "~5.3.0" tar "^2.0.0" which "1" @@ -2842,7 +2865,7 @@ node-rest-client@^1.4.1: debug "~2.2.0" xml2js ">=0.2.4" -node-sass@^3.10.1, node-sass@^3.4.2: +node-sass@^3.4.2: version "3.13.1" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-3.13.1.tgz#7240fbbff2396304b4223527ed3020589c004fc2" dependencies: @@ -2863,6 +2886,28 @@ node-sass@^3.10.1, node-sass@^3.4.2: request "^2.61.0" sass-graph "^2.1.1" +node-sass@^4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3" + dependencies: + async-foreach "^0.1.3" + chalk "^1.1.1" + cross-spawn "^3.0.0" + gaze "^1.0.0" + get-stdin "^4.0.1" + glob "^7.0.3" + in-publish "^2.0.0" + lodash "^4.17.15" + meow "^3.7.0" + mkdirp "^0.5.1" + nan "^2.13.2" + node-gyp "^3.8.0" + npmlog "^4.0.0" + request "^2.88.0" + sass-graph "^2.2.4" + stdout-stream "^1.4.0" + "true-case-path" "^1.0.2" + node.extend@^1.1.3: version "1.1.6" resolved "https://registry.yarnpkg.com/node.extend/-/node.extend-1.1.6.tgz#a7b882c82d6c93a4863a5504bd5de8ec86258b96" @@ -2915,9 +2960,9 @@ number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" -oauth-sign@~0.8.1: - version "0.8.2" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43" +oauth-sign@~0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" object-assign@4.1.0: version "4.1.0" @@ -2931,6 +2976,19 @@ object-assign@^4.0.1, object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" +object-keys@^1.0.11, object-keys@^1.0.12: + version "1.1.1" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" + +object.assign@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" + dependencies: + define-properties "^1.1.2" + function-bind "^1.1.1" + has-symbols "^1.0.0" + object-keys "^1.0.11" + object.omit@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa" @@ -3074,9 +3132,9 @@ pbkdf2@^3.0.3: dependencies: create-hmac "^1.1.2" -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" +performance-now@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" pify@^2.0.0: version "2.3.0" @@ -3145,6 +3203,10 @@ pseudomap@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" +psl@^1.1.28: + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + public-encrypt@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" @@ -3168,13 +3230,17 @@ punycode@1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d" -punycode@^1.2.4, punycode@^1.4.1: +punycode@^1.2.4: version "1.4.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e" -qs@~6.3.0: - version "6.3.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" +punycode@^2.1.0, punycode@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + +qs@~6.5.2: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" querystring-es3@^0.2.0: version "0.2.1" @@ -3348,31 +3414,30 @@ replace-ext@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924" -request@2, request@^2.61.0, request@^2.79.0: - version "2.80.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.80.0.tgz#8cc162d76d79381cdefdd3505d76b80b60589bd0" +request@^2.61.0, request@^2.79.0, request@^2.87.0, request@^2.88.0: + version "2.88.2" + resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" + aws-sign2 "~0.7.0" + aws4 "^1.8.0" caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" + combined-stream "~1.0.6" + extend "~3.0.2" forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.0" - hawk "~3.1.3" - http-signature "~1.1.0" + form-data "~2.3.2" + har-validator "~5.1.3" + http-signature "~1.2.0" is-typedarray "~1.0.0" isstream "~0.1.2" json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.3.0" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "~0.4.1" - uuid "^3.0.0" + mime-types "~2.1.19" + oauth-sign "~0.9.0" + performance-now "^2.1.0" + qs "~6.5.2" + safe-buffer "^5.1.2" + tough-cookie "~2.5.0" + tunnel-agent "^0.6.0" + uuid "^3.3.2" require-directory@^2.1.1: version "2.1.1" @@ -3431,23 +3496,35 @@ ripemd160@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-1.0.1.tgz#93a4bbd4942bc574b69a8fa57c71de10ecca7d6e" -sass-graph@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.1.2.tgz#965104be23e8103cb7e5f710df65935b317da57b" +safe-buffer@^5.0.1, safe-buffer@^5.1.2: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + +sass-graph@^2.1.1, sass-graph@^2.2.4: + version "2.2.6" + resolved "https://registry.yarnpkg.com/sass-graph/-/sass-graph-2.2.6.tgz#09fda0e4287480e3e4967b72a2d133ba09b8d827" dependencies: glob "^7.0.0" lodash "^4.0.0" - yargs "^4.7.1" + scss-tokenizer "^0.2.3" + yargs "^7.0.0" sax@>=0.6.0: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" +scss-tokenizer@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/scss-tokenizer/-/scss-tokenizer-0.2.3.tgz#8eb06db9a9723333824d3f5530641149847ce5d1" + dependencies: + js-base64 "^2.1.8" + source-map "^0.4.2" + select@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" -"semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", semver@^5.1.0, semver@~5.3.0: +"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@~5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f" @@ -3499,12 +3576,6 @@ slash@^1.0.0: dependencies: readable-stream "~1.0.31" -sntp@1.x.x: - version "1.0.9" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-1.0.9.tgz#6541184cc90aeea6c6e7b35e2659082443c66198" - dependencies: - hoek "2.x.x" - source-list-map@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" @@ -3528,7 +3599,7 @@ source-map-url@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.3.0.tgz#7ecaf13b57bcd09da8a40c5d269db33799d4aaf9" -source-map@0.4.x: +source-map@0.4.x, source-map@^0.4.2: version "0.4.4" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b" dependencies: @@ -3577,6 +3648,12 @@ sshpk@^1.7.0: jsbn "~0.1.0" tweetnacl "~0.14.0" +stdout-stream@^1.4.0: + version "1.4.1" + resolved "https://registry.yarnpkg.com/stdout-stream/-/stdout-stream-1.4.1.tgz#5ac174cdd5cd726104aa0c0b2bd83815d8d535de" + dependencies: + readable-stream "^2.0.1" + stream-browserify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" @@ -3618,10 +3695,6 @@ string_decoder@^0.10.25, string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -stringstream@~0.0.4: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - strip-ansi@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220" @@ -3762,11 +3835,12 @@ to-fast-properties@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-1.0.2.tgz#f3f5c0c3ba7299a7ef99427e44633257ade43320" -tough-cookie@~2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.3.2.tgz#f081f76e4c85720e6c37a5faced737150d84072a" +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" dependencies: - punycode "^1.4.1" + psl "^1.1.28" + punycode "^2.1.1" "traverse@>=0.3.0 <0.4": version "0.3.9" @@ -3780,13 +3854,21 @@ trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" +"true-case-path@^1.0.2": + version "1.0.3" + resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-1.0.3.tgz#f813b5a8c86b40da59606722b144e3225799f47d" + dependencies: + glob "^7.1.2" + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" -tunnel-agent@~0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb" +tunnel-agent@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" + dependencies: + safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" @@ -3831,6 +3913,12 @@ unzip@^0.1.11: readable-stream "~1.0.31" setimmediate ">= 1.0.1 < 2" +uri-js@^4.2.2: + version "4.4.0" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz#aa714261de793e8a82347a7bcc9ce74e86f28602" + dependencies: + punycode "^2.1.0" + urix@^0.1.0, urix@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" @@ -3856,9 +3944,9 @@ util@0.10.3, util@^0.10.3: dependencies: inherits "2.0.1" -uuid@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.0.1.tgz#6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1" +uuid@^3.3.2: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" uuid@~1.4.0: version "1.4.2" @@ -3997,10 +4085,6 @@ window-size@0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.1.0.tgz#5438cd2ea93b202efa3a19fe8887aee7c94f9c9d" -window-size@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/window-size/-/window-size-0.2.0.tgz#b4315bb4214a3d7058ebeee892e13fa24d98b075" - wordwrap@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f" @@ -4043,12 +4127,12 @@ yallist@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.0.0.tgz#306c543835f09ee1a4cb23b7bce9ab341c91cdd4" -yargs-parser@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-2.4.1.tgz#85568de3cf150ff49fa51825f03a8c880ddcc5c4" +yargs-parser@5.0.0-security.0: + version "5.0.0-security.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0-security.0.tgz#4ff7271d25f90ac15643b86076a2ab499ec9ee24" dependencies: camelcase "^3.0.0" - lodash.assign "^4.0.6" + object.assign "^4.1.0" yargs-parser@^4.2.0: version "4.2.1" @@ -4056,28 +4140,27 @@ yargs-parser@^4.2.0: dependencies: camelcase "^3.0.0" -yargs@^4.7.1: - version "4.8.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-4.8.1.tgz#c0c42924ca4aaa6b0e6da1739dfb216439f9ddc0" +yargs@^6.0.0: + version "6.6.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" dependencies: + camelcase "^3.0.0" cliui "^3.2.0" decamelize "^1.1.1" get-caller-file "^1.0.1" - lodash.assign "^4.0.3" os-locale "^1.4.0" read-pkg-up "^1.0.1" require-directory "^2.1.1" require-main-filename "^1.0.1" set-blocking "^2.0.0" - string-width "^1.0.1" + string-width "^1.0.2" which-module "^1.0.0" - window-size "^0.2.0" y18n "^3.2.1" - yargs-parser "^2.4.1" + yargs-parser "^4.2.0" -yargs@^6.0.0: - version "6.6.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-6.6.0.tgz#782ec21ef403345f830a808ca3d513af56065208" +yargs@^7.0.0: + version "7.1.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz#67f0ef52e228d4ee0d6311acede8850f53464df6" dependencies: camelcase "^3.0.0" cliui "^3.2.0" @@ -4091,7 +4174,7 @@ yargs@^6.0.0: string-width "^1.0.2" which-module "^1.0.0" y18n "^3.2.1" - yargs-parser "^4.2.0" + yargs-parser "5.0.0-security.0" yargs@~3.10.0: version "3.10.0" diff --git a/Bundle/ViewReferenceBundle/Command/GenerateViewReferenceCommand.php b/Bundle/ViewReferenceBundle/Command/GenerateViewReferenceCommand.php index b2fcd227c..ffca675d8 100644 --- a/Bundle/ViewReferenceBundle/Command/GenerateViewReferenceCommand.php +++ b/Bundle/ViewReferenceBundle/Command/GenerateViewReferenceCommand.php @@ -5,7 +5,6 @@ use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Victoire\Bundle\CoreBundle\Entity\View; use Victoire\Bundle\CoreBundle\Helper\ViewHelper; class GenerateViewReferenceCommand extends ContainerAwareCommand diff --git a/Bundle/ViewReferenceBundle/Connector/ViewReferenceManager.php b/Bundle/ViewReferenceBundle/Connector/ViewReferenceManager.php index fa67d59c5..35d333636 100644 --- a/Bundle/ViewReferenceBundle/Connector/ViewReferenceManager.php +++ b/Bundle/ViewReferenceBundle/Connector/ViewReferenceManager.php @@ -76,7 +76,8 @@ public function saveReference(ViewReference $viewReference, $parentId = null, $p { // Transform the viewReference in array $arrayTransformer = $this->transformer->getViewReferenceTransformer( - $viewReference->getViewNamespace(), 'array' + $viewReference->getViewNamespace(), + 'array' ); $referenceArray = $arrayTransformer->reverseTransform($viewReference); // Remove old url if exist diff --git a/Bundle/ViewReferenceBundle/Connector/ViewReferenceRepository.php b/Bundle/ViewReferenceBundle/Connector/ViewReferenceRepository.php index 5e30f4c5c..192ea7de3 100644 --- a/Bundle/ViewReferenceBundle/Connector/ViewReferenceRepository.php +++ b/Bundle/ViewReferenceBundle/Connector/ViewReferenceRepository.php @@ -41,7 +41,8 @@ public function findReferenceByView(View $view) $referenceId = ViewReferenceHelper::generateViewReferenceId($view); $reference = $this->getOneReferenceByParameters(['id' => $referenceId], false); $transformer = $this->transformer->getViewReferenceTransformer( - (string) $reference['viewNamespace'], 'array' + (string) $reference['viewNamespace'], + 'array' ); return $transformer->transform($reference); @@ -66,7 +67,8 @@ public function getReferenceByUrl($url, $locale) $ref = $this->repository->findById($refId); // Transform the reference into a viewReference $transformer = $this->transformer->getViewReferenceTransformer( - (string) $ref['viewNamespace'], 'array' + (string) $ref['viewNamespace'], + 'array' ); return $transformer->transform($ref); diff --git a/Bundle/ViewReferenceBundle/DependencyInjection/ViewReferenceExtension.php b/Bundle/ViewReferenceBundle/DependencyInjection/ViewReferenceExtension.php index d5d6f2e57..a585e77cd 100644 --- a/Bundle/ViewReferenceBundle/DependencyInjection/ViewReferenceExtension.php +++ b/Bundle/ViewReferenceBundle/DependencyInjection/ViewReferenceExtension.php @@ -26,10 +26,12 @@ public function load(array $configs, ContainerBuilder $container) $loader->load('services.yml'); $container->setParameter( - 'victoire_view_reference.cache.path', $config['cache_path'] + 'victoire_view_reference.cache.path', + $config['cache_path'] ); $container->setParameter( - 'victoire_view_reference.connector.type', $config['connector_type'] + 'victoire_view_reference.connector.type', + $config['connector_type'] ); } } diff --git a/Bundle/WidgetBundle/Builder/WidgetFormBuilder.php b/Bundle/WidgetBundle/Builder/WidgetFormBuilder.php index 7dada71ae..32901587e 100644 --- a/Bundle/WidgetBundle/Builder/WidgetFormBuilder.php +++ b/Bundle/WidgetBundle/Builder/WidgetFormBuilder.php @@ -253,7 +253,8 @@ public function buildWidgetForm(Widget $widget, View $view, $businessEntityId = $formUrl = $router->generate($action, $actionParams); } else { $viewReference = $this->container->get('victoire_core.current_view')->getCurrentView()->getReference(); - $formUrl = $router->generate('victoire_core_widget_update', + $formUrl = $router->generate( + 'victoire_core_widget_update', [ 'id' => $widget->getId(), 'viewReference' => $viewReference->getId(), diff --git a/Bundle/WidgetBundle/Cache/WidgetCache.php b/Bundle/WidgetBundle/Cache/WidgetCache.php index 8a1c8eb9d..d4ee7703f 100644 --- a/Bundle/WidgetBundle/Cache/WidgetCache.php +++ b/Bundle/WidgetBundle/Cache/WidgetCache.php @@ -106,7 +106,8 @@ protected function getHash(Widget $widget) protected function generateBusinessEntityHash(Widget $widget) { - return sprintf('%s--%s-%s-%s', + return sprintf( + '%s--%s-%s-%s', $widget->generateCacheId(), $widget->getEntity()->getId(), $widget->getEntity()->getUpdatedAt()->getTimestamp(), @@ -121,7 +122,8 @@ private function generateHash(Widget $widget) $roleHash .= $this->authorizationChecker->isGranted($role) ? $role : ''; }, ['ROLE_VICTOIRE_DEVELOPER', 'ROLE_VICTOIRE', 'ROLE_VICTOIRE_BLOG', 'ROLE_VICTOIRE_LEFTNAVBAR', 'ROLE_VICTOIRE_BET', 'ROLE_VICTOIRE_PAGE_DEBUG', 'ROLE_VICTOIRE_STYLE']); - return sprintf('%s-%s', + return sprintf( + '%s-%s', $widget->generateCacheId(), md5($roleHash) ); diff --git a/Bundle/WidgetBundle/Command/CreateWidgetCommand.php b/Bundle/WidgetBundle/Command/CreateWidgetCommand.php index 2672336a7..c09c313d2 100644 --- a/Bundle/WidgetBundle/Command/CreateWidgetCommand.php +++ b/Bundle/WidgetBundle/Command/CreateWidgetCommand.php @@ -48,7 +48,8 @@ public function configure() new InputOption('cache', '', InputOption::VALUE_NONE, 'Use redis cache to store widgets until next modification'), ]) ->setDescription('Generate a new widget') - ->setHelp(<<<'EOT' + ->setHelp( + <<<'EOT' The victoire:generate:widget command helps you to generate new widgets. By default, the command interacts with the developer to tweak the generation. diff --git a/Bundle/WidgetBundle/Controller/WidgetController.php b/Bundle/WidgetBundle/Controller/WidgetController.php index eba563830..b99617079 100644 --- a/Bundle/WidgetBundle/Controller/WidgetController.php +++ b/Bundle/WidgetBundle/Controller/WidgetController.php @@ -43,7 +43,8 @@ public function showAction(Request $request, Widget $widget, $viewReferenceId) $view = $this->get('victoire_page.page_helper')->findPageByParameters(['id' => $viewReferenceId]); $this->get('victoire_widget_map.builder')->build($view); $this->get('victoire_core.current_view')->setCurrentView($view); - $response = new JsonResponse([ + $response = new JsonResponse( + [ 'html' => $this->get('victoire_widget.widget_renderer')->render($widget, $view), 'update' => 'vic-widget-'.$widget->getId().'-container', 'success' => true, @@ -303,7 +304,8 @@ public function deleteAction(Widget $widget, $viewReference) $widgetId = $widget->getId(); $this->get('widget_manager')->deleteWidget($widget, $view); - return new JsonResponse([ + return new JsonResponse( + [ 'success' => true, 'message' => $this->get('translator')->trans('victoire_widget.delete.success', [], 'victoire'), 'widgetId' => $widgetId, @@ -336,7 +338,8 @@ public function deleteBulkAction(Widget $widget, $viewReference) $this->get('widget_manager')->deleteWidget($widget, $view); } - return new JsonResponse([ + return new JsonResponse( + [ 'success' => true, 'message' => $this->get('translator')->trans('victoire_widget.delete.success', [], 'victoire'), ] @@ -375,14 +378,14 @@ public function unlinkAction($id, $viewReference) ->getOneReferenceByParameters(['viewId' => $view->getId()]); $redirect = $this->generateUrl('victoire_core_page_show', [ - 'url' => $viewReference->getUrl(), - ]); + 'url' => $viewReference->getUrl(), + ]); } return new JsonResponse([ - 'success' => true, - 'redirect' => $redirect, - ]); + 'success' => true, + 'redirect' => $redirect, + ]); } catch (Exception $ex) { return $this->getJsonReponseFromException($ex); } diff --git a/Bundle/WidgetBundle/DependencyInjection/Compiler/WidgetItemPass.php b/Bundle/WidgetBundle/DependencyInjection/Compiler/WidgetItemPass.php index d742a38e2..b259dc702 100644 --- a/Bundle/WidgetBundle/DependencyInjection/Compiler/WidgetItemPass.php +++ b/Bundle/WidgetBundle/DependencyInjection/Compiler/WidgetItemPass.php @@ -27,7 +27,8 @@ public function process(ContainerBuilder $container) foreach ($taggedServices as $id => $attributes) { foreach ($attributes as $attribute) { $definition->addMethodCall( - 'addWidgetItem', [new Reference($id)] + 'addWidgetItem', + [new Reference($id)] ); } } diff --git a/Bundle/WidgetBundle/Resolver/Chain/WidgetItemChain.php b/Bundle/WidgetBundle/Resolver/Chain/WidgetItemChain.php index c9549e9af..62206eaac 100644 --- a/Bundle/WidgetBundle/Resolver/Chain/WidgetItemChain.php +++ b/Bundle/WidgetBundle/Resolver/Chain/WidgetItemChain.php @@ -24,7 +24,7 @@ public function addWidgetItem(WidgetItemInterface $widgetItem) $newWidgetItem = [ 'class' => $classname, 'name' => $name, - ]; + ]; $this->widgetItems[$name] = $newWidgetItem; } diff --git a/Bundle/WidgetBundle/Twig/LinkExtension.php b/Bundle/WidgetBundle/Twig/LinkExtension.php index 73df1f2d5..e3482d5a9 100644 --- a/Bundle/WidgetBundle/Twig/LinkExtension.php +++ b/Bundle/WidgetBundle/Twig/LinkExtension.php @@ -135,9 +135,9 @@ public function victoireLinkUrl($parameters, $avoidRefresh = true, $url = '#') $linkUrl = $this->router->generate( 'victoire_core_page_show', array_merge([ - '_locale' => $parameters['locale'], - 'url' => $page->getSlug(), - ], $params) + '_locale' => $parameters['locale'], + 'url' => $page->getSlug(), + ], $params) ); } } diff --git a/Bundle/WidgetMapBundle/Command/WidgetMapOverwriteValidationCommand.php b/Bundle/WidgetMapBundle/Command/WidgetMapOverwriteValidationCommand.php index 810e7968e..9d076dce8 100644 --- a/Bundle/WidgetMapBundle/Command/WidgetMapOverwriteValidationCommand.php +++ b/Bundle/WidgetMapBundle/Command/WidgetMapOverwriteValidationCommand.php @@ -7,7 +7,6 @@ use Symfony\Component\Console\Helper\Table; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Victoire\Bundle\CoreBundle\Entity\View; use Victoire\Bundle\WidgetMapBundle\Entity\WidgetMap; class WidgetMapOverwriteValidationCommand extends ContainerAwareCommand diff --git a/Bundle/WidgetMapBundle/Warmer/AssociatedEntityToWarm.php b/Bundle/WidgetMapBundle/Warmer/AssociatedEntityToWarm.php index 6a36c287b..bee2905e8 100644 --- a/Bundle/WidgetMapBundle/Warmer/AssociatedEntityToWarm.php +++ b/Bundle/WidgetMapBundle/Warmer/AssociatedEntityToWarm.php @@ -27,7 +27,8 @@ public function __construct( $inheritorEntity = null, $inheritorPropertyName = null, $entityId = null, - $mappedBy = null) + $mappedBy = null + ) { $this->type = $type; $this->inheritorEntity = $inheritorEntity; diff --git a/Tests/App/src/Acme/AppBundle/Controller/JediController.php b/Tests/App/src/Acme/AppBundle/Controller/JediController.php index 464960fb0..4e033691c 100644 --- a/Tests/App/src/Acme/AppBundle/Controller/JediController.php +++ b/Tests/App/src/Acme/AppBundle/Controller/JediController.php @@ -242,8 +242,8 @@ public function deleteAction(Request $request, $id) private function createDeleteForm($id) { return $this->createFormBuilder(null, [ - 'translation_domain' => 'victoire', - ]) + 'translation_domain' => 'victoire', + ]) ->setAction($this->generateUrl('acme_app_jedi_delete', ['id' => $id])) ->setMethod('DELETE') ->add('submit', SubmitType::class, ['label' => 'acme.app.jedi.form.button.delete']) diff --git a/Tests/App/src/Acme/AppBundle/DataFixtures/Seeds/ORM/LoadFixtureData.php b/Tests/App/src/Acme/AppBundle/DataFixtures/Seeds/ORM/LoadFixtureData.php index 2a8fd39b5..674928adc 100644 --- a/Tests/App/src/Acme/AppBundle/DataFixtures/Seeds/ORM/LoadFixtureData.php +++ b/Tests/App/src/Acme/AppBundle/DataFixtures/Seeds/ORM/LoadFixtureData.php @@ -38,7 +38,7 @@ public function load(ObjectManager $manager) 'locale' => 'fr_FR', 'persist_once' => false, ] - ); + ); $manager->flush(); } @@ -51,9 +51,9 @@ public function load(ObjectManager $manager) public function gender() { $genders = [ - 'male', - 'female', - ]; + 'male', + 'female', + ]; return $genders[array_rand($genders)]; } diff --git a/Tests/App/src/Acme/AppBundle/Form/Type/JediType.php b/Tests/App/src/Acme/AppBundle/Form/Type/JediType.php index 3cdeb84c1..ad70b626f 100644 --- a/Tests/App/src/Acme/AppBundle/Form/Type/JediType.php +++ b/Tests/App/src/Acme/AppBundle/Form/Type/JediType.php @@ -17,29 +17,29 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('name', null, [ - 'label' => 'acme.app.jedi.form.name.label', - ]) + 'label' => 'acme.app.jedi.form.name.label', + ]) ->add('midiChlorians', null, [ - 'label' => 'acme.app.jedi.form.midiChlorians.label', - ]) + 'label' => 'acme.app.jedi.form.midiChlorians.label', + ]) ->add('side', ChoiceType::class, [ - 'label' => 'acme.app.jedi.form.side.label', - 'choices_as_values' => true, - 'choices' => [ - 'acme.app.jedi.form.side.choice.both' => 'both', - 'acme.app.jedi.form.side.choice.dark' => 'dark', - 'acme.app.jedi.form.side.choice.bright' => 'bright', - ], + 'label' => 'acme.app.jedi.form.side.label', + 'choices_as_values' => true, + 'choices' => [ + 'acme.app.jedi.form.side.choice.both' => 'both', + 'acme.app.jedi.form.side.choice.dark' => 'dark', + 'acme.app.jedi.form.side.choice.bright' => 'bright', + ], ]) ->add('slug', null, [ - 'label' => 'acme.app.jedi.form.slug.label', - ]) + 'label' => 'acme.app.jedi.form.slug.label', + ]) ->add('createdAt', null, [ - 'label' => 'acme.app.jedi.form.createdAt.label', - ]) + 'label' => 'acme.app.jedi.form.createdAt.label', + ]) ->add('updatedAt', null, [ - 'label' => 'acme.app.jedi.form.updatedAt.label', - ]) + 'label' => 'acme.app.jedi.form.updatedAt.label', + ]) ->remove('proxy') ->remove('visibleOnFront'); } @@ -52,9 +52,9 @@ public function configureOptions(OptionsResolver $resolver) parent::configureOptions($resolver); $resolver->setDefaults([ - 'data_class' => 'Acme\AppBundle\Entity\Jedi', - 'widget' => 'Force', - 'translation_domain' => 'victoire', - ]); + 'data_class' => 'Acme\AppBundle\Entity\Jedi', + 'widget' => 'Force', + 'translation_domain' => 'victoire', + ]); } } diff --git a/Tests/App/src/Acme/AppBundle/Listener/HamburgerMenuListener.php b/Tests/App/src/Acme/AppBundle/Listener/HamburgerMenuListener.php index 2f30ee2bf..677d508ca 100644 --- a/Tests/App/src/Acme/AppBundle/Listener/HamburgerMenuListener.php +++ b/Tests/App/src/Acme/AppBundle/Listener/HamburgerMenuListener.php @@ -36,7 +36,9 @@ public function addGlobal(Event $event) { $this->mainItem = $this->menuBuilder->getTopNavbar(); - $this->mainItem->addChild('hamburger_menu.jedi', [ + $this->mainItem->addChild( + 'hamburger_menu.jedi', + [ 'route' => 'acme_app_jedi_index', 'attributes' => [ 'class' => 'v-menu__item', @@ -47,7 +49,9 @@ public function addGlobal(Event $event) ] ); - $this->mainItem->addChild('hamburger_menu.spaceship', [ + $this->mainItem->addChild( + 'hamburger_menu.spaceship', + [ 'route' => 'acme_app_spaceship_index', ] ); diff --git a/Tests/App/src/Victoire/Widget/LightSaberBundle/Form/WidgetLightSaberType.php b/Tests/App/src/Victoire/Widget/LightSaberBundle/Form/WidgetLightSaberType.php index e75f206d8..c985b609b 100644 --- a/Tests/App/src/Victoire/Widget/LightSaberBundle/Form/WidgetLightSaberType.php +++ b/Tests/App/src/Victoire/Widget/LightSaberBundle/Form/WidgetLightSaberType.php @@ -21,11 +21,11 @@ public function buildForm(FormBuilderInterface $builder, array $options) { $builder ->add('length', null, [ - 'label' => 'widget_lightsaber.form.length.label', + 'label' => 'widget_lightsaber.form.length.label', ])->add('crystal', null, [ - 'label' => 'widget_lightsaber.form.crystal.label', + 'label' => 'widget_lightsaber.form.crystal.label', ])->add('color', null, [ - 'label' => 'widget_lightsaber.form.color.label', + 'label' => 'widget_lightsaber.form.color.label', ]); parent::buildForm($builder, $options); } diff --git a/Tests/App/src/Victoire/Widget/TextBundle/Form/WidgetTextType.php b/Tests/App/src/Victoire/Widget/TextBundle/Form/WidgetTextType.php index 24fd2340b..57bdaa6e8 100644 --- a/Tests/App/src/Victoire/Widget/TextBundle/Form/WidgetTextType.php +++ b/Tests/App/src/Victoire/Widget/TextBundle/Form/WidgetTextType.php @@ -23,13 +23,19 @@ public function buildForm(FormBuilderInterface $builder, array $options) parent::buildForm($builder, $options); if ($options['mode'] == Widget::MODE_STATIC || $options['mode'] === null) { - $builder->add('content', null, [ + $builder->add( + 'content', + null, + [ 'label' => 'widget_text.form.content.label', 'required' => true, ] ); } else { - $builder->add('excerpt', null, [ + $builder->add( + 'excerpt', + null, + [ 'label' => 'widget_text.form.excerpt.label', 'attr' => [ 'placeholder' => 'widget_text.form.excerpt.placeholder', diff --git a/Tests/Features/Context/FeatureContext.php b/Tests/Features/Context/FeatureContext.php index 4b5da69d9..c429deb57 100644 --- a/Tests/Features/Context/FeatureContext.php +++ b/Tests/Features/Context/FeatureContext.php @@ -35,7 +35,8 @@ public function getSymfonyProfile() throw new UnsupportedDriverActionException( 'You need to tag the scenario with '. '"@mink:symfony2". Using the profiler is not '. - 'supported by %s', $driver + 'supported by %s', + $driver ); } @@ -111,7 +112,8 @@ public function theMetaShouldBeSet($name, $value) if (!preg_match($regex, $actual)) { $message = sprintf( 'The text "%s" was not found in the content attribute of the meta[name=%s]".', - $value, $name + $value, + $name ); throw new ExpectationException($message, $this->getSession()); diff --git a/Tests/Features/Context/VictoireContext.php b/Tests/Features/Context/VictoireContext.php index 5f25f81b9..faff35795 100644 --- a/Tests/Features/Context/VictoireContext.php +++ b/Tests/Features/Context/VictoireContext.php @@ -519,7 +519,8 @@ public function shouldPrecedeForTheQuery($textBefore, $textAfter) { $element = $this->getPage()->find( 'xpath', - sprintf('//*[normalize-space(text()) = "%s"][preceding::*[normalize-space(text()) = "%s"]]', + sprintf( + '//*[normalize-space(text()) = "%s"][preceding::*[normalize-space(text()) = "%s"]]', $textAfter, $textBefore ) @@ -783,14 +784,17 @@ public function iShouldSeeListWithElements($listId, $number) { $page = $this->getPage(); - $nodes = $page->findAll('xpath', - sprintf('descendant-or-self::ul[contains(@id, "%s")]//li', + $nodes = $page->findAll( + 'xpath', + sprintf( + 'descendant-or-self::ul[contains(@id, "%s")]//li', $listId ) ); if (count($nodes) != $number) { - $message = sprintf('There is %d element(s) corresponding to "%s", %d expected.', + $message = sprintf( + 'There is %d element(s) corresponding to "%s", %d expected.', count($nodes), $listId, $number