Completed
Pull Request — develop (#1272)
by
unknown
45s
created
src/SWP/Bundle/FixturesBundle/WebTestCase.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
       unset($server['HTTP_Authorization']);
87 87
     }
88 88
 
89
-    if(!array_key_exists("HTTP_HOST", $server)) {
89
+    if (!array_key_exists("HTTP_HOST", $server)) {
90 90
       $server['HTTP_HOST'] = 'localhost';
91 91
     }
92 92
 
Please login to merge, or discard this patch.
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -23,71 +23,71 @@  discard block
 block discarded – undo
23 23
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
24 24
 
25 25
 class WebTestCase extends BaseWebTestCase {
26
-  protected ?AbstractDatabaseTool $databaseTool;
27
-  private static ?KernelBrowser $client = null;
26
+    protected ?AbstractDatabaseTool $databaseTool;
27
+    private static ?KernelBrowser $client = null;
28 28
 
29
-  public function setUp(): void {
29
+    public function setUp(): void {
30 30
     if (self::$client == null) {
31
-      self::$client = parent::createClient();
31
+        self::$client = parent::createClient();
32 32
     }
33 33
     $this->databaseTool = static::getContainer()->get(DatabaseToolCollection::class)->get();
34
-  }
34
+    }
35 35
 
36
-  /**
37
-   * Initializes database.
38
-   */
39
-  protected function initDatabase() {
36
+    /**
37
+     * Initializes database.
38
+     */
39
+    protected function initDatabase() {
40 40
     $this->clearMetadataCache();
41
-  }
41
+    }
42 42
 
43
-  /**
44
-   * Clears metadata cache of the various cache drivers.
45
-   */
46
-  private function clearMetadataCache() {
43
+    /**
44
+     * Clears metadata cache of the various cache drivers.
45
+     */
46
+    private function clearMetadataCache() {
47 47
     $entityManager = $this->getContainer()->get('doctrine.orm.entity_manager');
48 48
 
49 49
     $cacheDriver = $entityManager->getConfiguration()->getMetadataCacheImpl();
50 50
 
51 51
     if (!$cacheDriver instanceof ArrayAdapter) {
52
-      $cacheDriver->deleteAll();
52
+        $cacheDriver->deleteAll();
53
+    }
53 54
     }
54
-  }
55 55
 
56
-  protected function tearDown(): void {
56
+    protected function tearDown(): void {
57 57
     unset($this->databaseTool);
58 58
     $reflection = new \ReflectionObject($this);
59 59
     foreach ($reflection->getProperties() as $prop) {
60
-      if (!$prop->isStatic() && 0 !== strpos($prop->getDeclaringClass()->getName(), 'PHPUnit_')) {
60
+        if (!$prop->isStatic() && 0 !== strpos($prop->getDeclaringClass()->getName(), 'PHPUnit_')) {
61 61
         $prop->setAccessible(true);
62 62
         if ($prop->name == 'databaseTool') {
63
-          continue;
63
+            continue;
64 64
         }
65 65
         $prop->setValue($this, null);
66
-      }
66
+        }
67 67
     }
68 68
     parent::tearDown();
69
-  }
69
+    }
70 70
 
71
-  protected function loadCustomFixtures(array $fixtures) {
71
+    protected function loadCustomFixtures(array $fixtures) {
72 72
     $env = $this->getContainer()->getParameter('test_env');
73 73
 
74 74
     $registry = new FixtureRegistry();
75 75
     $registry->setEnvironment($env);
76 76
 
77 77
     return $this->databaseTool->loadFixtures($registry->getFixtures($fixtures))->getReferenceRepository();
78
-  }
78
+    }
79 79
 
80
-  public static function createClient(array $options = [], array $server = []) {
80
+    public static function createClient(array $options = [], array $server = []) {
81 81
     if (!array_key_exists('HTTP_Authorization', $server)) {
82
-      $server['HTTP_Authorization'] = base64_encode('test_token:');
82
+        $server['HTTP_Authorization'] = base64_encode('test_token:');
83 83
     }
84 84
 
85 85
     if (null === $server['HTTP_Authorization']) {
86
-      unset($server['HTTP_Authorization']);
86
+        unset($server['HTTP_Authorization']);
87 87
     }
88 88
 
89 89
     if(!array_key_exists("HTTP_HOST", $server)) {
90
-      $server['HTTP_HOST'] = 'localhost';
90
+        $server['HTTP_HOST'] = 'localhost';
91 91
     }
92 92
 
93 93
     $newClient = clone self::$client;
@@ -95,5 +95,5 @@  discard block
 block discarded – undo
95 95
     $newClient->getKernel()->shutdown();
96 96
     $newClient->getKernel()->boot();
97 97
     return $newClient;
98
-  }
98
+    }
99 99
 }
Please login to merge, or discard this patch.
src/SWP/Bundle/MultiTenancyBundle/Context/TenantContext.php 2 patches
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -28,62 +28,62 @@
 block discarded – undo
28 28
  * Class TenantContext.
29 29
  */
30 30
 class TenantContext implements TenantContextInterface {
31
-  /**
32
-   * @var TenantInterface
33
-   */
34
-  protected $tenant;
31
+    /**
32
+     * @var TenantInterface
33
+     */
34
+    protected $tenant;
35 35
 
36
-  /**
37
-   * @var TenantResolverInterface
38
-   */
39
-  protected $tenantResolver;
36
+    /**
37
+     * @var TenantResolverInterface
38
+     */
39
+    protected $tenantResolver;
40 40
 
41
-  /**
42
-   * @var RequestStack
43
-   */
44
-  protected $requestStack;
41
+    /**
42
+     * @var RequestStack
43
+     */
44
+    protected $requestStack;
45 45
 
46
-  /**
47
-   * @var EventDispatcherInterface
48
-   */
49
-  protected $dispatcher;
46
+    /**
47
+     * @var EventDispatcherInterface
48
+     */
49
+    protected $dispatcher;
50 50
 
51
-  /**
52
-   * TenantContext constructor.
53
-   */
54
-  public function __construct(TenantResolverInterface  $tenantResolver, RequestStack $requestStack,
55
-                              EventDispatcherInterface $dispatcher) {
51
+    /**
52
+     * TenantContext constructor.
53
+     */
54
+    public function __construct(TenantResolverInterface  $tenantResolver, RequestStack $requestStack,
55
+                                EventDispatcherInterface $dispatcher) {
56 56
     $this->tenantResolver = $tenantResolver;
57 57
     $this->requestStack = $requestStack;
58 58
     $this->dispatcher = $dispatcher;
59
-  }
59
+    }
60 60
 
61
-  /**
62
-   * {@inheritdoc}
63
-   */
64
-  public function getTenant() {
61
+    /**
62
+     * {@inheritdoc}
63
+     */
64
+    public function getTenant() {
65 65
     if ($this->tenant !== null)
66
-      return $this->tenant;
66
+        return $this->tenant;
67 67
 
68 68
     $currentRequest = $this->requestStack->getCurrentRequest();
69 69
     if (null !== $currentRequest && false !== strpos($currentRequest->getRequestUri(), '_profiler')) {
70
-      $profilerTenant = new Tenant();
71
-      $profilerTenant->setDomainName($currentRequest->getHost());
72
-      $this->setTenant($profilerTenant);
73
-      return $profilerTenant;
70
+        $profilerTenant = new Tenant();
71
+        $profilerTenant->setDomainName($currentRequest->getHost());
72
+        $this->setTenant($profilerTenant);
73
+        return $profilerTenant;
74 74
     }
75 75
 
76 76
     $newTenant = $this->tenantResolver->resolve($currentRequest ? $currentRequest->getHost() : null);
77 77
     $this->setTenant($newTenant);
78 78
     return $newTenant;
79
-  }
79
+    }
80 80
 
81
-  /**
82
-   * {@inheritdoc}
83
-   */
84
-  public function setTenant(TenantInterface $tenant) {
81
+    /**
82
+     * {@inheritdoc}
83
+     */
84
+    public function setTenant(TenantInterface $tenant) {
85 85
     $this->tenant = $tenant;
86 86
 
87 87
     $this->dispatcher->dispatch(new GenericEvent($tenant), MultiTenancyEvents::TENANT_SET);
88
-  }
88
+    }
89 89
 }
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -62,8 +62,9 @@
 block discarded – undo
62 62
    * {@inheritdoc}
63 63
    */
64 64
   public function getTenant() {
65
-    if ($this->tenant !== null)
66
-      return $this->tenant;
65
+    if ($this->tenant !== null) {
66
+          return $this->tenant;
67
+    }
67 68
 
68 69
     $currentRequest = $this->requestStack->getCurrentRequest();
69 70
     if (null !== $currentRequest && false !== strpos($currentRequest->getRequestUri(), '_profiler')) {
Please login to merge, or discard this patch.
src/SWP/Bundle/ContentListBundle/Doctrine/ORM/ContentListItemRepository.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@
 block discarded – undo
78 78
             return $paginator->paginate(
79 79
                 $queryBuilder,
80 80
                 (int)$criteria->get('firstResult', 0),
81
-                 (int)$criteria->get('maxResults', RepositoryInterface::MAX_RESULTS)
81
+                    (int)$criteria->get('maxResults', RepositoryInterface::MAX_RESULTS)
82 82
             );
83 83
         }
84 84
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -77,12 +77,12 @@
 block discarded – undo
77 77
             $paginator = new Paginator($eventDispatcher);
78 78
             return $paginator->paginate(
79 79
                 $queryBuilder,
80
-                (int)$criteria->get('firstResult', 0),
81
-                 (int)$criteria->get('maxResults', RepositoryInterface::MAX_RESULTS)
80
+                (int) $criteria->get('firstResult', 0),
81
+                 (int) $criteria->get('maxResults', RepositoryInterface::MAX_RESULTS)
82 82
             );
83 83
         }
84 84
 
85
-        return $this->getPaginator( $eventDispatcher,$queryBuilder, $paginationData);
85
+        return $this->getPaginator($eventDispatcher, $queryBuilder, $paginationData);
86 86
     }
