| @@ -10,7 +10,6 @@ | ||
| 10 | 10 | use Synapse\Cmf\Framework\Theme\Content\Entity\Content; | 
| 11 | 11 | use Synapse\Cmf\Framework\Theme\TemplateType\Model\TemplateTypeInterface; | 
| 12 | 12 | use Synapse\Cmf\Framework\Theme\Template\Entity\Template as SynapseTemplate; | 
| 13 | -use Synapse\Cmf\Framework\Theme\Zone\Entity\ZoneCollection as SynapseZoneCollection; | |
| 14 | 13 | use Synapse\Cmf\Framework\Theme\Zone\Entity\ZoneCollection; | 
| 15 | 14 | |
| 16 | 15 | /** | 
| @@ -6,7 +6,6 @@ | ||
| 6 | 6 | use Majora\Framework\Model\LazyPropertiesInterface; | 
| 7 | 7 | use Majora\Framework\Model\LazyPropertiesTrait; | 
| 8 | 8 | use Majora\Framework\Model\TimedTrait; | 
| 9 | -use Synapse\Cmf\Framework\Theme\Component\Entity\ComponentCollection as SynapseComponentCollection; | |
| 10 | 9 | use Synapse\Cmf\Framework\Theme\Component\Entity\ComponentCollection; | 
| 11 | 10 | use Synapse\Cmf\Framework\Theme\ZoneType\Model\ZoneTypeInterface; | 
| 12 | 11 | use Synapse\Cmf\Framework\Theme\Zone\Entity\Zone as SynapseZone; | 
| @@ -5,7 +5,6 @@ | ||
| 5 | 5 | use Synapse\Cmf\Framework\Engine\Context\RenderingContextStack; | 
| 6 | 6 | use Synapse\Cmf\Framework\Engine\Decorator\Component\FragmentDecorator; | 
| 7 | 7 | use Synapse\Cmf\Framework\Engine\Exception\InvalidZoneException; | 
| 8 | -use Synapse\Cmf\Framework\Theme\Component\Entity\Component; | |
| 9 | 8 | use Synapse\Cmf\Framework\Theme\Component\Model\ComponentInterface; | 
| 10 | 9 | use Synapse\Cmf\Framework\Theme\Template\Entity\TemplateCollection; | 
| 11 | 10 | use Synapse\Cmf\Framework\Theme\Template\Model\TemplateInterface; | 
| @@ -10,9 +10,7 @@ | ||
| 10 | 10 | use Symfony\Component\DependencyInjection\ContainerInterface; | 
| 11 | 11 | use Synapse\Cmf\Bundle\Entity\Orm\Template; | 
| 12 | 12 | use Synapse\Cmf\Framework\Theme\Component\Entity\ComponentCollection; | 
| 13 | -use Synapse\Cmf\Framework\Theme\Content\Entity\Content; | |
| 14 | 13 | use Synapse\Cmf\Framework\Theme\Zone\Entity\ZoneCollection; | 
| 15 | -use Synapse\Page\Bundle\Entity\Page; | |
| 16 | 14 | |
| 17 | 15 | /** | 
| 18 | 16 | * Demo site fixtures loader. | 
| @@ -87,8 +87,8 @@ | ||
| 87 | 87 |                  ->andWhere('template.templateTypeId = :templateTypeId') | 
| 88 | 88 |                  ->andWhere('template.contentTypeName = :contentTypeName') | 
| 89 | 89 | ->andWhere($queryBuilder->expr()->orX( | 
| 90 | -                   $queryBuilder->expr()->eq('template.contentId', ':contentId'), | |
| 91 | -                   $queryBuilder->expr()->isNull('template.contentId') | |
| 90 | +                    $queryBuilder->expr()->eq('template.contentId', ':contentId'), | |
| 91 | +                    $queryBuilder->expr()->isNull('template.contentId') | |
| 92 | 92 | )) | 
| 93 | 93 | ->setParameters(array( | 
| 94 | 94 | 'templateTypeId' => $templateType->getId(), | 
| @@ -8,7 +8,6 @@ | ||
| 8 | 8 | use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; | 
| 9 | 9 | use Synapse\Cmf\Bundle\Form\Type\Theme\TemplateType; | 
| 10 | 10 | use Synapse\Cmf\Framework\Theme\Template\Model\TemplateInterface; | 
| 11 | -use Synapse\Cmf\Framework\Theme\Theme\Model\ThemeInterface; | |
| 12 | 11 | |
| 13 | 12 | /** | 
| 14 | 13 | * Controller for template management use cases action. | 
| @@ -13,11 +13,9 @@ | ||
| 13 | 13 | use Symfony\Component\Form\FormView; | 
| 14 | 14 | use Symfony\Component\OptionsResolver\OptionsResolver; | 
| 15 | 15 | use Synapse\Cmf\Framework\Engine\Resolver\VariationResolver; | 
| 16 | -use Synapse\Cmf\Framework\Theme\ComponentType\Model\ComponentTypeInterface; | |
| 17 | 16 | use Synapse\Cmf\Framework\Theme\ContentType\Model\ContentTypeInterface; | 
| 18 | 17 | use Synapse\Cmf\Framework\Theme\TemplateType\Model\TemplateTypeInterface; | 
| 19 | 18 | use Synapse\Cmf\Framework\Theme\Theme\Model\ThemeInterface; | 
| 20 | -use Synapse\Cmf\Framework\Theme\Variation\Entity\Variation; | |
| 21 | 19 | use Synapse\Cmf\Framework\Theme\Variation\Entity\VariationContext; | 
| 22 | 20 | use Synapse\Cmf\Framework\Theme\Zone\Domain\Command\UpdateCommand; | 
| 23 | 21 | use Synapse\Cmf\Framework\Theme\Zone\Domain\ZoneDomain; | 
| @@ -4,7 +4,6 @@ | ||
| 4 | 4 | |
| 5 | 5 | use Synapse\Cmf\Framework\Engine\Exception\InvalidThemeException; | 
| 6 | 6 | use Synapse\Cmf\Framework\Theme\Theme\Loader\LoaderInterface as ThemeLoader; | 
| 7 | -use Synapse\Cmf\Framework\Theme\Theme\Model\ThemeInterface; | |
| 8 | 7 | |
| 9 | 8 | class ThemeResolver | 
| 10 | 9 |  { |