Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Bump elliptic from 6.4.0 to 6.5.3 in /Bundle/UIBundle/Resources/config #1133

Open
wants to merge 2 commits into
base: 2.3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Bundle/BlogBundle/Controller/ArticleController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
]
),
Expand Down
14 changes: 7 additions & 7 deletions Bundle/BlogBundle/Controller/BlogController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]
)
);
}

Expand Down
4 changes: 3 additions & 1 deletion Bundle/BlogBundle/Filter/DateFilter.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions Bundle/BlogBundle/Form/ArticleType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]);
}
}
21 changes: 12 additions & 9 deletions Bundle/BlogBundle/Form/CategoryType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
12 changes: 8 additions & 4 deletions Bundle/BlogBundle/Form/ChooseBlogType.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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();
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
3 changes: 2 additions & 1 deletion Bundle/BlogBundle/Listener/ArticleMenuListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' => [
Expand Down
2 changes: 1 addition & 1 deletion Bundle/BlogBundle/Listener/BlogMenuListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public function addBlogContextual($event)
[
'route' => 'victoire_blog_article_new',
'routeParameters' => ['id' => $event->getPage()->getId()],
]
]
)->setLinkAttribute('data-toggle', 'vic-modal');
}

Expand Down
24 changes: 12 additions & 12 deletions Bundle/BusinessEntityBundle/Annotation/AnnotationDriver.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
);
Expand Down
6 changes: 4 additions & 2 deletions Bundle/BusinessPageBundle/Builder/BusinessPageBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()],
Expand All @@ -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()],
Expand Down
9 changes: 5 additions & 4 deletions Bundle/ConfigBundle/Favicon/FaviconConfigDumper.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions Bundle/ConfigBundle/Favicon/FaviconGenerator.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
12 changes: 6 additions & 6 deletions Bundle/CoreBundle/Builder/ViewCssBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion Bundle/CoreBundle/Command/WidgetCssGenerateCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class WidgetCssGenerateCommand extends ContainerAwareCommand
{
/** @var EntityManager $entityManager */
/** @var EntityManager */
private $entityManager;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Loading