87 87
 
88 88
     public function getCountByCriteria(Criteria $criteria): int
Please login to merge, or discard this patch.
Bundle/CoreBundle/Theme/Locator/OrganizationThemesRecursiveFileLocator.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 
37 37
     private function getPaths() : array
38 38
     {
39
-      return [$this->themeUploader->getAvailableThemesPath()];
39
+        return [$this->themeUploader->getAvailableThemesPath()];
40 40
     }
41 41
 
42 42
     /**
Please login to merge, or discard this patch.
src/SWP/Bundle/CoreBundle/Pagination/Paginator.php 1 patch
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -25,62 +25,62 @@  discard block
 block discarded – undo
25 25
 use Symfony\Component\HttpFoundation\RequestStack;
26 26
 
27 27
 class Paginator implements PaginatorInterface {
28
-  private EventDispatcherInterface $eventDispatcher;
29
-  private ?RequestStack $requestStack;
30
-
31
-  private array $defaultOptions = [
32
-      self::PAGE_PARAMETER_NAME => 'page',
33
-      self::SORT_FIELD_PARAMETER_NAME => 'sort',
34
-      self::SORT_DIRECTION_PARAMETER_NAME => 'direction',
35
-      self::FILTER_FIELD_PARAMETER_NAME => 'filterParam',
36
-      self::FILTER_VALUE_PARAMETER_NAME => 'filterValue',
37
-      self::DISTINCT => true,
38
-      self::PAGE_OUT_OF_RANGE => self::PAGE_OUT_OF_RANGE_IGNORE,
39
-      self::DEFAULT_LIMIT => self::DEFAULT_LIMIT_VALUE,
40
-  ];
41
-
42
-
43
-  public function __construct(EventDispatcherInterface $eventDispatcher, ?RequestStack $requestStack = null) {
28
+    private EventDispatcherInterface $eventDispatcher;
29
+    private ?RequestStack $requestStack;
30
+
31
+    private array $defaultOptions = [
32
+        self::PAGE_PARAMETER_NAME => 'page',
33
+        self::SORT_FIELD_PARAMETER_NAME => 'sort',
34
+        self::SORT_DIRECTION_PARAMETER_NAME => 'direction',
35
+        self::FILTER_FIELD_PARAMETER_NAME => 'filterParam',
36
+        self::FILTER_VALUE_PARAMETER_NAME => 'filterValue',
37
+        self::DISTINCT => true,
38
+        self::PAGE_OUT_OF_RANGE => self::PAGE_OUT_OF_RANGE_IGNORE,
39
+        self::DEFAULT_LIMIT => self::DEFAULT_LIMIT_VALUE,
40
+    ];
41
+
42
+
43
+    public function __construct(EventDispatcherInterface $eventDispatcher, ?RequestStack $requestStack = null) {
44 44
     $this->eventDispatcher = $eventDispatcher;
45 45
     $this->requestStack = $requestStack;
46
-  }
46
+    }
47 47
 
48
-  public function setDefaultPaginatorOptions(array $options): void {
48
+    public function setDefaultPaginatorOptions(array $options): void {
49 49
     $this->defaultOptions = \array_merge($this->defaultOptions, $options);
50
-  }
51
-
52
-  /**
53
-   * {@inheritdoc}
54
-   *
55
-   * IMPORTANT: This method expects OFFSET value instead PAGE
56
-   */
57
-  public function paginate($target, int $offset = 1, $limit = 10, array $options = array()) : PaginationInterface {
50
+    }
51
+
52
+    /**
53
+     * {@inheritdoc}
54
+     *
55
+     * IMPORTANT: This method expects OFFSET value instead PAGE
56
+     */
57
+    public function paginate($target, int $offset = 1, $limit = 10, array $options = array()) : PaginationInterface {
58 58
     $limit = intval(abs($limit));
59 59
     if (!$limit) {
60
-      throw new \LogicException('Invalid item per page number, must be a positive number');
60
+        throw new \LogicException('Invalid item per page number, must be a positive number');
61 61
     }
62 62
 
63 63
     $page = intval(round($offset / $limit), 10);
64 64
     if ($page < 1) {
65
-      $page = 1;
65
+        $page = 1;
66 66
     }
67 67
 
68 68
     $options = \array_merge($this->defaultOptions, $options);
69 69
 
70 70
     // normalize default sort field
71 71
     if (isset($options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME]) && is_array($options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME])) {
72
-      $options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME] = implode('+', $options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME]);
72
+        $options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME] = implode('+', $options[PaginatorInterface::DEFAULT_SORT_FIELD_NAME]);
73 73
     }
