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

Changes from Automatic Review #7

Open
wants to merge 1 commit into
base: master
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
80 changes: 39 additions & 41 deletions Admin/TemplateAdmin.php
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
<?php

namespace Difane\Bundle\TwigDatabaseBundle\Admin;

use Sonata\AdminBundle\Admin\Admin;
use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ListMapper;
use Sonata\AdminBundle\Route\RouteCollection;


class TemplateAdmin extends Admin
{
protected function configureListFields(ListMapper $listMapper)
{
$listMapper
->addIdentifier('name')
->add('created_at')
->add('updated_at')
;
}

protected function configureDatagridFilters(DatagridMapper $filterMapper)
{
$filterMapper
->add('name')
->add('created_at')
->add('updated_at')
;
}

protected function configureFormFields(FormMapper $formMapper)
{
$formMapper
->with('General')
->add('name')
->add('content')
->end()
;
}
}
<?php

namespace Difane\Bundle\TwigDatabaseBundle\Admin;

use Sonata\AdminBundle\Admin\Admin;
use Sonata\AdminBundle\Form\FormMapper;
use Sonata\AdminBundle\Datagrid\DatagridMapper;
use Sonata\AdminBundle\Datagrid\ListMapper;

class TemplateAdmin extends Admin
{
protected function configureListFields(ListMapper $listMapper)
{
$listMapper
->addIdentifier('name')
->add('created_at')
->add('updated_at')
;
}

protected function configureDatagridFilters(DatagridMapper $filterMapper)
{
$filterMapper
->add('name')
->add('created_at')
->add('updated_at')
;
}

protected function configureFormFields(FormMapper $formMapper)
{
$formMapper
->with('General')
->add('name')
->add('content')
->end()
;
}
}
1 change: 0 additions & 1 deletion DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ public function getConfigTreeBuilder()
// Here you should define the parameters that are allowed to
// configure your bundle. See the documentation linked above for
// more information on that topic.

return $treeBuilder;
}
}
3 changes: 1 addition & 2 deletions DependencyInjection/DifaneTwigDatabaseExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ public function load(array $configs, ContainerBuilder $container)
$container->setParameter('difane.bundle.twigdatabase.twig.loader.database.autocreatetemplates', $config['auto_create_templates']);
$container->setParameter('difane.bundle.twigdatabase.database.tablename', $config['table_name']);

