Skip to content

Commit

Permalink
Prepare the Sylius v1.0.0-beta.2 release
Browse files Browse the repository at this point in the history
  • Loading branch information
pjedrzejewski committed Apr 11, 2017
1 parent 138a980 commit 932044d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Controller/FlashHelper.php
Expand Up @@ -162,6 +162,6 @@ private function isTranslationDefined($message, $locale, array $parameters)
return $defaultCatalogue->has($message, 'flashes');
}

return $message !== $this->translator->trans($message, $parameters,'flashes');
return $message !== $this->translator->trans($message, $parameters, 'flashes');
}
}
8 changes: 6 additions & 2 deletions Form/Type/FixedCollectionType.php
Expand Up @@ -53,7 +53,9 @@ public function configureOptions(OptionsResolver $resolver)
$resolver->setRequired('entry_name');
$resolver->setAllowedTypes('entry_name', ['callable']);

$resolver->setDefault('entry_options', function () { return []; });
$resolver->setDefault('entry_options', function () {
return [];
});
$resolver->setAllowedTypes('entry_options', ['array', 'callable']);
$resolver->setNormalizer('entry_options', $this->optionalCallableNormalizer());
}
Expand All @@ -76,7 +78,9 @@ private function optionalCallableNormalizer()
return $value;
}

return function () use ($value) { return $value; };
return function () use ($value) {
return $value;
};
};
}
}
6 changes: 3 additions & 3 deletions Form/Type/ResourceTranslationsType.php
Expand Up @@ -60,9 +60,9 @@ public function buildForm(FormBuilderInterface $builder, array $options)
continue;
}

$translation->setLocale($localeCode);
$translation->setTranslatable($translatable);
}
$translation->setLocale($localeCode);
$translation->setTranslatable($translatable);
}

$event->setData($translations);
});
Expand Down
1 change: 0 additions & 1 deletion Validator/UniqueWithinCollectionConstraintValidator.php
Expand Up @@ -47,7 +47,6 @@ public function validate($collectionOfEntities, Constraint $constraint)
->addViolation();

if (false !== $collectionOfEntitiesCodes[$checkingAttribute]) {

$this->context
->buildViolation($constraint->message)
->atPath(sprintf('[%d].%s', $collectionOfEntitiesCodes[$checkingAttribute], $constraint->attributePath))
Expand Down

0 comments on commit 932044d

Please sign in to comment.