74 74
 
75 75
     $request = null === $this->requestStack ? Request::createFromGlobals() : $this->requestStack->getCurrentRequest();
76 76
 
77 77
     // default sort field and direction are set based on options (if available)
78 78
     if (isset($options[self::DEFAULT_SORT_FIELD_NAME]) && !$request->query->has($options[self::SORT_FIELD_PARAMETER_NAME])) {
79
-      $request->query->set($options[self::SORT_FIELD_PARAMETER_NAME], $options[self::DEFAULT_SORT_FIELD_NAME]);
79
+        $request->query->set($options[self::SORT_FIELD_PARAMETER_NAME], $options[self::DEFAULT_SORT_FIELD_NAME]);
80 80
 
81
-      if (!$request->query->has($options[PaginatorInterface::SORT_DIRECTION_PARAMETER_NAME])) {
81
+        if (!$request->query->has($options[PaginatorInterface::SORT_DIRECTION_PARAMETER_NAME])) {
82 82
         $request->query->set($options[PaginatorInterface::SORT_DIRECTION_PARAMETER_NAME], $options[PaginatorInterface::DEFAULT_SORT_DIRECTION] ?? 'asc');
83
-      }
83
+        }
84 84
     }
85 85
 
86 86
     // before pagination start
@@ -92,20 +92,20 @@  discard block
 block discarded – undo