if(true == $config['sonata_admin']['enabled'])
{
if (true == $config['sonata_admin']['enabled']) {
$loader->load('sonata-admin.xml');
$container->setParameter('difane.bundle.twigdatabase.admin.template.group', $config['sonata_admin']['group']);
$container->setParameter('difane.bundle.twigdatabase.admin.template.label', $config['sonata_admin']['label']);
Expand Down
32 changes: 16 additions & 16 deletions Entity/Template.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* @UniqueEntity("name")
*/
class Template
{
{
/**
* @ORM\Id
* @ORM\Column(type="integer")
Expand Down Expand Up @@ -44,7 +44,7 @@ class Template
* @ORM\PrePersist
*/
public function handlePrePersist()
{
{
$this->created_at = new \DateTime;
$this->updated_at = new \DateTime;
}
Expand All @@ -60,7 +60,7 @@ public function handlePreUpdate()
/**
* Get id
*
* @return string
* @return string
*/
public function getId()
{
Expand All @@ -70,20 +70,20 @@ public function getId()
/**
* Set name
*
* @param string $name
* @param string $name
* @return Template
*/
public function setName($name)
{
$this->name = $name;

return $this;
}

/**
* Get name
*
* @return string
* @return string
*/
public function getName()
{
Expand All @@ -93,20 +93,20 @@ public function getName()
/**
* Set content
*
* @param string $content
* @param string $content
* @return Template
*/
public function setContent($content)
{
$this->content = $content;

return $this;
}

/**
* Get content
*
* @return string
* @return string
*/
public function getContent()
{
Expand All @@ -116,20 +116,20 @@ public function getContent()
/**
* Set created_at
*
* @param \DateTime $createdAt
* @param \DateTime $createdAt
* @return Template
*/
public function setCreatedAt($createdAt)
{
$this->created_at = $createdAt;

return $this;
}

/**
* Get created_at
*
* @return \DateTime
* @return \DateTime
*/
public function getCreatedAt()
{
Expand All @@ -139,20 +139,20 @@ public function getCreatedAt()
/**
* Set updated_at
*
* @param \DateTime $updatedAt
* @param \DateTime $updatedAt
* @return Template
*/
public function setUpdatedAt($updatedAt)
{
$this->updated_at = $updatedAt;

return $this;
}

/**
* Get updated_at
*
* @return \DateTime
* @return \DateTime
*/
public function getUpdatedAt()
{
Expand All @@ -167,4 +167,4 @@ public function __toString()
return $this->getName();
}

}
}
93 changes: 42 additions & 51 deletions Repository/TemplateRepository.php
Original file line number Diff line number Diff line change
@@ -1,51 +1,42 @@
<?php

namespace Difane\Bundle\TwigDatabaseBundle\Repository;

use Doctrine\ORM\EntityRepository;

class TemplateRepository extends EntityRepository
{
public function getTemplate($name)
{
try
{
return $this->getEntityManager()->createQuery('
SELECT t FROM DifaneTwigDatabaseBundle:Template t
WHERE t.name = :name
')
->setParameter('name', $name)
->getSingleResult();
}
catch (\Doctrine\ORM\NoResultException $e)
{
return null;
}
}

public function getTemplateTimestamp($name)
{
try
{
$result = $this->getEntityManager()->createQuery('
SELECT t.updated_at FROM DifaneTwigDatabaseBundle:Template t
WHERE t.name = :name
')
->setParameter('name', $name)
->getSingleResult();

if(false == is_null($result) && is_array($result) && array_key_exists("updated_at", $result))
{
return $result["updated_at"]->getTimestamp();
}
else
{
return null;
}
}
catch (\Doctrine\ORM\NoResultException $e)
{
return null;
}
}
}
<?php

namespace Difane\Bundle\TwigDatabaseBundle\Repository;

use Doctrine\ORM\EntityRepository;

class TemplateRepository extends EntityRepository
{
public function getTemplate($name)
{
try {
return $this->getEntityManager()->createQuery('
SELECT t FROM DifaneTwigDatabaseBundle:Template t
WHERE t.name = :name
')
->setParameter('name', $name)
->getSingleResult();
} catch (\Doctrine\ORM\NoResultException $e) {
return null;
}
}

public function getTemplateTimestamp($name)
{
try {
$result = $this->getEntityManager()->createQuery('
SELECT t.updated_at FROM DifaneTwigDatabaseBundle:Template t
WHERE t.name = :name
')
->setParameter('name', $name)
->getSingleResult();

if (false == is_null($result) && is_array($result) && array_key_exists("updated_at", $result)) {
return $result["updated_at"]->getTimestamp();
} else {
return null;
}
} catch (\Doctrine\ORM\NoResultException $e) {
return null;
}
}
}
70 changes: 35 additions & 35 deletions Subscriber/TableNameSubscriber.php
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<?php
namespace Difane\Bundle\TwigDatabaseBundle\Subscriber;
use Doctrine\ORM\Event\LoadClassMetadataEventArgs;
class TableNameSubscriber implements \Doctrine\Common\EventSubscriber
{
protected $name = '';
public function __construct($name)
{
$this->name = (string) $name;
}
public function getSubscribedEvents()
{
return array('loadClassMetadata');
}
public function loadClassMetadata(LoadClassMetadataEventArgs $args)
{
$classMetadata = $args->getClassMetadata();
if('Difane\Bundle\TwigDatabaseBundle\Entity\Template' != $classMetadata->getName()) return;
$classMetadata->setTableName($this->name);
foreach ($classMetadata->getAssociationMappings() as $fieldName => $mapping) {
if ($mapping['type'] == \Doctrine\ORM\Mapping\ClassMetadataInfo::MANY_TO_MANY) {
//$mappedTableName = $classMetadata->associationMappings[$fieldName]['joinTable']['name'];
$classMetadata->associationMappings[$fieldName]['joinTable']['name'] = $this->name;
}
}
}
}
<?php
namespace Difane\Bundle\TwigDatabaseBundle\Subscriber;

use Doctrine\ORM\Event\LoadClassMetadataEventArgs;

class TableNameSubscriber implements \Doctrine\Common\EventSubscriber
{
protected $name = '';

public function __construct($name)
{
$this->name = (string) $name;
}

public function getSubscribedEvents()
{
return array('loadClassMetadata');
}

public function loadClassMetadata(LoadClassMetadataEventArgs $args)
{
$classMetadata = $args->getClassMetadata();

if('Difane\Bundle\TwigDatabaseBundle\Entity\Template' != $classMetadata->getName()) return;

$classMetadata->setTableName($this->name);
foreach ($classMetadata->getAssociationMappings() as $fieldName => $mapping) {
if ($mapping['type'] == \Doctrine\ORM\Mapping\ClassMetadataInfo::MANY_TO_MANY) {
//$mappedTableName = $classMetadata->associationMappings[$fieldName]['joinTable']['name'];
$classMetadata->associationMappings[$fieldName]['joinTable']['name'] = $this->name;
}
}
}

}