feat(chore): pass public function to protected

fix #51
jorisdugue · Jan 30, 2024 · 9df2181 · 9df2181
1 parent c21221c
commit 9df2181
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 16 deletions.
diff --git a/Core/H5PSymfony.php b/Core/H5PSymfony.php
@@ -86,17 +86,16 @@ class H5PSymfony implements \H5PFrameworkInterface
      * @param RouterInterface $router
      */
     public function __construct(
-        H5POptions                    $options,
-        EditorStorage                 $editorStorage,
-        TokenStorageInterface         $tokenStorage,
-        EntityManagerInterface        $manager,
-        ?Session                      $session,
-        ?RequestStack                 $requestStack,
+        H5POptions $options,
+        EditorStorage $editorStorage,
+        TokenStorageInterface $tokenStorage,
+        EntityManagerInterface $manager,
+        ?Session $session,
+        ?RequestStack $requestStack,
         AuthorizationCheckerInterface $authorizationChecker,
-        EventDispatcherInterface      $eventDispatcher,
-        RouterInterface               $router
-    )
-    {
+        EventDispatcherInterface $eventDispatcher,
+        RouterInterface $router
+    ) {
         $this->options = $options;
         $this->editorStorage = $editorStorage;
         $this->tokenStorage = $tokenStorage;
@@ -158,8 +157,7 @@ public function fetchExternalData(
         $headers = [],
         $files = [],
         $method = 'POST'
-    )
-    {
+    ) {
         $options = [];
         if (!empty($data)) {
             $options['headers'] = ['Content-Type' => 'application/x-www-form-urlencoded'];
@@ -893,7 +891,7 @@ public function getOption($name, $default = null)
         try {
             // return default if db/table still not created
             return $this->options->getOption($name, $default);
-        } catch (ConnectionException|TableNotFoundException $e) {
+        } catch (ConnectionException | TableNotFoundException $e) {
             return $default;
         }
     }

diff --git a/Core/H5PUtils.php b/Core/H5PUtils.php
@@ -21,7 +21,7 @@ public function __construct(TokenStorageInterface $tokenStorage)
      * Fetch the current user if not present return the anonymous user
      * @return string|UserInterface|null
      */
-    public function getCurrentOrAnonymousUser()
+    protected function getCurrentOrAnonymousUser()
     {
         $token = $this->tokenStorage->getToken();
 
@@ -36,7 +36,7 @@ public function getCurrentOrAnonymousUser()
      * @param UserInterface|null $user
      * @return string|null|integer
      */
-    public function getUserId(?UserInterface $user)
+    protected function getUserId(?UserInterface $user)
     {
         if ($user !== null) {
             if (method_exists($user, 'getId')) {

diff --git a/Twig/H5PExtension.php b/Twig/H5PExtension.php
@@ -23,7 +23,7 @@ public function __construct(H5PIntegration $h5pIntegration)
 
     public function getFilters(): array
     {
-        return [new TwigFilter('h5pCacheBuster', [$this, 'getH5PCacheBuster']),];
+        return [new TwigFilter('h5pCacheBuster', [$this, 'getH5PCacheBuster'])];
     }
 
     public function getH5PCacheBuster($script): string