92 92
     $itemsEvent->target = &$target;
93 93
     $this->eventDispatcher->dispatch($itemsEvent, 'knp_pager.items');
94 94
     if (!$itemsEvent->isPropagationStopped()) {
95
-      throw new \RuntimeException('One of listeners must count and slice given target');
95
+        throw new \RuntimeException('One of listeners must count and slice given target');
96 96
     }
97 97
     if ($page > ceil($itemsEvent->count / $limit)) {
98
-      $pageOutOfRangeOption = $options[PaginatorInterface::PAGE_OUT_OF_RANGE] ?? $this->defaultOptions[PaginatorInterface::PAGE_OUT_OF_RANGE];
99
-      if ($pageOutOfRangeOption === PaginatorInterface::PAGE_OUT_OF_RANGE_FIX && $itemsEvent->count > 0) {
98
+        $pageOutOfRangeOption = $options[PaginatorInterface::PAGE_OUT_OF_RANGE] ?? $this->defaultOptions[PaginatorInterface::PAGE_OUT_OF_RANGE];
99
+        if ($pageOutOfRangeOption === PaginatorInterface::PAGE_OUT_OF_RANGE_FIX && $itemsEvent->count > 0) {
100 100
         // replace page number out of range with max page
101 101
         return $this->paginate($target, (int) ceil($itemsEvent->count / $limit), $limit, $options);
102
-      }
103
-      if ($pageOutOfRangeOption === self::PAGE_OUT_OF_RANGE_THROW_EXCEPTION && $page > 1) {
102
+        }
103
+        if ($pageOutOfRangeOption === self::PAGE_OUT_OF_RANGE_THROW_EXCEPTION && $page > 1) {
104 104
         throw new PageNumberOutOfRangeException(
105 105
             sprintf('Page number: %d is out of range.', $page),
106 106
             (int) ceil($itemsEvent->count / $limit)
107 107
         );
108
-      }
108
+        }
109 109
     }
