Skip to content

Commit

Permalink
Fixed typos
Browse files Browse the repository at this point in the history
  • Loading branch information
pborreli committed Oct 13, 2013
1 parent e5d1fad commit ac2a6a5
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 17 deletions.
4 changes: 2 additions & 2 deletions Admin/Admin.php
Expand Up @@ -896,7 +896,7 @@ public function getBaseRoutePattern()
public function getBaseRouteName()
{
if (!$this->baseRouteName) {
preg_match(self::CLASS_REGEX, $this->class , $matches);
preg_match(self::CLASS_REGEX, $this->class, $matches);

if (!$matches) {
throw new \RuntimeException(sprintf('Cannot automatically determine base route name, please define a default `baseRouteName` value for the admin class `%s`', get_class($this)));
Expand Down Expand Up @@ -1219,7 +1219,7 @@ public function getTemplate($name)
public function getNewInstance()
{
$object = $this->getModelManager()->getModelInstance($this->getClass());
foreach($this->getExtensions() as $extension) {
foreach ($this->getExtensions() as $extension) {
$extension->alterNewInstance($this, $object);
}

Expand Down
1 change: 0 additions & 1 deletion Admin/AdminExtension.php
Expand Up @@ -113,4 +113,3 @@ public function preRemove(AdminInterface $admin, $object)
public function postRemove(AdminInterface $admin, $object)
{}
}

2 changes: 1 addition & 1 deletion Admin/AdminInterface.php
Expand Up @@ -286,7 +286,7 @@ public function trans($id, array $parameters = array(), $domain = null, $locale
public function getRoutes();

/**
* Return the parameter name used to represente the id in the url
* Return the parameter name used to represent the id in the url
*
* @return string
*/
Expand Down
1 change: 1 addition & 0 deletions Admin/Pool.php
Expand Up @@ -35,6 +35,7 @@ class Pool
* @param \Symfony\Component\DependencyInjection\ContainerInterface $container
* @param string $title
* @param string $logoTitle
* @param array $options
*/
public function __construct(ContainerInterface $container, $title, $logoTitle, $options = array())
{
Expand Down
2 changes: 1 addition & 1 deletion Filter/Filter.php
Expand Up @@ -213,7 +213,7 @@ public function setCondition($condition)
}

/**
* @return
* @return string
*/
public function getCondition()
{
Expand Down
2 changes: 1 addition & 1 deletion Form/ChoiceList/ModelChoiceList.php
Expand Up @@ -182,7 +182,7 @@ public function getEntities()
* Returns the entity for the given key
*
* If the underlying entities have composite identifiers, the choices
* are intialized. The key is expected to be the index in the choices
* are initialized. The key is expected to be the index in the choices
* array in this case.
*
* If they have single identifiers, they are either fetched from the
Expand Down
4 changes: 2 additions & 2 deletions Form/FormMapper.php
Expand Up @@ -177,15 +177,15 @@ public function setHelps(array $helps = array())
/**
* {@inheritdoc}
*/
protected function getGroups()
protected function getGroups()
{
return $this->admin->getFormGroups();
}

/**
* {@inheritdoc}
*/
protected function setGroups(array $groups)
protected function setGroups(array $groups)
{
$this->admin->setFormGroups($groups);
}
Expand Down
2 changes: 1 addition & 1 deletion Form/Type/AdminType.php
Expand Up @@ -30,7 +30,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
{
$admin = $this->getAdmin($options);

if ($options['delete'] && $admin->isGranted('DELETE') ) {
if ($options['delete'] && $admin->isGranted('DELETE')) {
$builder->add('_delete', 'checkbox', array('required' => false, 'mapped' => false));
}

Expand Down
2 changes: 1 addition & 1 deletion Generator/ControllerGenerator.php
Expand Up @@ -29,7 +29,7 @@ class ControllerGenerator extends AbstractBcGenerator
private $file;

/**
* @param array|string $skeletonDirectories
* @param array|string $skeletonDirectory
*/
public function __construct($skeletonDirectory)
{
Expand Down
2 changes: 1 addition & 1 deletion Mapper/BaseMapper.php
Expand Up @@ -43,7 +43,7 @@ public function getAdmin()
}

/**
* @param string $name
* @param string $key
*
* @return mixed
*/
Expand Down
2 changes: 1 addition & 1 deletion Resources/doc/reference/preview_mode.rst
Expand Up @@ -23,7 +23,7 @@ This will show a new button during create/edit mode named preview.
:align: center
:alt: Preview Button

While in preview mode two buttons will be shown to approve or decline persistance of the
While in preview mode two buttons will be shown to approve or decline persistence of the
entity. Decline will send you back to the edit mode with all your changes unpersisted but
still in the form so no data is lost and the entity can be further adjusted.
Accepting the preview will store the entity as if the preview step was never there.
Expand Down
2 changes: 1 addition & 1 deletion Search/SearchHandler.php
Expand Up @@ -44,7 +44,7 @@ public function search(AdminInterface $admin, $term, $page = 0, $offset = 20)
$datagrid = $admin->getDatagrid();

$found = false;
foreach($datagrid->getFilters() as $name => $filter) {
foreach ($datagrid->getFilters() as $name => $filter) {
/** @var $filter FilterInterface */
if ($filter->getOption('global_search', false)) {
$filter->setCondition(FilterInterface::CONDITION_OR);
Expand Down
3 changes: 1 addition & 2 deletions Show/ShowMapper.php
Expand Up @@ -123,7 +123,7 @@ public function reorder(array $keys)
/**
* {@inheritdoc}
*/
protected function getGroups()
protected function getGroups()
{
return $this->admin->getShowGroups();
}
Expand All @@ -135,5 +135,4 @@ protected function setGroups(array $groups)
{
$this->admin->setShowGroups($groups);
}

}
2 changes: 1 addition & 1 deletion Tests/Command/GenerateAdminCommandTest.php
Expand Up @@ -222,7 +222,7 @@ public function testExecuteInteractive($modelEntity)

switch ($questionClean) {
case 'The fully qualified model class':
return $modelEntity;;
return $modelEntity;
break;

case 'The bundle name':
Expand Down
2 changes: 1 addition & 1 deletion Util/AdminAclManipulator.php
Expand Up @@ -67,7 +67,7 @@ public function configureAcls(OutputInterface $output, AdminInterface $admin)
*/
public function addAdminClassAces(OutputInterface $output, AclInterface $acl, AclSecurityHandlerInterface $securityHandler, array $roleInformation = array())
{
if (count($securityHandler->getAdminPermissions()) > 0 ) {
if (count($securityHandler->getAdminPermissions()) > 0) {
$builder = new $this->maskBuilderClass();

foreach ($roleInformation as $role => $permissions) {
Expand Down

0 comments on commit ac2a6a5

Please sign in to comment.