From e7db693c79ac7e2d073b60655633ae2ef7931967 Mon Sep 17 00:00:00 2001 From: Roderik van der Veer Date: Sat, 20 Sep 2014 11:45:32 +0200 Subject: [PATCH 1/2] Usage of a function in loops should be avoided --- .../Command/Helper/Analytics/GoalCommandHelper.php | 7 ++++--- .../PagePartBundle/PagePartAdmin/PagePartAdmin.php | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Kunstmaan/DashboardBundle/Command/Helper/Analytics/GoalCommandHelper.php b/src/Kunstmaan/DashboardBundle/Command/Helper/Analytics/GoalCommandHelper.php index 3f9c17e599..5256d1b9f8 100644 --- a/src/Kunstmaan/DashboardBundle/Command/Helper/Analytics/GoalCommandHelper.php +++ b/src/Kunstmaan/DashboardBundle/Command/Helper/Analytics/GoalCommandHelper.php @@ -121,8 +121,8 @@ public function getData(&$overview) // Execute an extra query if there are more than 10 goals to query if (sizeof($metrics) > 1) { $rows2 = $this->requestGoalResults($overview, $metrics[1], $extra); - - for ($i = 0; $i < sizeof($rows2); $i++) { + $rows2size = sizeof($rows2); + for ($i = 0; $i < $rows2size; $i++) { // Merge the results of the extra query data with the previous query data. $rows[$i] = array_merge($rows[$i], array_slice($rows2[$i], $start, sizeof($rows2) - $start)); } @@ -130,7 +130,8 @@ public function getData(&$overview) // Create a result array to be parsed and create Goal objects from $goalCollection = array(); - for ($i = 0; $i < sizeof($goaldata); $i++) { + $goaldatasize = sizeof($goaldata); + for ($i = 0; $i < $goaldatasize; $i++) { $goalEntry = array(); foreach ($rows as $row) { // Create a timestamp for each goal visit (this depends on the timespan of the overview: split per hour, day, week, month) diff --git a/src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php b/src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php index 1d0bc8749c..86882acd12 100644 --- a/src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php +++ b/src/Kunstmaan/PagePartBundle/PagePartAdmin/PagePartAdmin.php @@ -260,7 +260,8 @@ public function persist(Request $request) // Add new pageparts on the correct position + Re-order and save pageparts if needed $sequences = $request->get($this->context . '_sequence'); - for ($i = 0; $i < count($sequences); $i++) { + $sequencescount = count($sequences); + for ($i = 0; $i < $sequencescount; $i++) { $pagePartRefId = $sequences[$i]; if (array_key_exists($pagePartRefId, $this->newPageParts)) { From b146f3617ccdf2158bde96e17d04e4eed53ff3ad Mon Sep 17 00:00:00 2001 From: Roderik van der Veer Date: Sat, 20 Sep 2014 11:48:41 +0200 Subject: [PATCH 2/2] Optimise imports --- .../AdminBundle/Command/ApplyAclCommand.php | 10 ++-- .../Command/CreateGroupCommand.php | 8 ++- .../AdminBundle/Command/CreateRoleCommand.php | 6 +-- .../AdminBundle/Command/CreateUserCommand.php | 2 +- .../Command/FixAdminLocaleCommand.php | 3 +- .../AdminBundle/Command/FixGuestCommand.php | 3 +- .../Controller/DefaultController.php | 6 +-- .../Controller/ModulesController.php | 3 -- .../Controller/SettingsController.php | 2 - .../DataFixtures/ORM/GroupFixtures.php | 4 +- .../DataFixtures/ORM/RoleFixtures.php | 3 +- .../DataFixtures/ORM/UserFixtures.php | 2 +- .../Compiler/AddLogProcessorsCompilerPass.php | 4 +- .../Compiler/MenuCompilerPass.php | 2 +- .../KunstmaanAdminExtension.php | 7 ++- src/Kunstmaan/AdminBundle/Entity/Group.php | 12 ++--- src/Kunstmaan/AdminBundle/Entity/Role.php | 3 +- .../EventListener/AdminLocaleListener.php | 4 +- .../EventListener/CloneListener.php | 2 +- src/Kunstmaan/AdminBundle/Form/GroupType.php | 1 - src/Kunstmaan/AdminBundle/Form/UserType.php | 2 +- .../AdminBundle/Helper/CloneHelper.php | 6 +-- .../Helper/Creators/ACLPermissionCreator.php | 4 +- .../AdminBundle/Helper/FormHelper.php | 2 +- .../Helper/FormWidgets/FormWidget.php | 3 +- .../FormWidgets/FormWidgetInterface.php | 2 +- .../Helper/FormWidgets/ListWidget.php | 2 +- .../Helper/FormWidgets/Tabs/Tab.php | 6 +-- .../Helper/FormWidgets/Tabs/TabPane.php | 6 +-- .../Helper/Menu/MenuAdaptorInterface.php | 3 -- .../AdminBundle/Helper/Menu/MenuBuilder.php | 2 +- .../Helper/Menu/ModulesMenuAdaptor.php | 4 -- .../Helper/Menu/SettingsMenuAdaptor.php | 4 -- .../Helper/Security/Acl/AclHelper.php | 17 +++---- .../Helper/Security/Acl/AclNativeHelper.php | 10 ++-- .../Acl/Permission/PermissionAdmin.php | 10 ++-- .../Security/Acl/Permission/PermissionMap.php | 2 - .../AdminBundle/Helper/UserProcessor.php | 2 +- .../AdminBundle/KunstmaanAdminBundle.php | 7 ++- .../Repository/AclChangesetRepository.php | 1 - .../AdminBundle/Tests/Entity/GroupTest.php | 1 - .../AdminBundle/Tests/Entity/UserTest.php | 4 +- .../Tests/Helper/Menu/MenuItemTest.php | 2 +- .../Helper/Security/Acl/AclHelperTest.php | 11 ++--- .../Security/Acl/AclNativeHelperTest.php | 10 ++-- .../Acl/Permission/PermissionAdminTest.php | 12 ++--- .../Acl/Permission/PermissionMapTest.php | 2 +- .../Twig/AdminPermissionsTwigExtension.php | 4 +- .../AdminBundle/Twig/FormToolsExtension.php | 1 - .../AdminBundle/Twig/TabsTwigExtension.php | 3 +- .../AdminListBundle/AdminList/AdminList.php | 4 +- .../AbstractAdminListConfigurator.php | 12 ++--- ...tractDoctrineDBALAdminListConfigurator.php | 8 +-- ...stractDoctrineORMAdminListConfigurator.php | 12 ++--- .../AdminListConfiguratorInterface.php | 11 ++--- .../AdminListBundle/AdminList/Filter.php | 3 +- .../AdminList/FilterBuilder.php | 3 +- .../FilterType/AbstractFilterType.php | 4 -- .../DBAL/AbstractDBALFilterType.php | 3 +- .../FilterType/DBAL/DateFilterType.php | 1 - .../FilterType/DBAL/DateTimeFilterType.php | 1 - .../FilterType/ORM/AbstractORMFilterType.php | 3 +- .../FilterType/ORM/DateFilterType.php | 1 - .../FilterType/ORM/DateTimeFilterType.php | 1 - .../Controller/AdminListController.php | 10 +--- .../KunstmaanAdminListExtension.php | 6 +-- .../Tests/AdminList/AdminListFactoryTest.php | 1 - .../Tests/AdminList/FilterTest.php | 2 +- .../DBAL/AbstractDBALFilterTypeTest.php | 3 +- .../DBAL/DBALFilterTypeTestCase.php | 4 +- .../FilterType/DBAL/DateFilterTypeTest.php | 2 +- .../ORM/AbstractORMFilterTypeTest.php | 3 +- .../FilterType/ORM/DateFilterTypeTest.php | 2 +- .../FilterType/ORM/ORMFilterTypeTestCase.php | 2 +- .../ItemAction/SimpleItemActionTest.php | 3 +- .../Twig/AdminListTwigExtension.php | 7 +-- ...stractArticleAuthorAdminListController.php | 6 --- .../KunstmaanArticleExtension.php | 4 +- .../AbstractArticleOverviewPageRepository.php | 1 + .../Features/Context/FeatureContext.php | 4 +- .../Command/DashboardCommand.php | 1 - .../GoogleAnalyticsConfigFlushCommand.php | 2 +- .../GoogleAnalyticsConfigsListCommand.php | 1 - .../GoogleAnalyticsDataCollectCommand.php | 5 +- .../GoogleAnalyticsDataFlushCommand.php | 2 +- ...oogleAnalyticsOverviewsGenerateCommand.php | 2 +- .../GoogleAnalyticsOverviewsListCommand.php | 2 +- .../GoogleAnalyticsSegmentsListCommand.php | 2 +- .../AbstractAnalyticsCommandHelper.php | 1 - .../Helper/Analytics/GoalCommandHelper.php | 3 -- .../Controller/DashboardController.php | 2 - .../GoogleAnalyticsAJAXController.php | 4 -- .../Controller/GoogleAnalyticsController.php | 7 --- .../Helper/Google/Analytics/ConfigHelper.php | 1 - .../Helper/Google/Analytics/QueryHelper.php | 1 - .../Repository/AnalyticsConfigRepository.php | 1 - .../FormPageAdminListConfigurator.php | 10 ++-- .../FormSubmissionAdminListConfigurator.php | 10 ++-- .../Controller/FormSubmissionsController.php | 16 ++---- .../KunstmaanFormExtension.php | 6 +-- .../FormBundle/Entity/AbstractFormPage.php | 13 ++--- .../Entity/FormAdaptorInterface.php | 1 - .../FormBundle/Entity/FormSubmission.php | 4 +- .../FormBundle/Entity/FormSubmissionField.php | 3 +- .../BooleanFormSubmissionField.php | 3 +- .../ChoiceFormSubmissionField.php | 1 - .../EmailFormSubmissionField.php | 4 +- .../FileFormSubmissionField.php | 9 ++-- .../StringFormSubmissionField.php | 5 +- .../TextFormSubmissionField.php | 3 +- .../Entity/PageParts/AbstractFormPagePart.php | 5 +- .../Entity/PageParts/CheckboxPagePart.php | 17 ++----- .../Entity/PageParts/ChoicePagePart.php | 11 ++--- .../Entity/PageParts/EmailPagePart.php | 11 ++--- .../Entity/PageParts/FileUploadPagePart.php | 9 +--- .../PageParts/MultiLineTextPagePart.php | 5 +- .../PageParts/SingleLineTextPagePart.php | 11 ++--- .../Entity/PageParts/SubmitButtonPagePart.php | 7 +-- .../ConfigureActionsMenuListener.php | 4 +- .../Form/BooleanFormSubmissionType.php | 5 +- .../Form/CheckboxPagePartAdminType.php | 2 +- .../Form/ChoicePagePartAdminType.php | 2 +- .../Form/EmailFormSubmissionType.php | 5 +- .../Form/EmailPagePartAdminType.php | 2 +- .../Form/FileUploadPagePartAdminType.php | 2 +- .../Form/MultiLineTextPagePartAdminType.php | 2 +- .../Form/SingleLineTextPagePartAdminType.php | 2 +- .../Form/SubmitButtonPagePartAdminType.php | 2 +- .../FormBundle/Helper/FormHandler.php | 10 ++-- .../Helper/FormHandlerInterface.php | 3 +- .../FormBundle/Helper/FormMailer.php | 4 +- .../FormBundle/Helper/FormPageInterface.php | 3 +- .../Menu/FormSubmissionsMenuAdaptor.php | 5 +- .../FormPageAdminListConfiguratorTest.php | 5 +- .../Tests/Entity/FormSubmissionFieldTest.php | 2 +- .../Tests/Entity/FormSubmissionTest.php | 2 +- .../Entity/PageParts/ChoicePagePartTest.php | 2 - .../Entity/PageParts/EmailPagePartTest.php | 2 - .../PageParts/FileUploadPagePartTest.php | 3 -- .../PageParts/MultiLineTextPagePartTest.php | 2 - .../PageParts/SingleLineTextPagePartTest.php | 4 +- .../PageParts/SubmitButtonPagePartTest.php | 2 +- .../Command/GenerateAdminListCommand.php | 17 +++---- .../Command/GenerateAdminTestsCommand.php | 6 +-- .../Command/GenerateArticleCommand.php | 8 ++- .../Command/GenerateBundleCommand.php | 16 +++--- .../Command/GenerateEntityCommand.php | 10 ++-- .../Command/GenerateSearchPageCommand.php | 8 ++- .../Command/KunstmaanGenerateCommand.php | 1 - .../Generator/AdminListGenerator.php | 4 +- .../Generator/AdminTestsGenerator.php | 3 +- .../Generator/ArticleGenerator.php | 2 +- .../Generator/BundleGenerator.php | 5 +- .../Generator/DoctrineEntityGenerator.php | 8 +-- .../Generator/PagePartGenerator.php | 4 +- .../Generator/SearchPageGenerator.php | 3 +- .../AdminList/AdminListConfigurator.php | 7 ++- .../Controller/EntityAdminListController.php | 6 +-- .../adminlist/Form/EntityAdminType.php | 1 - .../Features/Context/FeatureContext.php | 4 +- .../AdminList/AuthorAdminListConfigurator.php | 3 -- .../AdminList/PageAdminListConfigurator.php | 3 +- .../Controller/AuthorAdminListController.php | 8 +-- .../Controller/PageAdminListController.php | 8 +-- .../ORM/ArticleGenerator/ArticleFixtures.php | 14 ++---- .../skeleton/article/Entity/Author.php | 8 ++- .../skeleton/article/Entity/OverviewPage.php | 11 ++--- .../skeleton/article/Entity/Page.php | 10 ++-- .../skeleton/article/Form/AuthorAdminType.php | 3 +- .../article/Form/OverviewPageAdminType.php | 1 - .../skeleton/article/Form/PageAdminType.php | 4 +- .../article/Helper/Menu/MenuAdaptor.php | 1 - .../OverviewPagePagePartAdminConfigurator.php | 2 - .../PagePagePartAdminConfigurator.php | 2 - .../article/Repository/AuthorRepository.php | 2 - .../Repository/OverviewPageRepository.php | 2 - .../article/Repository/PageRepository.php | 1 - .../skeleton/bundle/Bundle.php | 2 - .../skeleton/bundle/DefaultController.php | 3 -- .../skeleton/bundle/Extension.php | 3 +- .../skeleton/common/Form/EntityAdminType.php | 3 +- .../SatelliteAdminListConfigurator.php | 8 +-- .../Controller/DefaultController.php | 2 - .../SatelliteAdminListController.php | 7 +-- .../DefaultSiteFixtures.php | 19 +++---- .../DefaultSiteGenerator/SitemapFixtures.php | 5 +- .../DefaultSiteGenerator/SliderFixtures.php | 6 +-- .../Entity/Pages/BehatTestPage.php | 4 +- .../defaultsite/Entity/Pages/ContentPage.php | 4 +- .../defaultsite/Entity/Pages/FormPage.php | 4 +- .../defaultsite/Entity/Pages/HomePage.php | 4 +- .../EventListener/DefaultLocaleListener.php | 2 +- .../Form/PageParts/SlidePagePartAdminType.php | 4 +- .../Form/Pages/BehatTestPageAdminType.php | 1 - .../Pages/SatelliteOverviewPageAdminType.php | 5 +- .../defaultsite/Form/SatelliteAdminType.php | 5 +- .../Helper/Menu/AdminMenuAdaptor.php | 7 ++- .../SearchPageGenerator/SearchFixtures.php | 6 +-- .../Controller/LanguageChooserController.php | 3 +- .../KunstmaanLanguageChooserExtension.php | 5 +- .../Router/LanguageChooserRouter.php | 11 ++--- .../LocaleGuesser/UrlLocaleGuesserTest.php | 2 +- .../KunstmaanLiveReloadExtension.php | 4 +- .../EventListener/DisableCacheListener.php | 7 ++- .../AdminList/MediaAdminListConfigurator.php | 3 +- .../Command/MigrateNameCommand.php | 3 +- .../Controller/AviaryController.php | 1 - .../Controller/ChooserController.php | 2 - .../Controller/FolderController.php | 3 -- .../Controller/IconFontController.php | 2 - .../Controller/MediaController.php | 3 -- .../DataFixtures/ORM/FolderFixtures.php | 4 +- .../Compiler/MediaHandlerCompilerPass.php | 2 +- .../KunstmaanMediaExtension.php | 6 +-- .../EventListener/DoctrineMediaListener.php | 3 +- .../MediaBundle/Form/File/FileType.php | 3 +- src/Kunstmaan/MediaBundle/Form/FolderType.php | 4 +- .../Form/RemoteAudio/RemoteAudioType.php | 3 +- .../Form/RemoteSlide/RemoteSlideType.php | 3 +- .../Form/RemoteVideo/RemoteVideoType.php | 3 +- .../MediaBundle/Helper/File/FileHelper.php | 8 ++- .../Helper/File/SVGMimeTypeGuesser.php | 8 ++- .../MediaBundle/Helper/Image/ImageHandler.php | 4 +- .../Helper/Menu/MediaMenuAdaptor.php | 9 ++-- .../Helper/RemoteAudio/RemoteAudioHandler.php | 2 +- .../Helper/RemoteAudio/RemoteAudioHelper.php | 2 +- .../Helper/RemoteSlide/RemoteSlideHandler.php | 4 +- .../Helper/RemoteSlide/RemoteSlideHelper.php | 2 +- .../Helper/RemoteVideo/RemoteVideoHandler.php | 4 +- .../Helper/Services/MediaCreatorService.php | 2 +- .../MediaBundle/KunstmaanMediaBundle.php | 4 +- .../Repository/MediaRepository.php | 6 +-- .../MediaBundle/Tests/Entity/MediaTest.php | 1 - .../Tests/Form/AbstractTypeTest.php | 8 +-- .../Tests/Helper/File/FileHelperTest.php | 1 - .../Tests/Helper/MediaManagerTest.php | 1 - .../RemoteVideo/RemoteVideoHelperTest.php | 1 - .../KunstmaanMediaPagePartExtension.php | 4 +- .../Entity/AudioPagePart.php | 5 +- .../Entity/DownloadPagePart.php | 5 +- .../Entity/ImagePagePart.php | 5 +- .../Entity/SlidePagePart.php | 5 +- .../Entity/VideoPagePart.php | 5 +- .../Form/AudioPagePartAdminType.php | 6 +-- .../Form/DownloadPagePartAdminType.php | 7 +-- .../Form/ImagePagePartAdminType.php | 6 +-- .../Form/SlidePagePartAdminType.php | 7 +-- .../Form/VideoPagePartAdminType.php | 7 +-- .../Tests/Entity/DownloadPagePartTest.php | 6 +-- .../Tests/Entity/ImagePagePartTest.php | 6 +-- .../Tests/Entity/SlidePagePartTest.php | 4 +- .../Tests/Entity/VideoPagePartTest.php | 4 +- .../AdminList/NodeAdminListConfigurator.php | 10 ++-- .../ConvertSequenceNumberToWeightCommand.php | 2 - .../Command/CronUpdateNodeCommand.php | 4 -- .../NodeBundle/Command/InitAclCommand.php | 7 +-- .../NodeBundle/Command/UpdateUrlsCommand.php | 1 - .../Controller/NodeAdminController.php | 49 ++++++++----------- .../NodeBundle/Controller/SlugController.php | 4 -- .../Controller/WidgetsController.php | 8 +-- .../KunstmaanNodeExtension.php | 6 +-- .../KunstmaanViewExtension.php | 4 +- .../Entity/AbstractControllerAction.php | 2 - .../NodeBundle/Entity/AbstractPage.php | 12 ++--- src/Kunstmaan/NodeBundle/Entity/Node.php | 6 +-- .../NodeBundle/Entity/PageInterface.php | 6 +-- .../NodeBundle/Entity/StructureNode.php | 2 - .../NodeBundle/Event/AdaptFormEvent.php | 11 ++--- .../Event/ConfigureActionMenuEvent.php | 4 +- .../Event/CopyPageTranslationNodeEvent.php | 4 +- src/Kunstmaan/NodeBundle/Event/NodeEvent.php | 9 ++-- .../NodeBundle/Event/RevertNodeAction.php | 3 +- .../EventListener/FixDateListener.php | 2 - .../EventListener/LogPageEventsSubscriber.php | 3 +- .../NodeBundle/EventListener/NodeListener.php | 5 +- .../EventListener/NodeTranslationListener.php | 12 ++--- .../Form/ControllerActionAdminType.php | 2 +- .../NodeBundle/Form/PageAdminType.php | 2 +- .../NodeBundle/Form/Type/SlugType.php | 6 +-- .../FormWidgets/PermissionsFormWidget.php | 12 ++--- .../Helper/Menu/ActionsMenuBuilder.php | 13 ++--- .../Helper/Menu/PageMenuAdaptor.php | 6 +-- .../Helper/NodeAdmin/NodeAdminPublisher.php | 4 +- src/Kunstmaan/NodeBundle/Helper/NodeMenu.php | 4 +- .../NodeBundle/Helper/NodeMenuItem.php | 2 +- .../Helper/Routing/DynamicUrlMatcher.php | 2 +- .../Services/ACLPermissionCreatorService.php | 14 +++--- .../NodeBundle/Tests/Entity/NodeTest.php | 2 +- .../Tests/Entity/NodeTranslationTest.php | 4 +- .../Tests/Entity/NodeVersionTest.php | 2 +- .../NodeBundle/Tests/Entity/TestEntity.php | 1 - .../Helper/Menu/ActionsMenuBuilderTest.php | 17 +++---- .../NodeBundle/Twig/NodeTwigExtension.php | 6 +-- .../Configuration/NodeSearchConfiguration.php | 1 - .../KunstmaanNodeSearchExtension.php | 4 +- .../Controller/PagePartAdminController.php | 2 - .../KunstmaanPagePartExtension.php | 4 +- .../Entity/AbstractPagePart.php | 4 +- .../PagePartBundle/Entity/HeaderPagePart.php | 5 +- .../PagePartBundle/Entity/PagePartRef.php | 2 +- .../Entity/PageTemplateConfiguration.php | 2 +- .../EventListener/CloneListener.php | 6 +-- .../EventListener/NodeListener.php | 17 +++---- .../Form/HeaderPagePartAdminType.php | 2 +- .../Form/LinePagePartAdminType.php | 2 +- .../Form/LinkPagePartAdminType.php | 2 +- .../Form/RawHTMLPagePartAdminType.php | 2 +- .../Form/TextPagePartAdminType.php | 2 +- .../Form/ToTopPagePartAdminType.php | 2 +- .../Form/TocPagePartAdminType.php | 2 +- .../Helper/FormWidgets/PagePartWidget.php | 13 ++--- .../Helper/FormWidgets/PageTemplateWidget.php | 21 ++++---- .../Helper/HasPageTemplateInterface.php | 1 - .../Helper/PagePartConfigurationReader.php | 10 ++-- .../PageTemplateConfigurationReader.php | 5 +- .../Services/PagePartCreatorService.php | 12 ++--- .../PagePartAdmin/PagePartAdmin.php | 2 +- .../PagePartAdmin/PagePartAdminFactory.php | 3 +- .../Repository/PagePartRefRepository.php | 4 +- .../PageTemplateConfigurationRepository.php | 7 +-- .../Tests/EventListener/CloneListenerTest.php | 4 +- .../Tests/Form/PagePartAdminTypeTestCase.php | 11 ++--- .../Extension/PagePartAdminTwigExtension.php | 1 - .../Twig/Extension/PagePartTwigExtension.php | 4 +- .../Extension/PageTemplateTwigExtension.php | 4 +- .../RedirectAdminListConfigurator.php | 7 ++- .../RedirectAdminListController.php | 8 +-- .../KunstmaanRedirectExtension.php | 4 +- .../RedirectBundle/Entity/Redirect.php | 2 +- .../RedirectBundle/Form/RedirectAdminType.php | 2 +- .../Helper/Menu/RedirectMenuAdaptor.php | 4 +- .../KunstmaanSearchExtension.php | 5 +- .../KunstmaanSearchExtensionTest.php | 4 +- .../KunstmaanSeoExtension.php | 4 +- .../SeoBundle/EventListener/CloneListener.php | 5 +- .../SeoBundle/EventListener/NodeListener.php | 9 ++-- src/Kunstmaan/SeoBundle/Form/SeoType.php | 2 +- src/Kunstmaan/SeoBundle/Form/SocialType.php | 2 +- .../SeoBundle/Repository/SeoRepository.php | 3 +- .../Tests/Twig/TwigExtensionTests.php | 2 +- .../Twig/GoogleAnalyticsTwigExtension.php | 11 ++--- .../SeoBundle/Twig/SeoTwigExtension.php | 8 +-- .../Controller/SitemapController.php | 2 - .../KunstmaanSitemapExtension.php | 4 +- .../AdminList/TagAdminListConfigurator.php | 7 ++- .../Controller/TagAdminListController.php | 7 +-- src/Kunstmaan/TaggingBundle/Entity/Tag.php | 4 +- .../TaggingBundle/Entity/TagManager.php | 3 +- .../TaggingBundle/Entity/Tagging.php | 3 +- .../EventListener/TagsListener.php | 1 - .../Form/DataTransformer/TagsTransformer.php | 3 +- .../TaggingBundle/Form/TagsAdminType.php | 5 +- .../Repository/TagRepository.php | 1 - .../Command/ExportTranslationsCommand.php | 2 +- .../Command/ImportTranslationsCommand.php | 3 +- .../Command/MigrateTranslationsCommand.php | 3 +- .../Command/MigrationsDiffCommand.php | 8 +-- .../DataCollector/TranslatorDataCollector.php | 4 +- .../TranslatorCommandController.php | 8 +-- .../Controller/TranslatorController.php | 11 +---- .../DataFixtures/ORM/TranslationFixtures.php | 7 ++- .../KunstmaanTranslatorCompilerPass.php | 2 +- .../KunstmaanTranslatorExtension.php | 6 +-- .../KunstmaanTranslatorBundle.php | 4 +- .../Service/Command/DiffCommand.php | 8 +-- .../Command/Exporter/ExportCommandHandler.php | 3 +- .../Service/Menu/TranslatorMenuAdaptor.php | 4 +- .../Service/TranslationFileExplorer.php | 2 +- .../Service/TranslationGroupManager.php | 1 - .../Service/Translator/Translator.php | 2 +- .../KunstmaanTranslatorExtensionTest.php | 2 +- .../Exporter/ExportCommandHandlerTest.php | 2 +- .../Importer/ImportCommandHandlerTest.php | 2 +- .../TranslatorBundle/Tests/TestListener.php | 2 - .../TranslatorBundle/Tests/app/AppKernel.php | 2 +- .../AbstractSettingsAdminListConfigurator.php | 1 - .../AdminList/GroupAdminListConfigurator.php | 1 - .../AdminList/RoleAdminListConfigurator.php | 1 - .../Controller/GroupsController.php | 8 +-- .../Controller/RolesController.php | 6 +-- .../Controller/UsersController.php | 5 +- .../KunstmaanUserManagementExtension.php | 4 +- .../KunstmaanUtilitiesExtension.php | 4 +- .../Controller/VotingController.php | 7 +-- .../KunstmaanVotingExtension.php | 6 +-- .../Facebook/FacebookLikeEventListener.php | 2 +- .../Facebook/FacebookSendEventListener.php | 2 +- .../LinkedIn/LinkedInShareEventListener.php | 2 +- .../Services/RepositoryResolver.php | 5 +- .../KunstmaanVotingExtensionTest.php | 4 +- .../Tests/Services/RepositoryResolverTest.php | 6 --- 391 files changed, 667 insertions(+), 1211 deletions(-) diff --git a/src/Kunstmaan/AdminBundle/Command/ApplyAclCommand.php b/src/Kunstmaan/AdminBundle/Command/ApplyAclCommand.php index 77f41229c4..d7ae564a32 100644 --- a/src/Kunstmaan/AdminBundle/Command/ApplyAclCommand.php +++ b/src/Kunstmaan/AdminBundle/Command/ApplyAclCommand.php @@ -3,15 +3,13 @@ namespace Kunstmaan\AdminBundle\Command; use Doctrine\ORM\EntityManager; - -use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; -use Symfony\Component\Console\Input\InputInterface; -use Symfony\Component\Console\Output\OutputInterface; - use Kunstmaan\AdminBundle\Entity\AclChangeset; -use Kunstmaan\AdminBundle\Repository\AclChangesetRepository; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionAdmin; +use Kunstmaan\AdminBundle\Repository\AclChangesetRepository; use Kunstmaan\UtilitiesBundle\Helper\Shell\Shell; +use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Output\OutputInterface; /** * Symfony CLI command to apply the {@link AclChangeSet} with status {@link AclChangeSet::STATUS_NEW} to their entities diff --git a/src/Kunstmaan/AdminBundle/Command/CreateGroupCommand.php b/src/Kunstmaan/AdminBundle/Command/CreateGroupCommand.php index c973f8ffbf..8099200749 100644 --- a/src/Kunstmaan/AdminBundle/Command/CreateGroupCommand.php +++ b/src/Kunstmaan/AdminBundle/Command/CreateGroupCommand.php @@ -2,17 +2,15 @@ namespace Kunstmaan\AdminBundle\Command; +use Doctrine\ORM\EntityManager; +use Kunstmaan\AdminBundle\Entity\Group; +use Kunstmaan\AdminBundle\Entity\Role; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; -use Doctrine\ORM\EntityManager; - -use Kunstmaan\AdminBundle\Entity\Group; -use Kunstmaan\AdminBundle\Entity\Role; - /** * Symfony CLI command to create a group using app/console kuma:group:create */ diff --git a/src/Kunstmaan/AdminBundle/Command/CreateRoleCommand.php b/src/Kunstmaan/AdminBundle/Command/CreateRoleCommand.php index 3cb7707f10..5f91ed2727 100644 --- a/src/Kunstmaan/AdminBundle/Command/CreateRoleCommand.php +++ b/src/Kunstmaan/AdminBundle/Command/CreateRoleCommand.php @@ -2,15 +2,13 @@ namespace Kunstmaan\AdminBundle\Command; +use Doctrine\ORM\EntityManager; +use Kunstmaan\AdminBundle\Entity\Role; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Doctrine\ORM\EntityManager; - -use Kunstmaan\AdminBundle\Entity\Role; - /** * Symfony CLI command to create a group using app/console kuma:role:create */ diff --git a/src/Kunstmaan/AdminBundle/Command/CreateUserCommand.php b/src/Kunstmaan/AdminBundle/Command/CreateUserCommand.php index 1e1b0be34b..e0a3d31beb 100644 --- a/src/Kunstmaan/AdminBundle/Command/CreateUserCommand.php +++ b/src/Kunstmaan/AdminBundle/Command/CreateUserCommand.php @@ -4,10 +4,10 @@ use Doctrine\ORM\EntityManager; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; +use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\OutputInterface; /** diff --git a/src/Kunstmaan/AdminBundle/Command/FixAdminLocaleCommand.php b/src/Kunstmaan/AdminBundle/Command/FixAdminLocaleCommand.php index fd4e87344d..bad443620f 100644 --- a/src/Kunstmaan/AdminBundle/Command/FixAdminLocaleCommand.php +++ b/src/Kunstmaan/AdminBundle/Command/FixAdminLocaleCommand.php @@ -3,7 +3,6 @@ namespace Kunstmaan\AdminBundle\Command; use Doctrine\ORM\EntityManager; - use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -47,4 +46,4 @@ protected function execute(InputInterface $input, OutputInterface $output) $em->flush(); $output->writeln('The default admin locale was successfully set for all users.'); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/AdminBundle/Command/FixGuestCommand.php b/src/Kunstmaan/AdminBundle/Command/FixGuestCommand.php index 82fb536708..c0fca86671 100644 --- a/src/Kunstmaan/AdminBundle/Command/FixGuestCommand.php +++ b/src/Kunstmaan/AdminBundle/Command/FixGuestCommand.php @@ -3,7 +3,6 @@ namespace Kunstmaan\AdminBundle\Command; use Doctrine\ORM\EntityManager; - use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Config\Definition\Exception\Exception; use Symfony\Component\Console\Input\InputInterface; @@ -100,4 +99,4 @@ protected function execute(InputInterface $input, OutputInterface $output) $output->writeln('ROLE_GUEST not found : you\'re on your own!'); } } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/AdminBundle/Controller/DefaultController.php b/src/Kunstmaan/AdminBundle/Controller/DefaultController.php index 045d2feea0..3523edaea7 100644 --- a/src/Kunstmaan/AdminBundle/Controller/DefaultController.php +++ b/src/Kunstmaan/AdminBundle/Controller/DefaultController.php @@ -2,12 +2,10 @@ namespace Kunstmaan\AdminBundle\Controller; -use Symfony\Component\HttpFoundation\RedirectResponse; -use Kunstmaan\AdminBundle\Form\DashboardConfigurationType; use Kunstmaan\AdminBundle\Entity\DashboardConfiguration; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Kunstmaan\AdminBundle\Form\DashboardConfigurationType; use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Kunstmaan/AdminBundle/Controller/ModulesController.php b/src/Kunstmaan/AdminBundle/Controller/ModulesController.php index f990104087..bc872ad6c7 100644 --- a/src/Kunstmaan/AdminBundle/Controller/ModulesController.php +++ b/src/Kunstmaan/AdminBundle/Controller/ModulesController.php @@ -4,9 +4,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; - /** * The modules home controller */ diff --git a/src/Kunstmaan/AdminBundle/Controller/SettingsController.php b/src/Kunstmaan/AdminBundle/Controller/SettingsController.php index 39e89d4719..6d46e6b7ed 100644 --- a/src/Kunstmaan/AdminBundle/Controller/SettingsController.php +++ b/src/Kunstmaan/AdminBundle/Controller/SettingsController.php @@ -2,8 +2,6 @@ namespace Kunstmaan\AdminBundle\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\Security\Core\Exception\AccessDeniedException; /** diff --git a/src/Kunstmaan/AdminBundle/DataFixtures/ORM/GroupFixtures.php b/src/Kunstmaan/AdminBundle/DataFixtures/ORM/GroupFixtures.php index 1a304e4cae..8c8de8843c 100644 --- a/src/Kunstmaan/AdminBundle/DataFixtures/ORM/GroupFixtures.php +++ b/src/Kunstmaan/AdminBundle/DataFixtures/ORM/GroupFixtures.php @@ -2,11 +2,9 @@ namespace Kunstmaan\AdminBundle\DataFixtures\ORM; -use Doctrine\Common\Persistence\ObjectManager; -use Doctrine\ORM\EntityManager; use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; - +use Doctrine\Common\Persistence\ObjectManager; use Kunstmaan\AdminBundle\Entity\Group; /** diff --git a/src/Kunstmaan/AdminBundle/DataFixtures/ORM/RoleFixtures.php b/src/Kunstmaan/AdminBundle/DataFixtures/ORM/RoleFixtures.php index b5d470db5f..c435da23f8 100644 --- a/src/Kunstmaan/AdminBundle/DataFixtures/ORM/RoleFixtures.php +++ b/src/Kunstmaan/AdminBundle/DataFixtures/ORM/RoleFixtures.php @@ -2,11 +2,10 @@ namespace Kunstmaan\AdminBundle\DataFixtures\ORM; -use Kunstmaan\AdminBundle\Entity\Role; - use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; use Doctrine\Common\Persistence\ObjectManager; +use Kunstmaan\AdminBundle\Entity\Role; /** * Fixture for creation the basic roles diff --git a/src/Kunstmaan/AdminBundle/DataFixtures/ORM/UserFixtures.php b/src/Kunstmaan/AdminBundle/DataFixtures/ORM/UserFixtures.php index 61e21755fc..60e86ec1bf 100644 --- a/src/Kunstmaan/AdminBundle/DataFixtures/ORM/UserFixtures.php +++ b/src/Kunstmaan/AdminBundle/DataFixtures/ORM/UserFixtures.php @@ -4,8 +4,8 @@ use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; -use Kunstmaan\AdminBundle\Entity\User; use Doctrine\Common\Persistence\ObjectManager; +use Kunstmaan\AdminBundle\Entity\User; use Symfony\Component\DependencyInjection\ContainerAwareInterface; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/AddLogProcessorsCompilerPass.php b/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/AddLogProcessorsCompilerPass.php index e4121eccf7..1425e9d68b 100644 --- a/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/AddLogProcessorsCompilerPass.php +++ b/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/AddLogProcessorsCompilerPass.php @@ -2,9 +2,9 @@ namespace Kunstmaan\AdminBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\Reference; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Reference; /** * This compiler pass makes it possible to add processors for the Kunstmaan logger diff --git a/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/MenuCompilerPass.php b/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/MenuCompilerPass.php index e25dcd6ce0..558b086a3e 100644 --- a/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/MenuCompilerPass.php +++ b/src/Kunstmaan/AdminBundle/DependencyInjection/Compiler/MenuCompilerPass.php @@ -2,8 +2,8 @@ namespace Kunstmaan\AdminBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; /** diff --git a/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php b/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php index 9caa87d70e..9bf6aaa4c5 100644 --- a/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php +++ b/src/Kunstmaan/AdminBundle/DependencyInjection/KunstmaanAdminExtension.php @@ -3,12 +3,11 @@ namespace Kunstmaan\AdminBundle\DependencyInjection; use InvalidArgumentException; - -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; +use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** diff --git a/src/Kunstmaan/AdminBundle/Entity/Group.php b/src/Kunstmaan/AdminBundle/Entity/Group.php index 5216083bf2..68e5b08772 100644 --- a/src/Kunstmaan/AdminBundle/Entity/Group.php +++ b/src/Kunstmaan/AdminBundle/Entity/Group.php @@ -2,16 +2,14 @@ namespace Kunstmaan\AdminBundle\Entity; -use InvalidArgumentException; - -use Symfony\Component\Validator\Constraints as Assert; -use Symfony\Component\Validator\ExecutionContext; -use Symfony\Component\Validator\Constraints\Callback; -use Symfony\Component\Security\Core\Role\RoleInterface; -use FOS\UserBundle\Model\GroupInterface; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\Common\Collections\Collection; use Doctrine\ORM\Mapping as ORM; +use FOS\UserBundle\Model\GroupInterface; +use InvalidArgumentException; +use Symfony\Component\Security\Core\Role\RoleInterface; +use Symfony\Component\Validator\Constraints as Assert; +use Symfony\Component\Validator\ExecutionContext; /** * Group diff --git a/src/Kunstmaan/AdminBundle/Entity/Role.php b/src/Kunstmaan/AdminBundle/Entity/Role.php index 6830803284..4691a318ef 100644 --- a/src/Kunstmaan/AdminBundle/Entity/Role.php +++ b/src/Kunstmaan/AdminBundle/Entity/Role.php @@ -3,9 +3,8 @@ namespace Kunstmaan\AdminBundle\Entity; use Doctrine\ORM\Mapping as ORM; -use Symfony\Component\Validator\Constraints as Assert; use Symfony\Component\Security\Core\Role\RoleInterface; -use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity; +use Symfony\Component\Validator\Constraints as Assert; /** * Role Entity diff --git a/src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php b/src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php index 5bf0662472..0958e78fd7 100644 --- a/src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php +++ b/src/Kunstmaan/AdminBundle/EventListener/AdminLocaleListener.php @@ -2,12 +2,12 @@ namespace Kunstmaan\AdminBundle\EventListener; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpKernel\Event\GetResponseEvent; use Symfony\Component\HttpKernel\HttpKernelInterface; use Symfony\Component\HttpKernel\KernelEvents; -use Symfony\Component\EventDispatcher\EventSubscriberInterface; -use Symfony\Component\Translation\TranslatorInterface; use Symfony\Component\Security\Core\SecurityContext; +use Symfony\Component\Translation\TranslatorInterface; /** * AdminLocaleListener to override default locale if user-specific locale is set in database diff --git a/src/Kunstmaan/AdminBundle/EventListener/CloneListener.php b/src/Kunstmaan/AdminBundle/EventListener/CloneListener.php index db3f546d7f..ccb4e666eb 100644 --- a/src/Kunstmaan/AdminBundle/EventListener/CloneListener.php +++ b/src/Kunstmaan/AdminBundle/EventListener/CloneListener.php @@ -2,9 +2,9 @@ namespace Kunstmaan\AdminBundle\EventListener; +use Kunstmaan\AdminBundle\Entity\AbstractEntity; use Kunstmaan\AdminBundle\Entity\DeepCloneInterface; use Kunstmaan\AdminBundle\Event\DeepCloneAndSaveEvent; -use Kunstmaan\AdminBundle\Entity\AbstractEntity; /** * This listener will make sure the id isn't copied for AbstractEntities diff --git a/src/Kunstmaan/AdminBundle/Form/GroupType.php b/src/Kunstmaan/AdminBundle/Form/GroupType.php index 8922a37447..3db00d3ad8 100644 --- a/src/Kunstmaan/AdminBundle/Form/GroupType.php +++ b/src/Kunstmaan/AdminBundle/Form/GroupType.php @@ -3,7 +3,6 @@ namespace Kunstmaan\AdminBundle\Form; use Doctrine\ORM\EntityRepository; - use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; diff --git a/src/Kunstmaan/AdminBundle/Form/UserType.php b/src/Kunstmaan/AdminBundle/Form/UserType.php index b8761ca2e0..f024acaa75 100644 --- a/src/Kunstmaan/AdminBundle/Form/UserType.php +++ b/src/Kunstmaan/AdminBundle/Form/UserType.php @@ -4,8 +4,8 @@ use Doctrine\ORM\EntityRepository; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * UserType defines the form used for {@link User} diff --git a/src/Kunstmaan/AdminBundle/Helper/CloneHelper.php b/src/Kunstmaan/AdminBundle/Helper/CloneHelper.php index aac693156d..c4b13b7b74 100644 --- a/src/Kunstmaan/AdminBundle/Helper/CloneHelper.php +++ b/src/Kunstmaan/AdminBundle/Helper/CloneHelper.php @@ -3,11 +3,9 @@ namespace Kunstmaan\AdminBundle\Helper; use Doctrine\ORM\EntityManager; - -use Symfony\Component\EventDispatcher\EventDispatcherInterface; - -use Kunstmaan\AdminBundle\Event\Events; use Kunstmaan\AdminBundle\Event\DeepCloneAndSaveEvent; +use Kunstmaan\AdminBundle\Event\Events; +use Symfony\Component\EventDispatcher\EventDispatcherInterface; /** * This helper will help you to clone Entities diff --git a/src/Kunstmaan/AdminBundle/Helper/Creators/ACLPermissionCreator.php b/src/Kunstmaan/AdminBundle/Helper/Creators/ACLPermissionCreator.php index b91458439e..c10ff077de 100644 --- a/src/Kunstmaan/AdminBundle/Helper/Creators/ACLPermissionCreator.php +++ b/src/Kunstmaan/AdminBundle/Helper/Creators/ACLPermissionCreator.php @@ -2,8 +2,8 @@ namespace Kunstmaan\AdminBundle\Helper\Creators; -use Symfony\Component\Security\Acl\Exception\AclNotFoundException; use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; +use Symfony\Component\Security\Acl\Exception\AclNotFoundException; use Symfony\Component\Security\Acl\Model\EntryInterface; use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface; use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; @@ -109,4 +109,4 @@ public function initByMap($object, $map, $force = false) $this->init($object, $aces, $force); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/AdminBundle/Helper/FormHelper.php b/src/Kunstmaan/AdminBundle/Helper/FormHelper.php index fadea16878..c59376d76f 100644 --- a/src/Kunstmaan/AdminBundle/Helper/FormHelper.php +++ b/src/Kunstmaan/AdminBundle/Helper/FormHelper.php @@ -2,8 +2,8 @@ namespace Kunstmaan\AdminBundle\Helper; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormError; +use Symfony\Component\Form\FormView; /** * Helper class for forms diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php index f32f237221..787b89641e 100644 --- a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php +++ b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidget.php @@ -4,10 +4,9 @@ use Doctrine\ORM\EntityManager; use Kunstmaan\AdminBundle\Helper\FormHelper; - -use Symfony\Component\Form\FormView; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\FormView; use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php index 9065f66be4..eabf6ee426 100644 --- a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php +++ b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/FormWidgetInterface.php @@ -2,8 +2,8 @@ namespace Kunstmaan\AdminBundle\Helper\FormWidgets; use Doctrine\ORM\EntityManager; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\FormView; use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/ListWidget.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/ListWidget.php index 006220b33f..fbd5e48fb2 100644 --- a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/ListWidget.php +++ b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/ListWidget.php @@ -2,8 +2,8 @@ namespace Kunstmaan\AdminBundle\Helper\FormWidgets; use Doctrine\ORM\EntityManager; -use Symfony\Component\Form\FormView; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\FormView; use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/Tab.php b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/Tab.php index d0d780e462..b05c1115f2 100644 --- a/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/Tab.php +++ b/src/Kunstmaan/AdminBundle/Helper/FormWidgets/Tabs/Tab.php @@ -1,11 +1,11 @@ get("kunstmaan_adminlist.service.export")->getDownloadableResponse($exportlist, $_format); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/FormBundle/DependencyInjection/KunstmaanFormExtension.php b/src/Kunstmaan/FormBundle/DependencyInjection/KunstmaanFormExtension.php index 2a79115d34..2cfaaa4f37 100644 --- a/src/Kunstmaan/FormBundle/DependencyInjection/KunstmaanFormExtension.php +++ b/src/Kunstmaan/FormBundle/DependencyInjection/KunstmaanFormExtension.php @@ -2,11 +2,11 @@ namespace Kunstmaan\FormBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; +use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Kunstmaan/FormBundle/Entity/AbstractFormPage.php b/src/Kunstmaan/FormBundle/Entity/AbstractFormPage.php index 5b6922a5c5..eef972b553 100644 --- a/src/Kunstmaan/FormBundle/Entity/AbstractFormPage.php +++ b/src/Kunstmaan/FormBundle/Entity/AbstractFormPage.php @@ -2,22 +2,19 @@ namespace Kunstmaan\FormBundle\Entity; -use Kunstmaan\PagePartBundle\Helper\HasPagePartsInterface; -use Kunstmaan\FormBundle\Helper\FormPageInterface; - use Doctrine\ORM\Mapping as ORM; - +use Kunstmaan\FormBundle\Form\AbstractFormPageAdminType; +use Kunstmaan\FormBundle\Helper\FormPageInterface; use Kunstmaan\NodeBundle\Entity\AbstractPage; use Kunstmaan\NodeBundle\Entity\NodeTranslation; use Kunstmaan\NodeBundle\Helper\RenderContext; -use Kunstmaan\FormBundle\Form\AbstractFormPageAdminType; - +use Kunstmaan\PagePartBundle\Helper\HasPagePartsInterface; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Form\AbstractType; use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Validator\Constraints as Assert; -use Symfony\Component\Form\AbstractType; /** * This is an abstract ORM form page. With this page it's possible to create forms using a mix of form page parts and diff --git a/src/Kunstmaan/FormBundle/Entity/FormAdaptorInterface.php b/src/Kunstmaan/FormBundle/Entity/FormAdaptorInterface.php index b8455cf2b0..8ed9247252 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormAdaptorInterface.php +++ b/src/Kunstmaan/FormBundle/Entity/FormAdaptorInterface.php @@ -3,7 +3,6 @@ namespace Kunstmaan\FormBundle\Entity; use ArrayObject; - use Symfony\Component\Form\FormBuilderInterface; /** diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmission.php b/src/Kunstmaan/FormBundle/Entity/FormSubmission.php index f9dd76fd83..5f3ab4f4cd 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormSubmission.php +++ b/src/Kunstmaan/FormBundle/Entity/FormSubmission.php @@ -3,11 +3,9 @@ namespace Kunstmaan\FormBundle\Entity; use DateTime; - -use Kunstmaan\NodeBundle\Entity\Node; - use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; +use Kunstmaan\NodeBundle\Entity\Node; /** * The form submission diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionField.php index bdf9f46837..83a7aea665 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormSubmissionField.php +++ b/src/Kunstmaan/FormBundle/Entity/FormSubmissionField.php @@ -3,10 +3,9 @@ namespace Kunstmaan\FormBundle\Entity; use Doctrine\ORM\Mapping as ORM; - use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\Form; +use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/BooleanFormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/BooleanFormSubmissionField.php index 258697e91d..e286a28bdc 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/BooleanFormSubmissionField.php +++ b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/BooleanFormSubmissionField.php @@ -3,10 +3,9 @@ namespace Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes; use Doctrine\ORM\Mapping as ORM; - use Kunstmaan\FormBundle\Entity\FormSubmissionField; -use Kunstmaan\FormBundle\Form\ChoiceFormSubmissionType; use Kunstmaan\FormBundle\Form\BooleanFormSubmissionType; +use Kunstmaan\FormBundle\Form\ChoiceFormSubmissionType; /** * The BooleanFormSubmissionField can be used to store one or more selected choices to a FormSubmission diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/ChoiceFormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/ChoiceFormSubmissionField.php index 09b553b36d..1c0c114cbf 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/ChoiceFormSubmissionField.php +++ b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/ChoiceFormSubmissionField.php @@ -3,7 +3,6 @@ namespace Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes; use Doctrine\ORM\Mapping as ORM; - use Kunstmaan\FormBundle\Entity\FormSubmissionField; use Kunstmaan\FormBundle\Form\ChoiceFormSubmissionType; diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/EmailFormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/EmailFormSubmissionField.php index 45da96c763..16650bf6e4 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/EmailFormSubmissionField.php +++ b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/EmailFormSubmissionField.php @@ -3,10 +3,8 @@ namespace Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes; use Doctrine\ORM\Mapping as ORM; - use Kunstmaan\FormBundle\Entity\FormSubmissionField; use Kunstmaan\FormBundle\Form\EmailFormSubmissionType; - use Symfony\Component\Validator\Constraints as Assert; /** @@ -69,4 +67,4 @@ public function __toString() return !empty($value) ? $value : ""; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/FileFormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/FileFormSubmissionField.php index d2fb480e67..68abc651be 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/FileFormSubmissionField.php +++ b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/FileFormSubmissionField.php @@ -2,20 +2,17 @@ namespace Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes; -use Kunstmaan\FormBundle\Entity\FormSubmissionField; - +use Doctrine\ORM\Mapping as ORM; use Gedmo\Sluggable\Util\Urlizer; - +use Kunstmaan\FormBundle\Entity\FormSubmissionField; use Kunstmaan\FormBundle\Form\FileFormSubmissionType; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\Form; +use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\File\UploadedFile; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Validator\Constraints as Assert; -use Doctrine\ORM\Mapping as ORM; - /** * The ChoiceFormSubmissionField can be used to store files to a FormSubmission * diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/StringFormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/StringFormSubmissionField.php index 0672434cec..4bdfba09a7 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/StringFormSubmissionField.php +++ b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/StringFormSubmissionField.php @@ -3,12 +3,9 @@ namespace Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes; use Doctrine\ORM\Mapping as ORM; - use Kunstmaan\FormBundle\Entity\FormSubmissionField; use Kunstmaan\FormBundle\Form\StringFormSubmissionType; -use Symfony\Component\Validator\Constraints\Type; - /** * The StringFormSubmissionField can be used to store string values to a FormSubmission * @@ -69,4 +66,4 @@ public function __toString() return !empty($value) ? $value : ""; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/TextFormSubmissionField.php b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/TextFormSubmissionField.php index bd37a1d1c2..8503956544 100644 --- a/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/TextFormSubmissionField.php +++ b/src/Kunstmaan/FormBundle/Entity/FormSubmissionFieldTypes/TextFormSubmissionField.php @@ -2,11 +2,10 @@ namespace Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes; +use Doctrine\ORM\Mapping as ORM; use Kunstmaan\FormBundle\Entity\FormSubmissionField; use Kunstmaan\FormBundle\Form\TextFormSubmissionType; -use Doctrine\ORM\Mapping as ORM; - /** * The TextFormSubmissionField can be used to store multi-line string values to a FormSubmission * diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/AbstractFormPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/AbstractFormPagePart.php index aa0f940a09..3cf253fce9 100644 --- a/src/Kunstmaan/FormBundle/Entity/PageParts/AbstractFormPagePart.php +++ b/src/Kunstmaan/FormBundle/Entity/PageParts/AbstractFormPagePart.php @@ -2,11 +2,10 @@ namespace Kunstmaan\FormBundle\Entity\PageParts; -use Kunstmaan\UtilitiesBundle\Helper\ClassLookup; +use Doctrine\ORM\Mapping as ORM; use Kunstmaan\FormBundle\Entity\FormAdaptorInterface; use Kunstmaan\PagePartBundle\Entity\AbstractPagePart; - -use Doctrine\ORM\Mapping as ORM; +use Kunstmaan\UtilitiesBundle\Helper\ClassLookup; /** * Abstract version of a form page part diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/CheckboxPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/CheckboxPagePart.php index 940d7a411a..f6f1d5cc1f 100644 --- a/src/Kunstmaan/FormBundle/Entity/PageParts/CheckboxPagePart.php +++ b/src/Kunstmaan/FormBundle/Entity/PageParts/CheckboxPagePart.php @@ -3,22 +3,13 @@ namespace Kunstmaan\FormBundle\Entity\PageParts; use ArrayObject; - -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Form\FormInterface; -use Symfony\Component\Form\FormError; -use Symfony\Component\Form\FormEvent; -use Symfony\Component\Form\FormEvents; - -use Kunstmaan\FormBundle\Form\StringFormSubmissionType; -use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\StringFormSubmissionField; -use Kunstmaan\FormBundle\Form\SingleLineTextPagePartAdminType; - use Doctrine\ORM\Mapping as ORM; -use Kunstmaan\FormBundle\Form\CheckboxPagePartAdminType; +use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\BooleanFormSubmissionField; use Kunstmaan\FormBundle\Form\BooleanFormSubmissionType; +use Kunstmaan\FormBundle\Form\CheckboxPagePartAdminType; +use Kunstmaan\FormBundle\Form\SingleLineTextPagePartAdminType; +use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints\NotBlank; -use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\BooleanFormSubmissionField; /** * The checkbox page part can be used to create forms with checkbox input fields diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/ChoicePagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/ChoicePagePart.php index 65de238b46..01591b0c81 100644 --- a/src/Kunstmaan/FormBundle/Entity/PageParts/ChoicePagePart.php +++ b/src/Kunstmaan/FormBundle/Entity/PageParts/ChoicePagePart.php @@ -3,15 +3,12 @@ namespace Kunstmaan\FormBundle\Entity\PageParts; use ArrayObject; - -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Validator\Constraints\NotBlank; - +use Doctrine\ORM\Mapping as ORM; +use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\ChoiceFormSubmissionField; use Kunstmaan\FormBundle\Form\ChoiceFormSubmissionType; use Kunstmaan\FormBundle\Form\ChoicePagePartAdminType; -use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\ChoiceFormSubmissionField; - -use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Validator\Constraints\NotBlank; /** * The choice page part can be used to create forms with single or multiple choices. This can be diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/EmailPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/EmailPagePart.php index 1e90c0b286..1ce436d1ff 100644 --- a/src/Kunstmaan/FormBundle/Entity/PageParts/EmailPagePart.php +++ b/src/Kunstmaan/FormBundle/Entity/PageParts/EmailPagePart.php @@ -3,16 +3,13 @@ namespace Kunstmaan\FormBundle\Entity\PageParts; use ArrayObject; - -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\Validator\Constraints\Email; -use Symfony\Component\Validator\Constraints\NotBlank; - +use Doctrine\ORM\Mapping as ORM; use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\EmailFormSubmissionField; use Kunstmaan\FormBundle\Form\EmailFormSubmissionType; use Kunstmaan\FormBundle\Form\EmailPagePartAdminType; - -use Doctrine\ORM\Mapping as ORM; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Validator\Constraints\Email; +use Symfony\Component\Validator\Constraints\NotBlank; /** * The email page part can be used to create forms with email input fields diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/FileUploadPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/FileUploadPagePart.php index 2458677084..9a64e5b6fe 100644 --- a/src/Kunstmaan/FormBundle/Entity/PageParts/FileUploadPagePart.php +++ b/src/Kunstmaan/FormBundle/Entity/PageParts/FileUploadPagePart.php @@ -3,17 +3,12 @@ namespace Kunstmaan\FormBundle\Entity\PageParts; use ArrayObject; - -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\Form\FormBuilderInterface; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\Validator\Constraints\NotBlank; - use Doctrine\ORM\Mapping as ORM; - use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\FileFormSubmissionField; use Kunstmaan\FormBundle\Form\FileFormSubmissionType; use Kunstmaan\FormBundle\Form\FileUploadPagePartAdminType; +use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Validator\Constraints\NotBlank; /** * The file upload page part can be used to create forms with the possibility to upload files diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/MultiLineTextPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/MultiLineTextPagePart.php index 00839eed59..2b2e220bad 100644 --- a/src/Kunstmaan/FormBundle/Entity/PageParts/MultiLineTextPagePart.php +++ b/src/Kunstmaan/FormBundle/Entity/PageParts/MultiLineTextPagePart.php @@ -3,13 +3,10 @@ namespace Kunstmaan\FormBundle\Entity\PageParts; use ArrayObject; - use Doctrine\ORM\Mapping as ORM; - use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\TextFormSubmissionField; -use Kunstmaan\FormBundle\Form\TextFormSubmissionType; use Kunstmaan\FormBundle\Form\MultiLineTextPagePartAdminType; - +use Kunstmaan\FormBundle\Form\TextFormSubmissionType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\Regex; diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/SingleLineTextPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/SingleLineTextPagePart.php index 74ad193612..c340e64dc0 100644 --- a/src/Kunstmaan/FormBundle/Entity/PageParts/SingleLineTextPagePart.php +++ b/src/Kunstmaan/FormBundle/Entity/PageParts/SingleLineTextPagePart.php @@ -3,17 +3,14 @@ namespace Kunstmaan\FormBundle\Entity\PageParts; use ArrayObject; - +use Doctrine\ORM\Mapping as ORM; +use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\StringFormSubmissionField; +use Kunstmaan\FormBundle\Form\SingleLineTextPagePartAdminType; +use Kunstmaan\FormBundle\Form\StringFormSubmissionType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Validator\Constraints\Regex; -use Kunstmaan\FormBundle\Form\StringFormSubmissionType; -use Kunstmaan\FormBundle\Entity\FormSubmissionFieldTypes\StringFormSubmissionField; -use Kunstmaan\FormBundle\Form\SingleLineTextPagePartAdminType; - -use Doctrine\ORM\Mapping as ORM; - /** * The single-line text page part can be used to create forms with text input fields diff --git a/src/Kunstmaan/FormBundle/Entity/PageParts/SubmitButtonPagePart.php b/src/Kunstmaan/FormBundle/Entity/PageParts/SubmitButtonPagePart.php index 4def7156f5..f6158b512f 100644 --- a/src/Kunstmaan/FormBundle/Entity/PageParts/SubmitButtonPagePart.php +++ b/src/Kunstmaan/FormBundle/Entity/PageParts/SubmitButtonPagePart.php @@ -2,12 +2,9 @@ namespace Kunstmaan\FormBundle\Entity\PageParts; -use Kunstmaan\PagePartBundle\Entity\AbstractPagePart; -use Kunstmaan\FormBundle\Form\SubmitButtonPagePartAdminType; - -use Symfony\Component\Form\AbstractType; - use Doctrine\ORM\Mapping as ORM; +use Kunstmaan\FormBundle\Form\SubmitButtonPagePartAdminType; +use Kunstmaan\PagePartBundle\Entity\AbstractPagePart; /** * This page part adds a submit button to the forms diff --git a/src/Kunstmaan/FormBundle/EventListener/ConfigureActionsMenuListener.php b/src/Kunstmaan/FormBundle/EventListener/ConfigureActionsMenuListener.php index 30b424fd26..d877948196 100644 --- a/src/Kunstmaan/FormBundle/EventListener/ConfigureActionsMenuListener.php +++ b/src/Kunstmaan/FormBundle/EventListener/ConfigureActionsMenuListener.php @@ -3,10 +3,8 @@ namespace Kunstmaan\FormBundle\EventListener; use Doctrine\ORM\EntityManager; - -use Kunstmaan\NodeBundle\Event\ConfigureActionMenuEvent; use Kunstmaan\FormBundle\Entity\AbstractFormPage; - +use Kunstmaan\NodeBundle\Event\ConfigureActionMenuEvent; use Symfony\Component\Routing\RouterInterface; /** diff --git a/src/Kunstmaan/FormBundle/Form/BooleanFormSubmissionType.php b/src/Kunstmaan/FormBundle/Form/BooleanFormSubmissionType.php index ebd78a8799..37b63fd670 100644 --- a/src/Kunstmaan/FormBundle/Form/BooleanFormSubmissionType.php +++ b/src/Kunstmaan/FormBundle/Form/BooleanFormSubmissionType.php @@ -3,9 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * The type for the BooleanFormSubmissionField @@ -39,4 +38,4 @@ public function getName() { return 'kunstmaan_formbundle_booleanformsubmissiontype'; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/FormBundle/Form/CheckboxPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/CheckboxPagePartAdminType.php index 02f8c69d5d..32b47f7dd4 100644 --- a/src/Kunstmaan/FormBundle/Form/CheckboxPagePartAdminType.php +++ b/src/Kunstmaan/FormBundle/Form/CheckboxPagePartAdminType.php @@ -3,8 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This class represents the type for the CheckboxPagePart diff --git a/src/Kunstmaan/FormBundle/Form/ChoicePagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/ChoicePagePartAdminType.php index 4f0c4d4d1a..9279f9d311 100644 --- a/src/Kunstmaan/FormBundle/Form/ChoicePagePartAdminType.php +++ b/src/Kunstmaan/FormBundle/Form/ChoicePagePartAdminType.php @@ -3,8 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This class represents the type for the ChoicePagePart diff --git a/src/Kunstmaan/FormBundle/Form/EmailFormSubmissionType.php b/src/Kunstmaan/FormBundle/Form/EmailFormSubmissionType.php index 8b47e0feaa..fd5dde2028 100644 --- a/src/Kunstmaan/FormBundle/Form/EmailFormSubmissionType.php +++ b/src/Kunstmaan/FormBundle/Form/EmailFormSubmissionType.php @@ -3,9 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; -use Symfony\Component\Validator\Constraints\NotBlank; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * The type for the EmailFormSubmissionField @@ -37,4 +36,4 @@ public function getName() { return 'kunstmaan_formbundle_emailformsubmissiontype'; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/FormBundle/Form/EmailPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/EmailPagePartAdminType.php index 0a1a53a820..619d02534f 100644 --- a/src/Kunstmaan/FormBundle/Form/EmailPagePartAdminType.php +++ b/src/Kunstmaan/FormBundle/Form/EmailPagePartAdminType.php @@ -3,8 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This class represents the type for the EmailPagePart diff --git a/src/Kunstmaan/FormBundle/Form/FileUploadPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/FileUploadPagePartAdminType.php index 3ba966eec4..6f9f9c5a1a 100644 --- a/src/Kunstmaan/FormBundle/Form/FileUploadPagePartAdminType.php +++ b/src/Kunstmaan/FormBundle/Form/FileUploadPagePartAdminType.php @@ -3,8 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This class represents the type for the file FileUploadPagePart diff --git a/src/Kunstmaan/FormBundle/Form/MultiLineTextPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/MultiLineTextPagePartAdminType.php index 19d16cafbe..34f8ddf40b 100644 --- a/src/Kunstmaan/FormBundle/Form/MultiLineTextPagePartAdminType.php +++ b/src/Kunstmaan/FormBundle/Form/MultiLineTextPagePartAdminType.php @@ -3,8 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This class represents the type for the MultiLineTextPagePart diff --git a/src/Kunstmaan/FormBundle/Form/SingleLineTextPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/SingleLineTextPagePartAdminType.php index 0335d58eeb..710f7385c8 100644 --- a/src/Kunstmaan/FormBundle/Form/SingleLineTextPagePartAdminType.php +++ b/src/Kunstmaan/FormBundle/Form/SingleLineTextPagePartAdminType.php @@ -3,8 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This class represents the type for the SubleLineTextPagePart diff --git a/src/Kunstmaan/FormBundle/Form/SubmitButtonPagePartAdminType.php b/src/Kunstmaan/FormBundle/Form/SubmitButtonPagePartAdminType.php index d279ac0d43..0d3a01a068 100644 --- a/src/Kunstmaan/FormBundle/Form/SubmitButtonPagePartAdminType.php +++ b/src/Kunstmaan/FormBundle/Form/SubmitButtonPagePartAdminType.php @@ -3,8 +3,8 @@ namespace Kunstmaan\FormBundle\Form; use Symfony\Component\Form\AbstractType; -use Symfony\Component\OptionsResolver\OptionsResolverInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** * This class represents the type for the SubmitButtonPagePart diff --git a/src/Kunstmaan/FormBundle/Helper/FormHandler.php b/src/Kunstmaan/FormBundle/Helper/FormHandler.php index ffb237e8fa..44a57d7084 100644 --- a/src/Kunstmaan/FormBundle/Helper/FormHandler.php +++ b/src/Kunstmaan/FormBundle/Helper/FormHandler.php @@ -3,19 +3,15 @@ namespace Kunstmaan\FormBundle\Helper; use ArrayObject; - -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\HttpFoundation\Request; - use Doctrine\ORM\EntityManager; - use Kunstmaan\FormBundle\Entity\FormAdaptorInterface; use Kunstmaan\FormBundle\Entity\FormSubmission; use Kunstmaan\FormBundle\Entity\FormSubmissionField; use Kunstmaan\NodeBundle\Helper\RenderContext; - +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Routing\RouterInterface; /** diff --git a/src/Kunstmaan/FormBundle/Helper/FormHandlerInterface.php b/src/Kunstmaan/FormBundle/Helper/FormHandlerInterface.php index 1b048e25fd..0e13b27ed5 100644 --- a/src/Kunstmaan/FormBundle/Helper/FormHandlerInterface.php +++ b/src/Kunstmaan/FormBundle/Helper/FormHandlerInterface.php @@ -3,9 +3,8 @@ namespace Kunstmaan\FormBundle\Helper; use Kunstmaan\NodeBundle\Helper\RenderContext; - -use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; /** * The form handler handles everything from creating the form to handling the submitted form diff --git a/src/Kunstmaan/FormBundle/Helper/FormMailer.php b/src/Kunstmaan/FormBundle/Helper/FormMailer.php index 29d638eef8..0a3a12b52d 100644 --- a/src/Kunstmaan/FormBundle/Helper/FormMailer.php +++ b/src/Kunstmaan/FormBundle/Helper/FormMailer.php @@ -2,15 +2,13 @@ namespace Kunstmaan\FormBundle\Helper; +use Kunstmaan\FormBundle\Entity\FormSubmission; use Swift_Mailer; use Swift_Message; use Swift_Mime_Message; - use Symfony\Bundle\TwigBundle\TwigEngine; use Symfony\Component\DependencyInjection\ContainerInterface; -use Kunstmaan\FormBundle\Entity\FormSubmission; - /** * The form mailer */ diff --git a/src/Kunstmaan/FormBundle/Helper/FormPageInterface.php b/src/Kunstmaan/FormBundle/Helper/FormPageInterface.php index 291fe2eb36..32fb927e22 100644 --- a/src/Kunstmaan/FormBundle/Helper/FormPageInterface.php +++ b/src/Kunstmaan/FormBundle/Helper/FormPageInterface.php @@ -2,9 +2,8 @@ namespace Kunstmaan\FormBundle\Helper; -use Symfony\Component\Routing\RouterInterface; - use Kunstmaan\NodeBundle\Helper\RenderContext; +use Symfony\Component\Routing\RouterInterface; /** * FormPageInterface diff --git a/src/Kunstmaan/FormBundle/Helper/Menu/FormSubmissionsMenuAdaptor.php b/src/Kunstmaan/FormBundle/Helper/Menu/FormSubmissionsMenuAdaptor.php index e4d34c5aff..9d651a71e9 100644 --- a/src/Kunstmaan/FormBundle/Helper/Menu/FormSubmissionsMenuAdaptor.php +++ b/src/Kunstmaan/FormBundle/Helper/Menu/FormSubmissionsMenuAdaptor.php @@ -2,11 +2,10 @@ namespace Kunstmaan\FormBundle\Helper\Menu; -use Kunstmaan\AdminBundle\Helper\Menu\MenuItem; -use Kunstmaan\AdminBundle\Helper\Menu\MenuBuilder; use Kunstmaan\AdminBundle\Helper\Menu\MenuAdaptorInterface; +use Kunstmaan\AdminBundle\Helper\Menu\MenuBuilder; +use Kunstmaan\AdminBundle\Helper\Menu\MenuItem; use Kunstmaan\AdminBundle\Helper\Menu\TopMenuItem; - use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Kunstmaan/FormBundle/Tests/AdminList/FormPageAdminListConfiguratorTest.php b/src/Kunstmaan/FormBundle/Tests/AdminList/FormPageAdminListConfiguratorTest.php index 5d65d5b0aa..2420ac89ba 100644 --- a/src/Kunstmaan/FormBundle/Tests/AdminList/FormPageAdminListConfiguratorTest.php +++ b/src/Kunstmaan/FormBundle/Tests/AdminList/FormPageAdminListConfiguratorTest.php @@ -2,11 +2,10 @@ namespace Kunstmaan\FormBundle\Tests\AdminList; +use Doctrine\ORM\QueryBuilder; use Kunstmaan\FormBundle\AdminList\FormPageAdminListConfigurator; -use Kunstmaan\NodeBundle\Tests\Stubs\TestRepository; use Kunstmaan\FormBundle\Tests\Stubs\TestConfiguration; - -use Doctrine\ORM\QueryBuilder; +use Kunstmaan\NodeBundle\Tests\Stubs\TestRepository; /** * This test tests the FormPageAdminListConfigurator diff --git a/src/Kunstmaan/FormBundle/Tests/Entity/FormSubmissionFieldTest.php b/src/Kunstmaan/FormBundle/Tests/Entity/FormSubmissionFieldTest.php index 04a7d8a0dc..c8d3c24acb 100644 --- a/src/Kunstmaan/FormBundle/Tests/Entity/FormSubmissionFieldTest.php +++ b/src/Kunstmaan/FormBundle/Tests/Entity/FormSubmissionFieldTest.php @@ -1,7 +1,7 @@ routeCollection; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/LanguageChooserBundle/Tests/LocaleGuesser/UrlLocaleGuesserTest.php b/src/Kunstmaan/LanguageChooserBundle/Tests/LocaleGuesser/UrlLocaleGuesserTest.php index 95f11f51e4..e317c826be 100644 --- a/src/Kunstmaan/LanguageChooserBundle/Tests/LocaleGuesser/UrlLocaleGuesserTest.php +++ b/src/Kunstmaan/LanguageChooserBundle/Tests/LocaleGuesser/UrlLocaleGuesserTest.php @@ -4,8 +4,8 @@ use Kunstmaan\LanguageChooserBundle\LocaleGuesser\UrlLocaleGuesser; use Lunetics\LocaleBundle\Validator\MetaValidator; -use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\ParameterBag; +use Symfony\Component\HttpFoundation\Request; /** * UrlLocaleGuesserTest diff --git a/src/Kunstmaan/LiveReloadBundle/DependencyInjection/KunstmaanLiveReloadExtension.php b/src/Kunstmaan/LiveReloadBundle/DependencyInjection/KunstmaanLiveReloadExtension.php index e12111d61f..5c81638310 100644 --- a/src/Kunstmaan/LiveReloadBundle/DependencyInjection/KunstmaanLiveReloadExtension.php +++ b/src/Kunstmaan/LiveReloadBundle/DependencyInjection/KunstmaanLiveReloadExtension.php @@ -2,10 +2,10 @@ namespace Kunstmaan\LiveReloadBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Kunstmaan/LiveReloadBundle/EventListener/DisableCacheListener.php b/src/Kunstmaan/LiveReloadBundle/EventListener/DisableCacheListener.php index 2ab1dbe98e..8a65332148 100644 --- a/src/Kunstmaan/LiveReloadBundle/EventListener/DisableCacheListener.php +++ b/src/Kunstmaan/LiveReloadBundle/EventListener/DisableCacheListener.php @@ -3,10 +3,9 @@ namespace Kunstmaan\LiveReloadBundle\EventListener; use Symfony\Component\EventDispatcher\EventSubscriberInterface; - -use Symfony\Component\HttpKernel\Event\FilterResponseEvent, - Symfony\Component\HttpKernel\HttpKernelInterface, - Symfony\Component\HttpKernel\KernelEvents; +use Symfony\Component\HttpKernel\Event\FilterResponseEvent; +use Symfony\Component\HttpKernel\HttpKernelInterface; +use Symfony\Component\HttpKernel\KernelEvents; class DisableCacheListener implements EventSubscriberInterface { diff --git a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php index 05790cfda5..0b75248f22 100644 --- a/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php +++ b/src/Kunstmaan/MediaBundle/AdminList/MediaAdminListConfigurator.php @@ -4,7 +4,6 @@ use Doctrine\ORM\EntityManager; use Doctrine\ORM\QueryBuilder; -use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; use Kunstmaan\AdminListBundle\AdminList\Configurator\AbstractDoctrineORMAdminListConfigurator; use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM; use Kunstmaan\MediaBundle\AdminList\ItemAction\MediaDeleteItemAction; @@ -188,4 +187,4 @@ public function adaptQueryBuilder(QueryBuilder $queryBuilder) } } } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Command/MigrateNameCommand.php b/src/Kunstmaan/MediaBundle/Command/MigrateNameCommand.php index 48f8388321..eb7a62a11a 100644 --- a/src/Kunstmaan/MediaBundle/Command/MigrateNameCommand.php +++ b/src/Kunstmaan/MediaBundle/Command/MigrateNameCommand.php @@ -4,7 +4,6 @@ use Doctrine\ORM\EntityManager; use Kunstmaan\MediaBundle\Entity\Media; -use Kunstmaan\MediaBundle\Repository\FolderRepository; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -55,4 +54,4 @@ public function execute(InputInterface $input, OutputInterface $output) } $output->writeln('' . $updates . ' media files have been migrated.'); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Controller/AviaryController.php b/src/Kunstmaan/MediaBundle/Controller/AviaryController.php index 3a5436f0b6..3637e2e50c 100644 --- a/src/Kunstmaan/MediaBundle/Controller/AviaryController.php +++ b/src/Kunstmaan/MediaBundle/Controller/AviaryController.php @@ -5,7 +5,6 @@ use Kunstmaan\MediaBundle\Entity\Folder; use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Helper\MediaManager; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Kunstmaan/MediaBundle/Controller/ChooserController.php b/src/Kunstmaan/MediaBundle/Controller/ChooserController.php index 41fec243fd..bb5fee950a 100644 --- a/src/Kunstmaan/MediaBundle/Controller/ChooserController.php +++ b/src/Kunstmaan/MediaBundle/Controller/ChooserController.php @@ -8,8 +8,6 @@ use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Helper\Media\AbstractMediaHandler; use Kunstmaan\MediaBundle\Helper\MediaManager; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Kunstmaan/MediaBundle/Controller/FolderController.php b/src/Kunstmaan/MediaBundle/Controller/FolderController.php index 234462df1b..41d6d009a0 100644 --- a/src/Kunstmaan/MediaBundle/Controller/FolderController.php +++ b/src/Kunstmaan/MediaBundle/Controller/FolderController.php @@ -6,9 +6,6 @@ use Kunstmaan\MediaBundle\AdminList\MediaAdminListConfigurator; use Kunstmaan\MediaBundle\Entity\Folder; use Kunstmaan\MediaBundle\Form\FolderType; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Kunstmaan/MediaBundle/Controller/IconFontController.php b/src/Kunstmaan/MediaBundle/Controller/IconFontController.php index e411a9492f..99403086f8 100644 --- a/src/Kunstmaan/MediaBundle/Controller/IconFontController.php +++ b/src/Kunstmaan/MediaBundle/Controller/IconFontController.php @@ -2,8 +2,6 @@ namespace Kunstmaan\MediaBundle\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Kunstmaan/MediaBundle/Controller/MediaController.php b/src/Kunstmaan/MediaBundle/Controller/MediaController.php index d96609436b..0022e234a6 100644 --- a/src/Kunstmaan/MediaBundle/Controller/MediaController.php +++ b/src/Kunstmaan/MediaBundle/Controller/MediaController.php @@ -5,9 +5,6 @@ use Kunstmaan\MediaBundle\Entity\Folder; use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Helper\MediaManager; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\File\File; use Symfony\Component\HttpFoundation\JsonResponse; diff --git a/src/Kunstmaan/MediaBundle/DataFixtures/ORM/FolderFixtures.php b/src/Kunstmaan/MediaBundle/DataFixtures/ORM/FolderFixtures.php index f89199bdba..00d0c113d3 100644 --- a/src/Kunstmaan/MediaBundle/DataFixtures/ORM/FolderFixtures.php +++ b/src/Kunstmaan/MediaBundle/DataFixtures/ORM/FolderFixtures.php @@ -4,8 +4,8 @@ use Doctrine\Common\DataFixtures\AbstractFixture; use Doctrine\Common\DataFixtures\OrderedFixtureInterface; -use Kunstmaan\MediaBundle\Entity\Folder; use Doctrine\Common\Persistence\ObjectManager; +use Kunstmaan\MediaBundle\Entity\Folder; /** * Fixtures that make a general media-folder for a project @@ -135,4 +135,4 @@ public function getOrder() { return 1; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/DependencyInjection/Compiler/MediaHandlerCompilerPass.php b/src/Kunstmaan/MediaBundle/DependencyInjection/Compiler/MediaHandlerCompilerPass.php index d120aa8025..a1e3b20dbd 100644 --- a/src/Kunstmaan/MediaBundle/DependencyInjection/Compiler/MediaHandlerCompilerPass.php +++ b/src/Kunstmaan/MediaBundle/DependencyInjection/Compiler/MediaHandlerCompilerPass.php @@ -2,8 +2,8 @@ namespace Kunstmaan\MediaBundle\DependencyInjection\Compiler; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Reference; /** diff --git a/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php b/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php index 0246169279..5bdfc23f13 100644 --- a/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php +++ b/src/Kunstmaan/MediaBundle/DependencyInjection/KunstmaanMediaExtension.php @@ -1,13 +1,11 @@ mediaManager->saveMedia($entity, $new); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Form/File/FileType.php b/src/Kunstmaan/MediaBundle/Form/File/FileType.php index a9bab8b726..32947e1143 100644 --- a/src/Kunstmaan/MediaBundle/Form/File/FileType.php +++ b/src/Kunstmaan/MediaBundle/Form/File/FileType.php @@ -2,7 +2,6 @@ namespace Kunstmaan\MediaBundle\Form\File; -use Doctrine\ORM\EntityRepository; use Kunstmaan\MediaBundle\Repository\FolderRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -129,4 +128,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ) ); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Form/FolderType.php b/src/Kunstmaan/MediaBundle/Form/FolderType.php index f9483fd910..5a410853db 100644 --- a/src/Kunstmaan/MediaBundle/Form/FolderType.php +++ b/src/Kunstmaan/MediaBundle/Form/FolderType.php @@ -2,8 +2,6 @@ namespace Kunstmaan\MediaBundle\Form; -use Doctrine\ORM\EntityRepository; -use Doctrine\ORM\QueryBuilder; use Kunstmaan\MediaBundle\Entity\Folder; use Kunstmaan\MediaBundle\Repository\FolderRepository; use Symfony\Component\Form\AbstractType; @@ -95,4 +93,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ) ); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Form/RemoteAudio/RemoteAudioType.php b/src/Kunstmaan/MediaBundle/Form/RemoteAudio/RemoteAudioType.php index 1fe8dba71c..ca40342e54 100644 --- a/src/Kunstmaan/MediaBundle/Form/RemoteAudio/RemoteAudioType.php +++ b/src/Kunstmaan/MediaBundle/Form/RemoteAudio/RemoteAudioType.php @@ -2,7 +2,6 @@ namespace Kunstmaan\MediaBundle\Form\RemoteAudio; -use Doctrine\ORM\EntityRepository; use Kunstmaan\MediaBundle\Repository\FolderRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -121,4 +120,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ) ); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Form/RemoteSlide/RemoteSlideType.php b/src/Kunstmaan/MediaBundle/Form/RemoteSlide/RemoteSlideType.php index 0ebc7c76a4..436c698938 100644 --- a/src/Kunstmaan/MediaBundle/Form/RemoteSlide/RemoteSlideType.php +++ b/src/Kunstmaan/MediaBundle/Form/RemoteSlide/RemoteSlideType.php @@ -2,7 +2,6 @@ namespace Kunstmaan\MediaBundle\Form\RemoteSlide; -use Doctrine\ORM\EntityRepository; use Kunstmaan\MediaBundle\Repository\FolderRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -121,4 +120,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ) ); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Form/RemoteVideo/RemoteVideoType.php b/src/Kunstmaan/MediaBundle/Form/RemoteVideo/RemoteVideoType.php index 42dbd9269c..6e475a4046 100644 --- a/src/Kunstmaan/MediaBundle/Form/RemoteVideo/RemoteVideoType.php +++ b/src/Kunstmaan/MediaBundle/Form/RemoteVideo/RemoteVideoType.php @@ -2,7 +2,6 @@ namespace Kunstmaan\MediaBundle\Form\RemoteVideo; -use Doctrine\ORM\EntityRepository; use Kunstmaan\MediaBundle\Repository\FolderRepository; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; @@ -145,4 +144,4 @@ public function setDefaultOptions(OptionsResolverInterface $resolver) ) ); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Helper/File/FileHelper.php b/src/Kunstmaan/MediaBundle/Helper/File/FileHelper.php index 7c0f6b1a20..2ae66dee30 100644 --- a/src/Kunstmaan/MediaBundle/Helper/File/FileHelper.php +++ b/src/Kunstmaan/MediaBundle/Helper/File/FileHelper.php @@ -3,12 +3,10 @@ namespace Kunstmaan\MediaBundle\Helper\File; use Kunstmaan\MediaBundle\Entity\Folder; -use Symfony\Component\HttpFoundation\File\File; -use Symfony\Component\HttpFoundation\File\UploadedFile; - use Kunstmaan\MediaBundle\Entity\Media; - use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException; +use Symfony\Component\HttpFoundation\File\File; +use Symfony\Component\HttpFoundation\File\UploadedFile; /** * FileHelper @@ -187,4 +185,4 @@ public function __destruct() unlink($this->path); } } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Helper/File/SVGMimeTypeGuesser.php b/src/Kunstmaan/MediaBundle/Helper/File/SVGMimeTypeGuesser.php index 00b7d91d64..3f589d4e4c 100644 --- a/src/Kunstmaan/MediaBundle/Helper/File/SVGMimeTypeGuesser.php +++ b/src/Kunstmaan/MediaBundle/Helper/File/SVGMimeTypeGuesser.php @@ -2,11 +2,9 @@ namespace Kunstmaan\MediaBundle\Helper\File; -use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface; -use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException; use Symfony\Component\HttpFoundation\File\Exception\AccessDeniedException; -use Symfony\Component\Validator\Constraints\NotBlank; -use Symfony\Component\Validator\Constraints\Type; +use Symfony\Component\HttpFoundation\File\Exception\FileNotFoundException; +use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesserInterface; /** * SVGMimeTypeGuesser @@ -63,4 +61,4 @@ public function guess($path) return; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Helper/Image/ImageHandler.php b/src/Kunstmaan/MediaBundle/Helper/Image/ImageHandler.php index 0bc0066acd..bfc46ea8ad 100644 --- a/src/Kunstmaan/MediaBundle/Helper/Image/ImageHandler.php +++ b/src/Kunstmaan/MediaBundle/Helper/Image/ImageHandler.php @@ -2,9 +2,9 @@ namespace Kunstmaan\MediaBundle\Helper\Image; -use Symfony\Component\HttpFoundation\File\File; -use Kunstmaan\MediaBundle\Helper\File\FileHandler; use Kunstmaan\MediaBundle\Entity\Media; +use Kunstmaan\MediaBundle\Helper\File\FileHandler; +use Symfony\Component\HttpFoundation\File\File; /** * FileHandler diff --git a/src/Kunstmaan/MediaBundle/Helper/Menu/MediaMenuAdaptor.php b/src/Kunstmaan/MediaBundle/Helper/Menu/MediaMenuAdaptor.php index 8f282c3291..36d4c5a083 100644 --- a/src/Kunstmaan/MediaBundle/Helper/Menu/MediaMenuAdaptor.php +++ b/src/Kunstmaan/MediaBundle/Helper/Menu/MediaMenuAdaptor.php @@ -2,14 +2,13 @@ namespace Kunstmaan\MediaBundle\Helper\Menu; -use Doctrine\ORM\EntityManager; -use Kunstmaan\MediaBundle\Repository\FolderRepository; -use Symfony\Component\HttpFoundation\Request; -use Kunstmaan\AdminBundle\Helper\Menu\MenuItem; use Kunstmaan\AdminBundle\Helper\Menu\MenuAdaptorInterface; use Kunstmaan\AdminBundle\Helper\Menu\MenuBuilder; +use Kunstmaan\AdminBundle\Helper\Menu\MenuItem; use Kunstmaan\AdminBundle\Helper\Menu\TopMenuItem; use Kunstmaan\MediaBundle\Entity\Folder; +use Kunstmaan\MediaBundle\Repository\FolderRepository; +use Symfony\Component\HttpFoundation\Request; /** * The Media Menu Adaptor @@ -69,4 +68,4 @@ public function adaptChildren(MenuBuilder $menu, array &$children, MenuItem $par } } } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Helper/RemoteAudio/RemoteAudioHandler.php b/src/Kunstmaan/MediaBundle/Helper/RemoteAudio/RemoteAudioHandler.php index 514cea063e..31733cb680 100644 --- a/src/Kunstmaan/MediaBundle/Helper/RemoteAudio/RemoteAudioHandler.php +++ b/src/Kunstmaan/MediaBundle/Helper/RemoteAudio/RemoteAudioHandler.php @@ -2,9 +2,9 @@ namespace Kunstmaan\MediaBundle\Helper\RemoteAudio; +use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Form\RemoteAudio\RemoteAudioType; use Kunstmaan\MediaBundle\Helper\Media\AbstractMediaHandler; -use Kunstmaan\MediaBundle\Entity\Media; /** * RemoteAudioStrategy diff --git a/src/Kunstmaan/MediaBundle/Helper/RemoteAudio/RemoteAudioHelper.php b/src/Kunstmaan/MediaBundle/Helper/RemoteAudio/RemoteAudioHelper.php index 441e9e94f3..00a06d686a 100644 --- a/src/Kunstmaan/MediaBundle/Helper/RemoteAudio/RemoteAudioHelper.php +++ b/src/Kunstmaan/MediaBundle/Helper/RemoteAudio/RemoteAudioHelper.php @@ -2,9 +2,9 @@ namespace Kunstmaan\MediaBundle\Helper\RemoteAudio; +use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Helper\Remote\AbstractRemoteHelper; use Kunstmaan\MediaBundle\Helper\Remote\RemoteInterface; -use Kunstmaan\MediaBundle\Entity\Media; /** * Kunstmaan\MediaBundle\Entity\Audio diff --git a/src/Kunstmaan/MediaBundle/Helper/RemoteSlide/RemoteSlideHandler.php b/src/Kunstmaan/MediaBundle/Helper/RemoteSlide/RemoteSlideHandler.php index eae2222296..1b1051a41e 100644 --- a/src/Kunstmaan/MediaBundle/Helper/RemoteSlide/RemoteSlideHandler.php +++ b/src/Kunstmaan/MediaBundle/Helper/RemoteSlide/RemoteSlideHandler.php @@ -2,9 +2,9 @@ namespace Kunstmaan\MediaBundle\Helper\RemoteSlide; +use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Form\RemoteSlide\RemoteSlideType; use Kunstmaan\MediaBundle\Helper\Media\AbstractMediaHandler; -use Kunstmaan\MediaBundle\Entity\Media; /** * RemoteSlideStrategy @@ -204,4 +204,4 @@ public function getAddFolderActions() ) ); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Helper/RemoteSlide/RemoteSlideHelper.php b/src/Kunstmaan/MediaBundle/Helper/RemoteSlide/RemoteSlideHelper.php index b80fda9634..2af7c44164 100644 --- a/src/Kunstmaan/MediaBundle/Helper/RemoteSlide/RemoteSlideHelper.php +++ b/src/Kunstmaan/MediaBundle/Helper/RemoteSlide/RemoteSlideHelper.php @@ -2,9 +2,9 @@ namespace Kunstmaan\MediaBundle\Helper\RemoteSlide; +use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Helper\Remote\AbstractRemoteHelper; use Kunstmaan\MediaBundle\Helper\Remote\RemoteInterface; -use Kunstmaan\MediaBundle\Entity\Media; /** * Kunstmaan\MediaBundle\Entity\Video diff --git a/src/Kunstmaan/MediaBundle/Helper/RemoteVideo/RemoteVideoHandler.php b/src/Kunstmaan/MediaBundle/Helper/RemoteVideo/RemoteVideoHandler.php index 8911aa9c4b..0af55ab7e8 100644 --- a/src/Kunstmaan/MediaBundle/Helper/RemoteVideo/RemoteVideoHandler.php +++ b/src/Kunstmaan/MediaBundle/Helper/RemoteVideo/RemoteVideoHandler.php @@ -2,9 +2,9 @@ namespace Kunstmaan\MediaBundle\Helper\RemoteVideo; +use Kunstmaan\MediaBundle\Entity\Media; use Kunstmaan\MediaBundle\Form\RemoteVideo\RemoteVideoType; use Kunstmaan\MediaBundle\Helper\Media\AbstractMediaHandler; -use Kunstmaan\MediaBundle\Entity\Media; /** * RemoteVideoStrategy @@ -261,4 +261,4 @@ public function getAddFolderActions() ) ); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Helper/Services/MediaCreatorService.php b/src/Kunstmaan/MediaBundle/Helper/Services/MediaCreatorService.php index ebacf68d98..19abbcbdf8 100644 --- a/src/Kunstmaan/MediaBundle/Helper/Services/MediaCreatorService.php +++ b/src/Kunstmaan/MediaBundle/Helper/Services/MediaCreatorService.php @@ -4,8 +4,8 @@ use Doctrine\ORM\EntityManager; use Kunstmaan\MediaBundle\Entity\Folder; -use Kunstmaan\MediaBundle\Repository\FolderRepository; use Kunstmaan\MediaBundle\Entity\Media; +use Kunstmaan\MediaBundle\Repository\FolderRepository; use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\HttpFoundation\File\File; diff --git a/src/Kunstmaan/MediaBundle/KunstmaanMediaBundle.php b/src/Kunstmaan/MediaBundle/KunstmaanMediaBundle.php index 90a6cc1eaf..98842fcfad 100644 --- a/src/Kunstmaan/MediaBundle/KunstmaanMediaBundle.php +++ b/src/Kunstmaan/MediaBundle/KunstmaanMediaBundle.php @@ -2,10 +2,8 @@ namespace Kunstmaan\MediaBundle; -use Symfony\Component\DependencyInjection\ContainerBuilder; - use Kunstmaan\MediaBundle\DependencyInjection\Compiler\MediaHandlerCompilerPass; - +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Bundle\Bundle; /** diff --git a/src/Kunstmaan/MediaBundle/Repository/MediaRepository.php b/src/Kunstmaan/MediaBundle/Repository/MediaRepository.php index 78a82f0b9f..80c5d3223c 100644 --- a/src/Kunstmaan/MediaBundle/Repository/MediaRepository.php +++ b/src/Kunstmaan/MediaBundle/Repository/MediaRepository.php @@ -2,9 +2,9 @@ namespace Kunstmaan\MediaBundle\Repository; -use Kunstmaan\MediaBundle\Entity\Media; -use Doctrine\ORM\EntityRepository; use Doctrine\ORM\EntityNotFoundException; +use Doctrine\ORM\EntityRepository; +use Kunstmaan\MediaBundle\Entity\Media; /** * MediaRepository @@ -65,4 +65,4 @@ public function getPicture($pictureId) return $picture; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/MediaBundle/Tests/Entity/MediaTest.php b/src/Kunstmaan/MediaBundle/Tests/Entity/MediaTest.php index 90680841b4..fe1ff874f0 100644 --- a/src/Kunstmaan/MediaBundle/Tests/Entity/MediaTest.php +++ b/src/Kunstmaan/MediaBundle/Tests/Entity/MediaTest.php @@ -2,7 +2,6 @@ namespace Kunstmaan\MediaBundle\Tests\Entity; use Kunstmaan\MediaBundle\Entity\Folder; - use Kunstmaan\MediaBundle\Entity\Media; /** diff --git a/src/Kunstmaan/MediaBundle/Tests/Form/AbstractTypeTest.php b/src/Kunstmaan/MediaBundle/Tests/Form/AbstractTypeTest.php index 4202b7a2f0..dbd598605a 100644 --- a/src/Kunstmaan/MediaBundle/Tests/Form/AbstractTypeTest.php +++ b/src/Kunstmaan/MediaBundle/Tests/Form/AbstractTypeTest.php @@ -1,13 +1,13 @@ setId(5); - $this->object->setMedia($media); + $this->object->setMedia($media); $this->assertEquals(5, $this->object->getMedia()->getId()); } diff --git a/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/ImagePagePartTest.php b/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/ImagePagePartTest.php index 31efbe040a..d7d50705eb 100644 --- a/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/ImagePagePartTest.php +++ b/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/ImagePagePartTest.php @@ -2,10 +2,8 @@ namespace Kunstmaan\MediaPagePartBundle\Tests\Entity; use Kunstmaan\MediaBundle\Entity\Media; - -use Kunstmaan\MediaPagePartBundle\Form\ImagePagePartAdminType; - use Kunstmaan\MediaPagePartBundle\Entity\ImagePagePart; +use Kunstmaan\MediaPagePartBundle\Form\ImagePagePartAdminType; /** * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 11:05:56. @@ -34,7 +32,7 @@ public function testGetSetOpenInNewWindow() { $this->object->setOpenInNewWindow(true); $this->assertEquals(true, $this->object->getOpenInNewWindow()); - $this->object->setOpenInNewWindow(false); + $this->object->setOpenInNewWindow(false); $this->assertEquals(false, $this->object->getOpenInNewWindow()); } diff --git a/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/SlidePagePartTest.php b/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/SlidePagePartTest.php index 678b425a04..fe207dfbc6 100644 --- a/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/SlidePagePartTest.php +++ b/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/SlidePagePartTest.php @@ -2,10 +2,8 @@ namespace Kunstmaan\MediaPagePartBundle\Tests\Entity; use Kunstmaan\MediaBundle\Entity\Media; - -use Kunstmaan\MediaPagePartBundle\Form\SlidePagePartAdminType; - use Kunstmaan\MediaPagePartBundle\Entity\SlidePagePart; +use Kunstmaan\MediaPagePartBundle\Form\SlidePagePartAdminType; /** * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 11:05:56. diff --git a/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/VideoPagePartTest.php b/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/VideoPagePartTest.php index b2a527e01d..5baa29e554 100644 --- a/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/VideoPagePartTest.php +++ b/src/Kunstmaan/MediaPagePartBundle/Tests/Entity/VideoPagePartTest.php @@ -2,10 +2,8 @@ namespace Kunstmaan\MediaPagePartBundle\Tests\Entity; use Kunstmaan\MediaBundle\Entity\Media; - -use Kunstmaan\MediaPagePartBundle\Form\VideoPagePartAdminType; - use Kunstmaan\MediaPagePartBundle\Entity\VideoPagePart; +use Kunstmaan\MediaPagePartBundle\Form\VideoPagePartAdminType; /** * Generated by PHPUnit_SkeletonGenerator on 2012-10-01 at 11:05:56. diff --git a/src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php b/src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php index 8d5bbd95e5..cb1dff47bd 100644 --- a/src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php +++ b/src/Kunstmaan/NodeBundle/AdminList/NodeAdminListConfigurator.php @@ -2,17 +2,15 @@ namespace Kunstmaan\NodeBundle\AdminList; +use Doctrine\ORM\EntityManager; +use Doctrine\ORM\QueryBuilder; use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; -use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM\DateFilterType; -use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM\BooleanFilterType; -use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM\StringFilterType; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionDefinition; use Kunstmaan\AdminListBundle\AdminList\Configurator\AbstractDoctrineORMAdminListConfigurator; +use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM\BooleanFilterType; +use Kunstmaan\AdminListBundle\AdminList\FilterType\ORM\StringFilterType; use Kunstmaan\NodeBundle\Entity\Node; -use Doctrine\ORM\EntityManager; -use Doctrine\ORM\QueryBuilder; - /** * NodeAdminListConfigurator */ diff --git a/src/Kunstmaan/NodeBundle/Command/ConvertSequenceNumberToWeightCommand.php b/src/Kunstmaan/NodeBundle/Command/ConvertSequenceNumberToWeightCommand.php index 4a4fe3f31f..d0ad512761 100644 --- a/src/Kunstmaan/NodeBundle/Command/ConvertSequenceNumberToWeightCommand.php +++ b/src/Kunstmaan/NodeBundle/Command/ConvertSequenceNumberToWeightCommand.php @@ -3,9 +3,7 @@ namespace Kunstmaan\NodeBundle\Command; use Doctrine\ORM\EntityManager; - use Kunstmaan\NodeBundle\Entity\NodeTranslation; - use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/src/Kunstmaan/NodeBundle/Command/CronUpdateNodeCommand.php b/src/Kunstmaan/NodeBundle/Command/CronUpdateNodeCommand.php index 3d211ea380..f41e9a7950 100644 --- a/src/Kunstmaan/NodeBundle/Command/CronUpdateNodeCommand.php +++ b/src/Kunstmaan/NodeBundle/Command/CronUpdateNodeCommand.php @@ -2,11 +2,7 @@ namespace Kunstmaan\NodeBundle\Command; -use Kunstmaan\NodeBundle\Entity\NodeTranslation; use Kunstmaan\NodeBundle\Entity\QueuedNodeTranslationAction; -use Kunstmaan\NodeBundle\Event\Events; -use Kunstmaan\NodeBundle\Event\NodeEvent; - use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/src/Kunstmaan/NodeBundle/Command/InitAclCommand.php b/src/Kunstmaan/NodeBundle/Command/InitAclCommand.php index 15c43ec394..5ce86c05b5 100644 --- a/src/Kunstmaan/NodeBundle/Command/InitAclCommand.php +++ b/src/Kunstmaan/NodeBundle/Command/InitAclCommand.php @@ -3,17 +3,14 @@ namespace Kunstmaan\NodeBundle\Command; use Doctrine\ORM\EntityManager; - use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\MaskBuilder; - -use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; -use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface; use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; -use Symfony\Component\Security\Acl\Domain\ObjectIdentity; use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; use Symfony\Component\Security\Acl\Exception\AclNotFoundException; +use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface; +use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; /** * Basic initialization of ACL entries for all nodes. diff --git a/src/Kunstmaan/NodeBundle/Command/UpdateUrlsCommand.php b/src/Kunstmaan/NodeBundle/Command/UpdateUrlsCommand.php index 66408b51be..10b29b3fa1 100644 --- a/src/Kunstmaan/NodeBundle/Command/UpdateUrlsCommand.php +++ b/src/Kunstmaan/NodeBundle/Command/UpdateUrlsCommand.php @@ -3,7 +3,6 @@ namespace Kunstmaan\NodeBundle\Command; use Kunstmaan\NodeBundle\Entity\NodeTranslation; - use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; diff --git a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php index ee39b3aac7..bba17162b6 100644 --- a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php +++ b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php @@ -3,45 +3,38 @@ namespace Kunstmaan\NodeBundle\Controller; use DateTime; -use Kunstmaan\AdminBundle\Entity\BaseUser; -use Kunstmaan\NodeBundle\Form\NodeMenuTabTranslationAdminType; -use Kunstmaan\NodeBundle\Form\NodeMenuTabAdminType; -use InvalidArgumentException; - -use Doctrine\ORM\EntityManager; use Doctrine\Common\Collections\ArrayCollection; - -use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; -use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface; -use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; -use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Symfony\Component\Security\Acl\Model\EntryInterface; - -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; - +use Doctrine\ORM\EntityManager; +use InvalidArgumentException; +use Kunstmaan\AdminBundle\Entity\BaseUser; +use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget; +use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\Tab; +use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\TabPane; use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap; use Kunstmaan\AdminListBundle\AdminList\AdminList; use Kunstmaan\NodeBundle\AdminList\NodeAdminListConfigurator; +use Kunstmaan\NodeBundle\Entity\HasNodeInterface; use Kunstmaan\NodeBundle\Entity\Node; +use Kunstmaan\NodeBundle\Entity\NodeTranslation; +use Kunstmaan\NodeBundle\Entity\NodeVersion; +use Kunstmaan\NodeBundle\Event\AdaptFormEvent; +use Kunstmaan\NodeBundle\Event\CopyPageTranslationNodeEvent; use Kunstmaan\NodeBundle\Event\Events; use Kunstmaan\NodeBundle\Event\NodeEvent; -use Kunstmaan\NodeBundle\Event\AdaptFormEvent; use Kunstmaan\NodeBundle\Event\RevertNodeAction; -use Kunstmaan\NodeBundle\Entity\HasNodeInterface; -use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\Tab; -use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\TabPane; +use Kunstmaan\NodeBundle\Form\NodeMenuTabAdminType; +use Kunstmaan\NodeBundle\Form\NodeMenuTabTranslationAdminType; use Kunstmaan\NodeBundle\Repository\NodeVersionRepository; -use Kunstmaan\NodeBundle\Event\CopyPageTranslationNodeEvent; -use Kunstmaan\NodeBundle\Entity\NodeVersion; -use Kunstmaan\NodeBundle\Entity\NodeTranslation; use Kunstmaan\UtilitiesBundle\Helper\ClassLookup; -use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; +use Symfony\Component\Security\Acl\Model\EntryInterface; +use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface; +use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; +use Symfony\Component\Security\Core\Exception\AccessDeniedException; +use Symfony\Component\Security\Core\SecurityContextInterface; /** * NodeAdminController diff --git a/src/Kunstmaan/NodeBundle/Controller/SlugController.php b/src/Kunstmaan/NodeBundle/Controller/SlugController.php index c6e4dd01b3..2d57fbb9bb 100644 --- a/src/Kunstmaan/NodeBundle/Controller/SlugController.php +++ b/src/Kunstmaan/NodeBundle/Controller/SlugController.php @@ -9,14 +9,10 @@ use Kunstmaan\NodeBundle\Entity\NodeTranslation; use Kunstmaan\NodeBundle\Helper\NodeMenu; use Kunstmaan\NodeBundle\Helper\RenderContext; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; -use Symfony\Component\Routing\Exception\ResourceNotFoundException; use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\Security\Core\SecurityContextInterface; diff --git a/src/Kunstmaan/NodeBundle/Controller/WidgetsController.php b/src/Kunstmaan/NodeBundle/Controller/WidgetsController.php index f55c7fa486..6b06d7bdea 100644 --- a/src/Kunstmaan/NodeBundle/Controller/WidgetsController.php +++ b/src/Kunstmaan/NodeBundle/Controller/WidgetsController.php @@ -4,15 +4,9 @@ use Doctrine\ORM\EntityManager; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionDefinition; -use Kunstmaan\NodeBundle\Helper\Menu\SimpleTreeView; -use Kunstmaan\NodeBundle\Helper\NodeMenu; -use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Kunstmaan\NodeBundle\Helper\Menu\SimpleTreeView; use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\Security\Core\SecurityContextInterface; /** * WidgetsController diff --git a/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanNodeExtension.php b/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanNodeExtension.php index cdafd2a052..b1f36c2288 100644 --- a/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanNodeExtension.php +++ b/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanNodeExtension.php @@ -2,11 +2,11 @@ namespace Kunstmaan\NodeBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface; +use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanViewExtension.php b/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanViewExtension.php index fe63cfcc0e..42596301ae 100644 --- a/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanViewExtension.php +++ b/src/Kunstmaan/NodeBundle/DependencyInjection/KunstmaanViewExtension.php @@ -2,10 +2,10 @@ namespace Kunstmaan\NodeBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Kunstmaan/NodeBundle/Entity/AbstractControllerAction.php b/src/Kunstmaan/NodeBundle/Entity/AbstractControllerAction.php index 4ff4c9dc7b..593090299f 100644 --- a/src/Kunstmaan/NodeBundle/Entity/AbstractControllerAction.php +++ b/src/Kunstmaan/NodeBundle/Entity/AbstractControllerAction.php @@ -3,10 +3,8 @@ namespace Kunstmaan\NodeBundle\Entity; use Doctrine\ORM\Mapping as ORM; - use Kunstmaan\AdminBundle\Entity\AbstractEntity; use Kunstmaan\NodeBundle\Form\ControllerActionAdminType; - use Symfony\Component\Form\AbstractType; use Symfony\Component\Validator\Constraints as Assert; diff --git a/src/Kunstmaan/NodeBundle/Entity/AbstractPage.php b/src/Kunstmaan/NodeBundle/Entity/AbstractPage.php index fa35f8a448..29c6aa1062 100644 --- a/src/Kunstmaan/NodeBundle/Entity/AbstractPage.php +++ b/src/Kunstmaan/NodeBundle/Entity/AbstractPage.php @@ -2,19 +2,15 @@ namespace Kunstmaan\NodeBundle\Entity; +use Doctrine\ORM\Mapping as ORM; use Kunstmaan\AdminBundle\Entity\AbstractEntity; -use Kunstmaan\NodeBundle\Form\NodeMenuTabAdminType; -use Kunstmaan\NodeBundle\Entity\PageInterface; -use Kunstmaan\NodeBundle\Helper\RenderContext; use Kunstmaan\NodeBundle\Form\PageAdminType; - +use Kunstmaan\NodeBundle\Helper\RenderContext; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Form\AbstractType; use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Validator\Constraints as Assert; -use Symfony\Component\Form\AbstractType; - -use Doctrine\ORM\Mapping as ORM; /** * The Abstract ORM Page diff --git a/src/Kunstmaan/NodeBundle/Entity/Node.php b/src/Kunstmaan/NodeBundle/Entity/Node.php index 8281a4baf0..d696bb390b 100644 --- a/src/Kunstmaan/NodeBundle/Entity/Node.php +++ b/src/Kunstmaan/NodeBundle/Entity/Node.php @@ -2,13 +2,13 @@ namespace Kunstmaan\NodeBundle\Entity; -use Kunstmaan\AdminBundle\Entity\AbstractEntity; -use Kunstmaan\NodeBundle\Form\NodeAdminType; -use Kunstmaan\UtilitiesBundle\Helper\ClassLookup; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\Mapping as ORM; use Gedmo\Mapping\Annotation as Gedmo; use Gedmo\Tree\Node as GedmoNode; +use Kunstmaan\AdminBundle\Entity\AbstractEntity; +use Kunstmaan\NodeBundle\Form\NodeAdminType; +use Kunstmaan\UtilitiesBundle\Helper\ClassLookup; /** * Node diff --git a/src/Kunstmaan/NodeBundle/Entity/PageInterface.php b/src/Kunstmaan/NodeBundle/Entity/PageInterface.php index 99413dbabd..61a68fd0af 100644 --- a/src/Kunstmaan/NodeBundle/Entity/PageInterface.php +++ b/src/Kunstmaan/NodeBundle/Entity/PageInterface.php @@ -2,12 +2,10 @@ namespace Kunstmaan\NodeBundle\Entity; -use Kunstmaan\NodeBundle\Entity\HasNodeInterface; use Kunstmaan\NodeBundle\Helper\RenderContext; - -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\DependencyInjection\ContainerInterface; +use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Request; /** * The Page Interface diff --git a/src/Kunstmaan/NodeBundle/Entity/StructureNode.php b/src/Kunstmaan/NodeBundle/Entity/StructureNode.php index 1c03c15336..09fce486d9 100644 --- a/src/Kunstmaan/NodeBundle/Entity/StructureNode.php +++ b/src/Kunstmaan/NodeBundle/Entity/StructureNode.php @@ -2,8 +2,6 @@ namespace Kunstmaan\NodeBundle\Entity; -use Kunstmaan\NodeBundle\Entity\AbstractPage; - /** * A StructureNode will always be offline and its nodes will never have a slug. */ diff --git a/src/Kunstmaan/NodeBundle/Event/AdaptFormEvent.php b/src/Kunstmaan/NodeBundle/Event/AdaptFormEvent.php index 478685d7b5..66df2daa3d 100644 --- a/src/Kunstmaan/NodeBundle/Event/AdaptFormEvent.php +++ b/src/Kunstmaan/NodeBundle/Event/AdaptFormEvent.php @@ -2,13 +2,12 @@ namespace Kunstmaan\NodeBundle\Event; -use Symfony\Component\EventDispatcher\Event; - -use Kunstmaan\NodeBundle\Entity\NodeVersion; -use Kunstmaan\NodeBundle\Entity\NodeTranslation; -use Kunstmaan\NodeBundle\Entity\Node; -use Kunstmaan\NodeBundle\Entity\HasNodeInterface; use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\TabPane; +use Kunstmaan\NodeBundle\Entity\HasNodeInterface; +use Kunstmaan\NodeBundle\Entity\Node; +use Kunstmaan\NodeBundle\Entity\NodeTranslation; +use Kunstmaan\NodeBundle\Entity\NodeVersion; +use Symfony\Component\EventDispatcher\Event; use Symfony\Component\HttpFoundation\Request; /** diff --git a/src/Kunstmaan/NodeBundle/Event/ConfigureActionMenuEvent.php b/src/Kunstmaan/NodeBundle/Event/ConfigureActionMenuEvent.php index 506a2cdafd..d70416be56 100644 --- a/src/Kunstmaan/NodeBundle/Event/ConfigureActionMenuEvent.php +++ b/src/Kunstmaan/NodeBundle/Event/ConfigureActionMenuEvent.php @@ -4,10 +4,8 @@ use Knp\Menu\FactoryInterface; use Knp\Menu\ItemInterface; - -use Symfony\Component\EventDispatcher\Event; - use Kunstmaan\NodeBundle\Entity\NodeVersion; +use Symfony\Component\EventDispatcher\Event; /** * ConfigureActionMenuEvent diff --git a/src/Kunstmaan/NodeBundle/Event/CopyPageTranslationNodeEvent.php b/src/Kunstmaan/NodeBundle/Event/CopyPageTranslationNodeEvent.php index 7489d3c302..3c22dbe948 100644 --- a/src/Kunstmaan/NodeBundle/Event/CopyPageTranslationNodeEvent.php +++ b/src/Kunstmaan/NodeBundle/Event/CopyPageTranslationNodeEvent.php @@ -2,10 +2,10 @@ namespace Kunstmaan\NodeBundle\Event; -use Kunstmaan\NodeBundle\Entity\NodeTranslation; +use Kunstmaan\NodeBundle\Entity\HasNodeInterface; use Kunstmaan\NodeBundle\Entity\Node; +use Kunstmaan\NodeBundle\Entity\NodeTranslation; use Kunstmaan\NodeBundle\Entity\NodeVersion; -use Kunstmaan\NodeBundle\Entity\HasNodeInterface; /** * CopyPageTranslationNodeEvent diff --git a/src/Kunstmaan/NodeBundle/Event/NodeEvent.php b/src/Kunstmaan/NodeBundle/Event/NodeEvent.php index 41828fc41c..4df52ac2ad 100644 --- a/src/Kunstmaan/NodeBundle/Event/NodeEvent.php +++ b/src/Kunstmaan/NodeBundle/Event/NodeEvent.php @@ -2,13 +2,12 @@ namespace Kunstmaan\NodeBundle\Event; -use Symfony\Component\EventDispatcher\Event; -use Symfony\Component\HttpFoundation\Response; - use Kunstmaan\NodeBundle\Entity\HasNodeInterface; use Kunstmaan\NodeBundle\Entity\Node; -use Kunstmaan\NodeBundle\Entity\NodeVersion; use Kunstmaan\NodeBundle\Entity\NodeTranslation; +use Kunstmaan\NodeBundle\Entity\NodeVersion; +use Symfony\Component\EventDispatcher\Event; +use Symfony\Component\HttpFoundation\Response; /** * NodeEvent @@ -152,4 +151,4 @@ public function getResponse() { return $this->response; } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/NodeBundle/Event/RevertNodeAction.php b/src/Kunstmaan/NodeBundle/Event/RevertNodeAction.php index b9acc5ff97..a047a0b970 100644 --- a/src/Kunstmaan/NodeBundle/Event/RevertNodeAction.php +++ b/src/Kunstmaan/NodeBundle/Event/RevertNodeAction.php @@ -2,11 +2,10 @@ namespace Kunstmaan\NodeBundle\Event; -use Kunstmaan\NodeBundle\Event\NodeEvent; +use Kunstmaan\NodeBundle\Entity\HasNodeInterface; use Kunstmaan\NodeBundle\Entity\Node; use Kunstmaan\NodeBundle\Entity\NodeTranslation; use Kunstmaan\NodeBundle\Entity\NodeVersion; -use Kunstmaan\NodeBundle\Entity\HasNodeInterface; /** * This event will pass metadata when a revert event has been triggered diff --git a/src/Kunstmaan/NodeBundle/EventListener/FixDateListener.php b/src/Kunstmaan/NodeBundle/EventListener/FixDateListener.php index 8888ae57d2..668a97c779 100644 --- a/src/Kunstmaan/NodeBundle/EventListener/FixDateListener.php +++ b/src/Kunstmaan/NodeBundle/EventListener/FixDateListener.php @@ -3,9 +3,7 @@ namespace Kunstmaan\NodeBundle\EventListener; use Symfony\Component\HttpKernel\Event\FilterResponseEvent; - use Symfony\Component\HttpKernel\Event\GetResponseEvent; -use Symfony\Component\HttpFoundation\Response; /** * Fixes bug with date vs Date headers diff --git a/src/Kunstmaan/NodeBundle/EventListener/LogPageEventsSubscriber.php b/src/Kunstmaan/NodeBundle/EventListener/LogPageEventsSubscriber.php index d724baafa0..927c7880fa 100644 --- a/src/Kunstmaan/NodeBundle/EventListener/LogPageEventsSubscriber.php +++ b/src/Kunstmaan/NodeBundle/EventListener/LogPageEventsSubscriber.php @@ -2,10 +2,9 @@ namespace Kunstmaan\NodeBundle\EventListener; -use Kunstmaan\NodeBundle\Event\Events; use Kunstmaan\NodeBundle\Event\CopyPageTranslationNodeEvent; +use Kunstmaan\NodeBundle\Event\Events; use Kunstmaan\NodeBundle\Event\NodeEvent; - use Symfony\Bridge\Monolog\Logger; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\Security\Core\SecurityContextInterface; diff --git a/src/Kunstmaan/NodeBundle/EventListener/NodeListener.php b/src/Kunstmaan/NodeBundle/EventListener/NodeListener.php index e3e6fed8fc..81b4f90dcf 100644 --- a/src/Kunstmaan/NodeBundle/EventListener/NodeListener.php +++ b/src/Kunstmaan/NodeBundle/EventListener/NodeListener.php @@ -3,11 +3,10 @@ namespace Kunstmaan\NodeBundle\EventListener; use Kunstmaan\AdminBundle\Helper\FormWidgets\Tabs\Tab; -use Kunstmaan\NodeBundle\Helper\FormWidgets\PermissionsFormWidget; -use Kunstmaan\NodeBundle\Event\AdaptFormEvent; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionAdmin; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMapInterface; - +use Kunstmaan\NodeBundle\Event\AdaptFormEvent; +use Kunstmaan\NodeBundle\Helper\FormWidgets\PermissionsFormWidget; use Symfony\Component\Security\Core\SecurityContextInterface; /** diff --git a/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php b/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php index f0e31659c2..da28e3851c 100644 --- a/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php +++ b/src/Kunstmaan/NodeBundle/EventListener/NodeTranslationListener.php @@ -2,13 +2,11 @@ namespace Kunstmaan\NodeBundle\EventListener; -use Doctrine\ORM\EntityManager, - Doctrine\ORM\Event\OnFlushEventArgs, - Doctrine\ORM\Event\PostFlushEventArgs; - -use Kunstmaan\NodeBundle\Entity\Node, - Kunstmaan\NodeBundle\Entity\NodeTranslation; - +use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Event\OnFlushEventArgs; +use Doctrine\ORM\Event\PostFlushEventArgs; +use Kunstmaan\NodeBundle\Entity\Node; +use Kunstmaan\NodeBundle\Entity\NodeTranslation; use Kunstmaan\NodeBundle\Entity\NodeVersion; use Kunstmaan\NodeBundle\Entity\StructureNode; use Symfony\Bridge\Monolog\Logger; diff --git a/src/Kunstmaan/NodeBundle/Form/ControllerActionAdminType.php b/src/Kunstmaan/NodeBundle/Form/ControllerActionAdminType.php index e77eb175a6..f87de78fd8 100644 --- a/src/Kunstmaan/NodeBundle/Form/ControllerActionAdminType.php +++ b/src/Kunstmaan/NodeBundle/Form/ControllerActionAdminType.php @@ -2,8 +2,8 @@ namespace Kunstmaan\NodeBundle\Form; -use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** diff --git a/src/Kunstmaan/NodeBundle/Form/PageAdminType.php b/src/Kunstmaan/NodeBundle/Form/PageAdminType.php index 5b3cf08b33..c2e31886a6 100644 --- a/src/Kunstmaan/NodeBundle/Form/PageAdminType.php +++ b/src/Kunstmaan/NodeBundle/Form/PageAdminType.php @@ -2,8 +2,8 @@ namespace Kunstmaan\NodeBundle\Form; -use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\Form\AbstractType; +use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\OptionsResolver\OptionsResolverInterface; /** diff --git a/src/Kunstmaan/NodeBundle/Form/Type/SlugType.php b/src/Kunstmaan/NodeBundle/Form/Type/SlugType.php index 506fe3dbe5..072f42c75d 100644 --- a/src/Kunstmaan/NodeBundle/Form/Type/SlugType.php +++ b/src/Kunstmaan/NodeBundle/Form/Type/SlugType.php @@ -2,13 +2,11 @@ namespace Kunstmaan\NodeBundle\Form\Type; +use Kunstmaan\UtilitiesBundle\Helper\Slugifier; +use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormInterface; - use Symfony\Component\Form\FormView; -use Symfony\Component\Form\AbstractType; -use Kunstmaan\UtilitiesBundle\Helper\Slugifier; - /** * Sype */ diff --git a/src/Kunstmaan/NodeBundle/Helper/FormWidgets/PermissionsFormWidget.php b/src/Kunstmaan/NodeBundle/Helper/FormWidgets/PermissionsFormWidget.php index bbcd1444b5..af38a19e14 100644 --- a/src/Kunstmaan/NodeBundle/Helper/FormWidgets/PermissionsFormWidget.php +++ b/src/Kunstmaan/NodeBundle/Helper/FormWidgets/PermissionsFormWidget.php @@ -2,16 +2,14 @@ namespace Kunstmaan\NodeBundle\Helper\FormWidgets; -use Kunstmaan\NodeBundle\Entity\Node; -use Kunstmaan\NodeBundle\Entity\HasNodeInterface; - +use Doctrine\ORM\EntityManager; +use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionAdmin; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMapInterface; -use Kunstmaan\AdminBundle\Helper\FormWidgets\FormWidget; - -use Doctrine\ORM\EntityManager; -use Symfony\Component\Form\FormView; +use Kunstmaan\NodeBundle\Entity\HasNodeInterface; +use Kunstmaan\NodeBundle\Entity\Node; use Symfony\Component\Form\FormBuilderInterface; +use Symfony\Component\Form\FormView; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Kunstmaan/NodeBundle/Helper/Menu/ActionsMenuBuilder.php b/src/Kunstmaan/NodeBundle/Helper/Menu/ActionsMenuBuilder.php index 9c53080f4b..c24b62efd7 100644 --- a/src/Kunstmaan/NodeBundle/Helper/Menu/ActionsMenuBuilder.php +++ b/src/Kunstmaan/NodeBundle/Helper/Menu/ActionsMenuBuilder.php @@ -3,21 +3,18 @@ namespace Kunstmaan\NodeBundle\Helper\Menu; use Doctrine\ORM\EntityManager; -use Kunstmaan\NodeBundle\Entity\PageInterface; - -use Kunstmaan\NodeBundle\Entity\NodeVersion; +use Knp\Menu\FactoryInterface; +use Knp\Menu\ItemInterface; use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap; +use Kunstmaan\NodeBundle\Entity\NodeVersion; +use Kunstmaan\NodeBundle\Entity\PageInterface; use Kunstmaan\NodeBundle\Event\ConfigureActionMenuEvent; use Kunstmaan\NodeBundle\Event\Events; - -use Symfony\Component\Routing\RouterInterface; use Symfony\Component\EventDispatcher\EventDispatcherInterface; use Symfony\Component\HttpFoundation\Request; +use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Security\Core\SecurityContextInterface; -use Knp\Menu\ItemInterface; -use Knp\Menu\FactoryInterface; - /** * ActionsMenuBuilder */ diff --git a/src/Kunstmaan/NodeBundle/Helper/Menu/PageMenuAdaptor.php b/src/Kunstmaan/NodeBundle/Helper/Menu/PageMenuAdaptor.php index 834bf12f72..d6559c428e 100644 --- a/src/Kunstmaan/NodeBundle/Helper/Menu/PageMenuAdaptor.php +++ b/src/Kunstmaan/NodeBundle/Helper/Menu/PageMenuAdaptor.php @@ -3,12 +3,12 @@ namespace Kunstmaan\NodeBundle\Helper\Menu; use Doctrine\ORM\EntityManager; -use Kunstmaan\AdminBundle\Helper\Security\Acl\AclNativeHelper; -use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap; +use Kunstmaan\AdminBundle\Helper\Menu\MenuAdaptorInterface; use Kunstmaan\AdminBundle\Helper\Menu\MenuBuilder; use Kunstmaan\AdminBundle\Helper\Menu\MenuItem; -use Kunstmaan\AdminBundle\Helper\Menu\MenuAdaptorInterface; use Kunstmaan\AdminBundle\Helper\Menu\TopMenuItem; +use Kunstmaan\AdminBundle\Helper\Security\Acl\AclNativeHelper; +use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap; use Kunstmaan\NodeBundle\Entity\HideFromNodeTreeInterface; use Kunstmaan\NodeBundle\Entity\Node; use Kunstmaan\NodeBundle\Helper\NodeMenuItem; diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php b/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php index 238df7089f..6ec7c8a8a8 100644 --- a/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php +++ b/src/Kunstmaan/NodeBundle/Helper/NodeAdmin/NodeAdminPublisher.php @@ -13,9 +13,9 @@ use Kunstmaan\NodeBundle\Entity\QueuedNodeTranslationAction; use Kunstmaan\NodeBundle\Event\Events; use Kunstmaan\NodeBundle\Event\NodeEvent; -use Symfony\Component\Security\Core\SecurityContextInterface; -use Symfony\Component\Security\Core\Exception\AccessDeniedException; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\Security\Core\Exception\AccessDeniedException; +use Symfony\Component\Security\Core\SecurityContextInterface; /** * NodeAdminPublisher diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php b/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php index b9010d7719..9c6103f2ed 100644 --- a/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php +++ b/src/Kunstmaan/NodeBundle/Helper/NodeMenu.php @@ -3,11 +3,11 @@ namespace Kunstmaan\NodeBundle\Helper; use Doctrine\ORM\EntityManager; +use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; +use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap; use Kunstmaan\NodeBundle\Entity\HasNodeInterface; use Kunstmaan\NodeBundle\Entity\Node; use Kunstmaan\NodeBundle\Entity\NodeTranslation; -use Kunstmaan\AdminBundle\Helper\Security\Acl\AclHelper; -use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\PermissionMap; use Kunstmaan\NodeBundle\Repository\NodeRepository; use Symfony\Component\Security\Core\SecurityContextInterface; diff --git a/src/Kunstmaan/NodeBundle/Helper/NodeMenuItem.php b/src/Kunstmaan/NodeBundle/Helper/NodeMenuItem.php index 4f09810319..113f958dcb 100644 --- a/src/Kunstmaan/NodeBundle/Helper/NodeMenuItem.php +++ b/src/Kunstmaan/NodeBundle/Helper/NodeMenuItem.php @@ -3,9 +3,9 @@ namespace Kunstmaan\NodeBundle\Helper; use Doctrine\ORM\EntityManager; +use Kunstmaan\NodeBundle\Entity\HasNodeInterface; use Kunstmaan\NodeBundle\Entity\Node; use Kunstmaan\NodeBundle\Entity\NodeTranslation; -use Kunstmaan\NodeBundle\Entity\HasNodeInterface; /** * NodeMenuItem diff --git a/src/Kunstmaan/NodeBundle/Helper/Routing/DynamicUrlMatcher.php b/src/Kunstmaan/NodeBundle/Helper/Routing/DynamicUrlMatcher.php index 6e868508a3..5a2b5ffe79 100644 --- a/src/Kunstmaan/NodeBundle/Helper/Routing/DynamicUrlMatcher.php +++ b/src/Kunstmaan/NodeBundle/Helper/Routing/DynamicUrlMatcher.php @@ -2,9 +2,9 @@ namespace Kunstmaan\NodeBundle\Helper\Routing; +use Symfony\Component\Routing\Matcher\UrlMatcher; use Symfony\Component\Routing\RequestContext; use Symfony\Component\Routing\RouteCollection; -use Symfony\Component\Routing\Matcher\UrlMatcher; /** * Custom UrlMatcher which holds a copy of all the routes, this is needed for the DynamicRouting diff --git a/src/Kunstmaan/NodeBundle/Helper/Services/ACLPermissionCreatorService.php b/src/Kunstmaan/NodeBundle/Helper/Services/ACLPermissionCreatorService.php index 9eeb56c98e..88bd7fdb83 100644 --- a/src/Kunstmaan/NodeBundle/Helper/Services/ACLPermissionCreatorService.php +++ b/src/Kunstmaan/NodeBundle/Helper/Services/ACLPermissionCreatorService.php @@ -2,15 +2,13 @@ namespace Kunstmaan\NodeBundle\Helper\Services; +use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission; +use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\MaskBuilder; use Symfony\Component\DependencyInjection\ContainerInterface; - -use Kunstmaan\AdminBundle\Helper\Security\Acl\Permission, - Kunstmaan\AdminBundle\Helper\Security\Acl\Permission\MaskBuilder; - -use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity, - Symfony\Component\Security\Acl\Exception\AclNotFoundException, - Symfony\Component\Security\Acl\Model\MutableAclProviderInterface, - Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; +use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; +use Symfony\Component\Security\Acl\Exception\AclNotFoundException; +use Symfony\Component\Security\Acl\Model\MutableAclProviderInterface; +use Symfony\Component\Security\Acl\Model\ObjectIdentityRetrievalStrategyInterface; /** * Service to add the correct permissions to new HasNodeInterface objects. diff --git a/src/Kunstmaan/NodeBundle/Tests/Entity/NodeTest.php b/src/Kunstmaan/NodeBundle/Tests/Entity/NodeTest.php index 278cc70de3..c9103aecfc 100644 --- a/src/Kunstmaan/NodeBundle/Tests/Entity/NodeTest.php +++ b/src/Kunstmaan/NodeBundle/Tests/Entity/NodeTest.php @@ -2,9 +2,9 @@ namespace Kunstmaan\NodeBundle\Tests\Entity; +use Doctrine\Common\Collections\ArrayCollection; use Kunstmaan\NodeBundle\Entity\Node; use Kunstmaan\NodeBundle\Entity\NodeTranslation; -use Doctrine\Common\Collections\ArrayCollection; /** * Generated by PHPUnit_SkeletonGenerator on 2012-09-14 at 11:09:16. diff --git a/src/Kunstmaan/NodeBundle/Tests/Entity/NodeTranslationTest.php b/src/Kunstmaan/NodeBundle/Tests/Entity/NodeTranslationTest.php index daa04d6bb5..bd1b82f3ae 100644 --- a/src/Kunstmaan/NodeBundle/Tests/Entity/NodeTranslationTest.php +++ b/src/Kunstmaan/NodeBundle/Tests/Entity/NodeTranslationTest.php @@ -2,10 +2,10 @@ namespace Kunstmaan\NodeBundle\Tests\Entity; +use Doctrine\Common\Collections\ArrayCollection; use Kunstmaan\NodeBundle\Entity\Node; -use Kunstmaan\NodeBundle\Entity\NodeVersion; use Kunstmaan\NodeBundle\Entity\NodeTranslation; -use Doctrine\Common\Collections\ArrayCollection; +use Kunstmaan\NodeBundle\Entity\NodeVersion; /** * Generated by PHPUnit_SkeletonGenerator on 2012-09-17 at 16:40:16. diff --git a/src/Kunstmaan/NodeBundle/Tests/Entity/NodeVersionTest.php b/src/Kunstmaan/NodeBundle/Tests/Entity/NodeVersionTest.php index a59d04180d..727246f367 100644 --- a/src/Kunstmaan/NodeBundle/Tests/Entity/NodeVersionTest.php +++ b/src/Kunstmaan/NodeBundle/Tests/Entity/NodeVersionTest.php @@ -2,8 +2,8 @@ namespace Kunstmaan\NodeBundle\Tests\Entity; -use Kunstmaan\NodeBundle\Entity\NodeVersion; use Kunstmaan\NodeBundle\Entity\NodeTranslation; +use Kunstmaan\NodeBundle\Entity\NodeVersion; /** * Generated by PHPUnit_SkeletonGenerator on 2012-09-18 at 11:53:49. diff --git a/src/Kunstmaan/NodeBundle/Tests/Entity/TestEntity.php b/src/Kunstmaan/NodeBundle/Tests/Entity/TestEntity.php index 92f33f53d7..fe367c5dff 100644 --- a/src/Kunstmaan/NodeBundle/Tests/Entity/TestEntity.php +++ b/src/Kunstmaan/NodeBundle/Tests/Entity/TestEntity.php @@ -5,7 +5,6 @@ use Kunstmaan\AdminBundle\Entity\AbstractEntity; use Kunstmaan\NodeBundle\Entity\AbstractPage; use Kunstmaan\NodeBundle\Entity\HasNodeInterface; - use Symfony\Component\Form\AbstractType; /** diff --git a/src/Kunstmaan/NodeBundle/Tests/Helper/Menu/ActionsMenuBuilderTest.php b/src/Kunstmaan/NodeBundle/Tests/Helper/Menu/ActionsMenuBuilderTest.php index 3c39fd3ab7..8cd0754ba3 100644 --- a/src/Kunstmaan/NodeBundle/Tests/Helper/Menu/ActionsMenuBuilderTest.php +++ b/src/Kunstmaan/NodeBundle/Tests/Helper/Menu/ActionsMenuBuilderTest.php @@ -2,21 +2,16 @@ namespace Kunstmaan\NodeBundle\Tests\Helper\Menu; -use Doctrine\ORM\EntityManager; - -use Knp\Menu\MenuFactory; use Knp\Menu\Integration\Symfony\RoutingExtension; - -use Kunstmaan\NodeBundle\Helper\Menu\ActionsMenuBuilder; -use Kunstmaan\NodeBundle\Tests\Stubs\TestRepository; +use Knp\Menu\MenuFactory; +use Kunstmaan\NodeBundle\Entity\Node; use Kunstmaan\NodeBundle\Entity\NodeTranslation; use Kunstmaan\NodeBundle\Entity\NodeVersion; -use Kunstmaan\NodeBundle\Entity\Node; - -use Symfony\Cmf\Bundle\RoutingBundle\Admin\Extension\RouteReferrersExtension; -use Symfony\Component\Routing\RouterInterface; -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Kunstmaan\NodeBundle\Helper\Menu\ActionsMenuBuilder; +use Kunstmaan\NodeBundle\Tests\Stubs\TestRepository; use Symfony\Component\EventDispatcher\EventDispatcherInterface; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Security\Core\SecurityContextInterface; /** diff --git a/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php b/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php index 4e78bc88b6..29c5230ff2 100644 --- a/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php +++ b/src/Kunstmaan/NodeBundle/Twig/NodeTwigExtension.php @@ -2,12 +2,10 @@ namespace Kunstmaan\NodeBundle\Twig; -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; -use Twig_Extension; - use Doctrine\ORM\EntityManager; - use Kunstmaan\NodeBundle\Entity\AbstractPage; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; +use Twig_Extension; /** * Extension to fetch node / translation by page in Twig templates diff --git a/src/Kunstmaan/NodeSearchBundle/Configuration/NodeSearchConfiguration.php b/src/Kunstmaan/NodeSearchBundle/Configuration/NodeSearchConfiguration.php index 269725e8bb..c4d9d2aeb0 100644 --- a/src/Kunstmaan/NodeSearchBundle/Configuration/NodeSearchConfiguration.php +++ b/src/Kunstmaan/NodeSearchBundle/Configuration/NodeSearchConfiguration.php @@ -10,7 +10,6 @@ use Kunstmaan\PagePartBundle\Helper\HasPagePartsInterface; use Kunstmaan\SearchBundle\Configuration\SearchConfigurationInterface; use Kunstmaan\SearchBundle\Helper\ShouldBeIndexed; -use Kunstmaan\SearchBundle\Search\Search; use Kunstmaan\UtilitiesBundle\Helper\ClassLookup; use Sherlock\Sherlock; use Symfony\Component\DependencyInjection\ContainerInterface; diff --git a/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php b/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php index 4eb1def16f..1f18e079e5 100644 --- a/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php +++ b/src/Kunstmaan/NodeSearchBundle/DependencyInjection/KunstmaanNodeSearchExtension.php @@ -2,10 +2,10 @@ namespace Kunstmaan\NodeSearchBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Kunstmaan/PagePartBundle/Controller/PagePartAdminController.php b/src/Kunstmaan/PagePartBundle/Controller/PagePartAdminController.php index 33db83e417..41dd7f40a1 100644 --- a/src/Kunstmaan/PagePartBundle/Controller/PagePartAdminController.php +++ b/src/Kunstmaan/PagePartBundle/Controller/PagePartAdminController.php @@ -4,8 +4,6 @@ use Kunstmaan\PagePartBundle\Helper\PagePartConfigurationReader; use Kunstmaan\PagePartBundle\PagePartAdmin\PagePartAdmin; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\HttpFoundation\Request; diff --git a/src/Kunstmaan/PagePartBundle/DependencyInjection/KunstmaanPagePartExtension.php b/src/Kunstmaan/PagePartBundle/DependencyInjection/KunstmaanPagePartExtension.php index 5afa3a36b4..a1faf339f3 100644 --- a/src/Kunstmaan/PagePartBundle/DependencyInjection/KunstmaanPagePartExtension.php +++ b/src/Kunstmaan/PagePartBundle/DependencyInjection/KunstmaanPagePartExtension.php @@ -1,10 +1,10 @@ writeln('An error occured while migrating translations : ' . $e->getMessage() . ''); } } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/TranslatorBundle/Command/MigrationsDiffCommand.php b/src/Kunstmaan/TranslatorBundle/Command/MigrationsDiffCommand.php index 234a7ced75..fbc417e958 100644 --- a/src/Kunstmaan/TranslatorBundle/Command/MigrationsDiffCommand.php +++ b/src/Kunstmaan/TranslatorBundle/Command/MigrationsDiffCommand.php @@ -1,12 +1,12 @@ generateUrl('KunstmaanUserManagementBundle_settings_groups')); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/UserManagementBundle/Controller/RolesController.php b/src/Kunstmaan/UserManagementBundle/Controller/RolesController.php index 4f2647c008..337650a6ae 100644 --- a/src/Kunstmaan/UserManagementBundle/Controller/RolesController.php +++ b/src/Kunstmaan/UserManagementBundle/Controller/RolesController.php @@ -3,16 +3,12 @@ namespace Kunstmaan\UserManagementBundle\Controller; use Doctrine\ORM\EntityManager; - use Kunstmaan\AdminBundle\Controller\BaseSettingsController; use Kunstmaan\AdminBundle\Entity\Role; use Kunstmaan\AdminBundle\Form\RoleType; use Kunstmaan\AdminListBundle\AdminList\AdminList; use Kunstmaan\UserManagementBundle\AdminList\RoleAdminListConfigurator; use Symfony\Component\HttpFoundation\RedirectResponse; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Symfony\Component\HttpFoundation\Request; /** @@ -149,4 +145,4 @@ public function deleteAction($id) return new RedirectResponse($this->generateUrl('KunstmaanUserManagementBundle_settings_roles')); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php b/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php index 007433177c..68e5402253 100644 --- a/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php +++ b/src/Kunstmaan/UserManagementBundle/Controller/UsersController.php @@ -10,9 +10,6 @@ use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\Security\Core\Exception\AccessDeniedException; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; /** * Settings controller handling everything related to creating, editing, deleting and listing users in an admin list @@ -238,4 +235,4 @@ public function changePasswordAction() ) ); } -} \ No newline at end of file +} diff --git a/src/Kunstmaan/UserManagementBundle/DependencyInjection/KunstmaanUserManagementExtension.php b/src/Kunstmaan/UserManagementBundle/DependencyInjection/KunstmaanUserManagementExtension.php index bb075febbe..e96014390d 100644 --- a/src/Kunstmaan/UserManagementBundle/DependencyInjection/KunstmaanUserManagementExtension.php +++ b/src/Kunstmaan/UserManagementBundle/DependencyInjection/KunstmaanUserManagementExtension.php @@ -2,10 +2,10 @@ namespace Kunstmaan\UserManagementBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Kunstmaan/UtilitiesBundle/DependencyInjection/KunstmaanUtilitiesExtension.php b/src/Kunstmaan/UtilitiesBundle/DependencyInjection/KunstmaanUtilitiesExtension.php index 8f029dcf61..d57114e883 100644 --- a/src/Kunstmaan/UtilitiesBundle/DependencyInjection/KunstmaanUtilitiesExtension.php +++ b/src/Kunstmaan/UtilitiesBundle/DependencyInjection/KunstmaanUtilitiesExtension.php @@ -2,10 +2,10 @@ namespace Kunstmaan\UtilitiesBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Kunstmaan/VotingBundle/Controller/VotingController.php b/src/Kunstmaan/VotingBundle/Controller/VotingController.php index a98bec7dde..f1e1d4dcfe 100644 --- a/src/Kunstmaan/VotingBundle/Controller/VotingController.php +++ b/src/Kunstmaan/VotingBundle/Controller/VotingController.php @@ -2,17 +2,14 @@ namespace Kunstmaan\VotingBundle\Controller; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Symfony\Bundle\FrameworkBundle\Controller\Controller; -use Symfony\Component\HttpFoundation\Request; - use Kunstmaan\VotingBundle\Event\Events; use Kunstmaan\VotingBundle\Event\Facebook\FacebookLikeEvent; use Kunstmaan\VotingBundle\Event\Facebook\FacebookSendEvent; use Kunstmaan\VotingBundle\Event\LinkedIn\LinkedInShareEvent; use Kunstmaan\VotingBundle\Event\UpDown\DownVoteEvent; use Kunstmaan\VotingBundle\Event\UpDown\UpVoteEvent; +use Symfony\Bundle\FrameworkBundle\Controller\Controller; +use Symfony\Component\HttpFoundation\Request; class VotingController extends Controller { diff --git a/src/Kunstmaan/VotingBundle/DependencyInjection/KunstmaanVotingExtension.php b/src/Kunstmaan/VotingBundle/DependencyInjection/KunstmaanVotingExtension.php index d1c7ca1269..5bdbf422a4 100644 --- a/src/Kunstmaan/VotingBundle/DependencyInjection/KunstmaanVotingExtension.php +++ b/src/Kunstmaan/VotingBundle/DependencyInjection/KunstmaanVotingExtension.php @@ -2,12 +2,12 @@ namespace Kunstmaan\VotingBundle\DependencyInjection; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\Config\FileLocator; -use Symfony\Component\HttpKernel\DependencyInjection\Extension; -use Symfony\Component\DependencyInjection\Loader; +use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Definition; +use Symfony\Component\DependencyInjection\Loader; use Symfony\Component\DependencyInjection\Reference; +use Symfony\Component\HttpKernel\DependencyInjection\Extension; /** * This is the class that loads and manages your bundle configuration diff --git a/src/Kunstmaan/VotingBundle/EventListener/Facebook/FacebookLikeEventListener.php b/src/Kunstmaan/VotingBundle/EventListener/Facebook/FacebookLikeEventListener.php index 59376e5c73..d4d4e60aed 100644 --- a/src/Kunstmaan/VotingBundle/EventListener/Facebook/FacebookLikeEventListener.php +++ b/src/Kunstmaan/VotingBundle/EventListener/Facebook/FacebookLikeEventListener.php @@ -3,8 +3,8 @@ namespace Kunstmaan\VotingBundle\EventListener\Facebook; use Doctrine\ORM\EntityManager; -use Kunstmaan\VotingBundle\Event\Facebook\FacebookLikeEvent; use Kunstmaan\VotingBundle\Entity\Facebook\FacebookLike; +use Kunstmaan\VotingBundle\Event\Facebook\FacebookLikeEvent; use Symfony\Component\DependencyInjection\Container; class FacebookLikeEventListener diff --git a/src/Kunstmaan/VotingBundle/EventListener/Facebook/FacebookSendEventListener.php b/src/Kunstmaan/VotingBundle/EventListener/Facebook/FacebookSendEventListener.php index a396303bca..047da397ad 100644 --- a/src/Kunstmaan/VotingBundle/EventListener/Facebook/FacebookSendEventListener.php +++ b/src/Kunstmaan/VotingBundle/EventListener/Facebook/FacebookSendEventListener.php @@ -3,8 +3,8 @@ namespace Kunstmaan\VotingBundle\EventListener\Facebook; use Doctrine\ORM\EntityManager; -use Kunstmaan\VotingBundle\Event\Facebook\FacebookSendEvent; use Kunstmaan\VotingBundle\Entity\Facebook\FacebookSend; +use Kunstmaan\VotingBundle\Event\Facebook\FacebookSendEvent; use Symfony\Component\DependencyInjection\Container; class FacebookSendEventListener diff --git a/src/Kunstmaan/VotingBundle/EventListener/LinkedIn/LinkedInShareEventListener.php b/src/Kunstmaan/VotingBundle/EventListener/LinkedIn/LinkedInShareEventListener.php index dd47a7fc1e..6d52d41894 100644 --- a/src/Kunstmaan/VotingBundle/EventListener/LinkedIn/LinkedInShareEventListener.php +++ b/src/Kunstmaan/VotingBundle/EventListener/LinkedIn/LinkedInShareEventListener.php @@ -3,8 +3,8 @@ namespace Kunstmaan\VotingBundle\EventListener\LinkedIn; use Doctrine\ORM\EntityManager; -use Kunstmaan\VotingBundle\Event\LinkedIn\LinkedInShareEvent; use Kunstmaan\VotingBundle\Entity\LinkedIn\LinkedInShare; +use Kunstmaan\VotingBundle\Event\LinkedIn\LinkedInShareEvent; use Symfony\Component\DependencyInjection\Container; class LinkedInShareEventListener diff --git a/src/Kunstmaan/VotingBundle/Services/RepositoryResolver.php b/src/Kunstmaan/VotingBundle/Services/RepositoryResolver.php index 5717c9529f..3877b74ea6 100644 --- a/src/Kunstmaan/VotingBundle/Services/RepositoryResolver.php +++ b/src/Kunstmaan/VotingBundle/Services/RepositoryResolver.php @@ -3,12 +3,11 @@ namespace Kunstmaan\VotingBundle\Services; use Doctrine\ORM\EntityManager; - +use Kunstmaan\VotingBundle\Event\Facebook\FacebookLikeEvent; +use Kunstmaan\VotingBundle\Event\Facebook\FacebookSendEvent; use Kunstmaan\VotingBundle\Event\LinkedIn\LinkedInShareEvent; use Kunstmaan\VotingBundle\Event\UpDown\DownVoteEvent; use Kunstmaan\VotingBundle\Event\UpDown\UpVoteEvent; -use Kunstmaan\VotingBundle\Event\Facebook\FacebookLikeEvent; -use Kunstmaan\VotingBundle\Event\Facebook\FacebookSendEvent; /** * Helper class get repository for an event diff --git a/src/Kunstmaan/VotingBundle/Tests/DependencyInjection/KunstmaanVotingExtensionTest.php b/src/Kunstmaan/VotingBundle/Tests/DependencyInjection/KunstmaanVotingExtensionTest.php index 27755e080e..4cd5ce858d 100644 --- a/src/Kunstmaan/VotingBundle/Tests/DependencyInjection/KunstmaanVotingExtensionTest.php +++ b/src/Kunstmaan/VotingBundle/Tests/DependencyInjection/KunstmaanVotingExtensionTest.php @@ -1,7 +1,7 @@