110 110
 
111 111
     // pagination initialization event
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
     $paginationEvent->options = &$options;
115 115
     $this->eventDispatcher->dispatch($paginationEvent, 'knp_pager.pagination');
116 116
     if (!$paginationEvent->isPropagationStopped()) {
117
-      throw new \RuntimeException('One of listeners must create pagination view');
117
+        throw new \RuntimeException('One of listeners must create pagination view');
118 118
     }
119 119
     // pagination class can be different, with different rendering methods
120 120
     $paginationView = $paginationEvent->getPagination();
@@ -130,5 +130,5 @@  discard block
 block discarded – undo
130 130
     $this->eventDispatcher->dispatch($afterEvent, 'knp_pager.after');
131 131
 
132 132
     return $paginationView;
133
-  }
133
+    }
134 134
 }
Please login to merge, or discard this patch.
src/SWP/Bundle/CoreBundle/Service/FacebookInstantArticlesService.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@
 block discarded – undo
129 129
             $name = "";
130 130
             $params = ['slug' => $article->getSlug()];
131 131
             DecoratingRoutingExtension::setupParams($article->getRoute(), $name, $params);
132
-            $url = $this->urlGenerator->generate($name, $params , UrlGeneratorInterface::ABSOLUTE_URL);
132
+            $url = $this->urlGenerator->generate($name, $params, UrlGeneratorInterface::ABSOLUTE_URL);
133 133
 
134 134
             return $this->getClient($feed)->removeArticle($url);
135 135
         }
Please login to merge, or discard this patch.
src/BypassFinalHook.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,8 +6,8 @@
 block discarded – undo
6 6
 
7 7
 final class BypassFinalHook implements BeforeTestHook
8 8
 {
9
-  public function executeBeforeTest(string $test): void
10
-  {
9
+    public function executeBeforeTest(string $test): void
10
+    {
11 11
     BypassFinals::enable();
12
-  }
12
+    }
13 13
 }
Please login to merge, or discard this patch.
src/SWP/Bundle/CoreBundle/Controller/MenuController.php 2 patches
Indentation   +70 added lines, -70 removed lines patch added patch discarded remove patch
@@ -37,83 +37,83 @@  discard block
 block discarded – undo
37 37
 
38 38
 class MenuController extends AbstractFOSRestController {
39 39
 
40
-  private FormFactoryInterface $formFactory;
41
-  private EventDispatcherInterface $eventDispatcher;
42
-  private MenuItemRepositoryInterface $menuItemRepository;
43
-  private MenuItemManager $menuItemManager;
44
-  private MenuFactoryInterface $menuFactory;
45
-
46
-  /**
47
-   * @param FormFactoryInterface $formFactory
48
-   * @param EventDispatcherInterface $eventDispatcher
49
-   * @param MenuItemRepositoryInterface $menuItemRepository
50
-   * @param MenuItemManager $menuItemManager
51
-   * @param MenuFactoryInterface $menuFactory
52
-   */
53
-  public function __construct(FormFactoryInterface        $formFactory, EventDispatcherInterface $eventDispatcher,
54
-                              MenuItemRepositoryInterface $menuItemRepository, MenuItemManager $menuItemManager,
55
-                              MenuFactoryInterface        $menuFactory) {
40
+    private FormFactoryInterface $formFactory;
41
+    private EventDispatcherInterface $eventDispatcher;
42
+    private MenuItemRepositoryInterface $menuItemRepository;
43
+    private MenuItemManager $menuItemManager;
44
+    private MenuFactoryInterface $menuFactory;
45
+
46
+    /**
47
+     * @param FormFactoryInterface $formFactory
48
+     * @param EventDispatcherInterface $eventDispatcher
49
+     * @param MenuItemRepositoryInterface $menuItemRepository
50
+     * @param MenuItemManager $menuItemManager
51
+     * @param MenuFactoryInterface $menuFactory
52
+     */
53
+    public function __construct(FormFactoryInterface        $formFactory, EventDispatcherInterface $eventDispatcher,
54
+                                MenuItemRepositoryInterface $menuItemRepository, MenuItemManager $menuItemManager,
55
+                                MenuFactoryInterface        $menuFactory) {
56 56
     $this->formFactory = $formFactory;
57 57
     $this->eventDispatcher = $eventDispatcher;
58 58
     $this->menuItemRepository = $menuItemRepository;
59 59
     $this->menuItemManager = $menuItemManager;
60 60
     $this->menuFactory = $menuFactory;
61
-  }
61
+    }
62 62
 
63 63
 
64
-  /**
65
-   * @Route("/api/{version}/menus/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_menu")
66
-   */
67
-  public function listAction(Request $request): ResourcesListResponseInterface {
64
+    /**
65
+     * @Route("/api/{version}/menus/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_menu")
66
+     */
67
+    public function listAction(Request $request): ResourcesListResponseInterface {
68 68
     $menuRepository = $this->menuItemRepository;
69 69
     $page = $request->query->get('page', 1);
70 70
     $limit = $request->query->get('limit', 10);
71 71
 
72 72
     return new ResourcesListResponse($menuRepository->findRootNodes($this->eventDispatcher, $page, $limit));
73
-  }
73
+    }
74 74
 
75
-  /**
76
-   * @Route("/api/{version}/menus/{id}/children/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_children_menu")
77
-   */
78
-  public function listChildrenAction($id): ResourcesListResponseInterface {
75
+    /**
76
+     * @Route("/api/{version}/menus/{id}/children/", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_list_children_menu")
77
+     */
78
+    public function listChildrenAction($id): ResourcesListResponseInterface {
79 79
     $menuRepository = $this->menuItemRepository;
80 80
 
81 81
     $menus = $menuRepository->findChildrenAsTree($this->eventDispatcher, $this->findOr404($id));
82 82
 
83 83
     return new ResourcesListResponse($menus);
84
-  }
84
+    }
85 85
 
86
-  /**
87
-   * @Route("/api/{version}/menus/{id}/move/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_move_menu", requirements={"id"="\d+"})
88
-   */
89
-  public function moveAction(Request $request, $id): SingleResourceResponseInterface {
86
+    /**
87
+     * @Route("/api/{version}/menus/{id}/move/", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_move_menu", requirements={"id"="\d+"})
88
+     */
89
+    public function moveAction(Request $request, $id): SingleResourceResponseInterface {
90 90
     $menuItem = $this->findOr404($id);
91 91
     $form = $this->formFactory->createNamed('', MenuItemMoveType::class, [], ['method' => $request->getMethod()]);
92 92
     $form->handleRequest($request);
93 93
 
94 94
     if ($form->isSubmitted() && $form->isValid()) {
95
-      $menuItemManager = $this->menuItemManager;
96
-      $formData = $form->getData();
95
+        $menuItemManager = $this->menuItemManager;
96
+        $formData = $form->getData();
97 97
 
98
-      $menuItemManager->move($menuItem, $formData['parent'], $formData['position']);
98
+        $menuItemManager->move($menuItem, $formData['parent'], $formData['position']);
99 99
 
100
-      return new SingleResourceResponse($menuItem);
100
+        return new SingleResourceResponse($menuItem);
101 101
     }
102 102
 
103 103
     return new SingleResourceResponse($form, new ResponseContext(400));
104
-  }
104
+    }
105 105
 
106
-  /**
107
-   * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_menu")
108
-   */
109
-  public function getAction($id): SingleResourceResponseInterface {
106
+    /**
107
+     * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"GET"}, name="swp_api_core_get_menu")
108
+     */
109
+    public function getAction($id): SingleResourceResponseInterface {
110 110
     return new SingleResourceResponse($this->findOr404($id));
111
-  }
111
+    }
112 112
 
113
-  /**
114
-   * @Route("/api/{version}/menus/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_menu")
115
-   */
116
-  public function createAction(Request $request): SingleResourceResponseInterface {
113
+    /**
114
+     * @Route("/api/{version}/menus/", options={"expose"=true}, defaults={"version"="v2"}, methods={"POST"}, name="swp_api_core_create_menu")
115
+     */
116
+    public function createAction(Request $request): SingleResourceResponseInterface {
117 117
     /* @var MenuItemInterface $menu */
118 118
     $menu = $this->menuFactory->create();
119 119
     $form = $this->formFactory->createNamed('', MenuType::class, $menu, ['method' => $request->getMethod()]);
@@ -121,20 +121,20 @@  discard block
 block discarded – undo
121 121
     $form->handleRequest($request);
122 122
 
123 123
     if ($form->isSubmitted() && $form->isValid()) {
124
-      $this->menuItemManager->update($menu);
125
-      $this->menuItemRepository->add($menu);
126
-      $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_CREATED);
124
+        $this->menuItemManager->update($menu);
125
+        $this->menuItemRepository->add($menu);
126
+        $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_CREATED);
127 127
 
128
-      return new SingleResourceResponse($menu, new ResponseContext(201));
128
+        return new SingleResourceResponse($menu, new ResponseContext(201));
129 129
     }
130 130
 
131 131
     return new SingleResourceResponse($form, new ResponseContext(400));
132
-  }
132
+    }
133 133
 
134
-  /**
135
-   * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_menu")
136
-   */
137
-  public function deleteAction(int $id) {
134
+    /**
135
+     * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"DELETE"}, name="swp_api_core_delete_menu")
136
+     */
137
+    public function deleteAction(int $id) {
138 138
     $repository = $this->menuItemRepository;
139 139
     $menu = $this->findOr404($id);
140 140
 
@@ -142,35 +142,35 @@  discard block
 block discarded – undo
142 142
     $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_DELETED);
143 143
 
144 144
     return new SingleResourceResponse(null, new ResponseContext(204));
145
-  }
145
+    }
146 146
 
147
-  /**
148
-   * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_menu")
149
-   */
150
-  public function updateAction(Request $request, $id): SingleResourceResponseInterface {
147
+    /**
148
+     * @Route("/api/{version}/menus/{id}", options={"expose"=true}, defaults={"version"="v2"}, methods={"PATCH"}, name="swp_api_core_update_menu")
149
+     */
150
+    public function updateAction(Request $request, $id): SingleResourceResponseInterface {
151 151
     $menu = $this->findOr404($id);
152 152
     $parent = $menu->getParent();
153 153
     $form = $this->formFactory->createNamed('', MenuType::class, $menu, ['method' => $request->getMethod()]);
154 154
     $form->handleRequest($request);
155 155
     if ($form->isSubmitted() && $form->isValid()) {
156
-      $this->menuItemManager->update($menu);
157
-      if($parent !== $menu->getParent()) {
158
-          $this->menuItemManager->update($parent);
159
-      }
160
-      $this->menuItemRepository->flush();
161
-      $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_UPDATED);
162
-      return new SingleResourceResponse($menu);
156
+        $this->menuItemManager->update($menu);
157
+        if($parent !== $menu->getParent()) {
158
+            $this->menuItemManager->update($parent);
159
+        }
160
+        $this->menuItemRepository->flush();
161
+        $this->eventDispatcher->dispatch(new GenericEvent($menu), MenuEvents::MENU_UPDATED);
162
+        return new SingleResourceResponse($menu);
163 163
     }
164 164
 
165 165
     return new SingleResourceResponse($form, new ResponseContext(400));
166
-  }
166
+    }
167 167
 
168
-  private function findOr404($id): MenuItemInterface {
168
+    private function findOr404($id): MenuItemInterface {
169 169
     /* @var MenuItemInterface $menu */
170 170
     if (null === $menu = $this->menuItemRepository->findOneBy(['id' => $id])) {
171
-      throw new NotFoundHttpException('Menu item was not found.');
171
+        throw new NotFoundHttpException('Menu item was not found.');
172 172
     }
173 173
 
174 174
     return $menu;
175
-  }
175
+    }
176 176
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -154,7 +154,7 @@
 block discarded – undo
154 154
     $form->handleRequest($request);
155 155
     if ($form->isSubmitted() && $form->isValid()) {
156 156
       $this->menuItemManager->update($menu);
157
-      if($parent !== $menu->getParent()) {
157
+      if ($parent !== $menu->getParent()) {
158 158
           $this->menuItemManager->update($parent);
159 159
       }
160 160
       $this->menuItemRepository->flush();
Please login to merge, or discard this patch.
src/SWP/Bundle/CoreBundle/Twig/MenuExtension.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -21,58 +21,58 @@
 block discarded – undo
21 21
 use Twig\TwigFunction;
22 22
 
23 23
 class MenuExtension extends KnpMenuExtension {
24
-  /**
25
-   * {@inheritdoc}
26
-   */
27
-  public function getMy($menu, array $path = [], array $options = []): ?ItemInterface {
24
+    /**
25
+     * {@inheritdoc}
26
+     */
27
+    public function getMy($menu, array $path = [], array $options = []): ?ItemInterface {
28 28
     try {
29
-      return parent::get($menu, $path, $options);
29
+        return parent::get($menu, $path, $options);
30 30
     } catch (\InvalidArgumentException $e) {
31
-      return null;
31
+        return null;
32
+    }
32 33
     }
33
-  }
34 34
 
35
-  /**
36
-   * {@inheritdoc}
37
-   */
38
-  public function render($menu, array $options = [], $renderer = null): string {
35
+    /**
36
+     * {@inheritdoc}
37
+     */
38
+    public function render($menu, array $options = [], $renderer = null): string {
39 39
     try {
40
-      return parent::render($menu, $options, $renderer);
40
+        return parent::render($menu, $options, $renderer);
41 41
     } catch (\InvalidArgumentException $e) {
42
-      // allow to render empty value
43
-      return "";
42
+        // allow to render empty value
43
+        return "";
44
+    }
44 45
     }
45
-  }
46 46
 
47
-  /**
48
-   * {@inheritdoc}
49
-   */
50
-  public function getBreadcrumbsArrayMy($menu, $subItem = null): ?array {
47
+    /**
48
+     * {@inheritdoc}
49
+     */
50
+    public function getBreadcrumbsArrayMy($menu, $subItem = null): ?array {
51 51
     try {
52
-      return parent::getBreadcrumbsArray($menu, $subItem);
52
+        return parent::getBreadcrumbsArray($menu, $subItem);
53 53
     } catch (\InvalidArgumentException $e) {
54
-      // allow to render empty value
55
-      return null;
54
+        // allow to render empty value
55
+        return null;
56
+    }
56 57
     }
57
-  }
58 58
 
59
-  /**
60
-   * {@inheritdoc}
61
-   */
62
-  public function getCurrentItemMy($menu): ?ItemInterface {
59
+    /**
60
+     * {@inheritdoc}
61
+     */
62
+    public function getCurrentItemMy($menu): ?ItemInterface {
63 63
     try {
64
-      return parent::getCurrentItem($menu);
64
+        return parent::getCurrentItem($menu);
65 65
     } catch (\InvalidArgumentException $e) {
66
-      return null;
66
+        return null;
67
+    }
67 68
     }
68
-  }
69 69
 
70
-  public function getFunctions(): array {
70
+    public function getFunctions(): array {
71 71
     return [
72 72
         new TwigFunction('knp_menu_get', [$this, 'getMy']),
73 73
         new TwigFunction('knp_menu_render', [$this, 'render'], ['is_safe' => ['html']]),
74 74
         new TwigFunction('knp_menu_get_breadcrumbs_array', [$this, 'getBreadcrumbsArrayMy']),
75 75
         new TwigFunction('knp_menu_get_current_item', [$this, 'getCurrentItemMy']),
76 76
     ];
77
-  }
77
+    }
78 78
 }
Please login to merge, or discard this patch.