Merge pull request #21 from Emmedy/develop

Release

.github/workflows/ci.yml

@@ -0,0 +1,14 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build-test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+      - uses: php-actions/composer@v6
+      - uses: php-actions/phpstan@v3
+        with:
+          memory_limit: -1

Command/H5pBundleCleanUpFilesCommand.php

@@ -2,15 +2,26 @@
 
 namespace Emmedy\H5PBundle\Command;
 
+use Emmedy\H5PBundle\Core\H5POptions;
 use Symfony\Component\Console\Command\Command;
 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 Symfony\Component\Console\Style\SymfonyStyle;
 
 class H5pBundleCleanUpFilesCommand extends Command
 {
+
+    /**
+     * @var H5POptions $h5POptions
+     */
+    private $h5POptions;
+
+    public function __construct(H5POptions $h5POptions)
+    {
+        $this->h5POptions = $h5POptions;
+        parent::__construct();
+    }
+
     protected static $defaultName = 'h5p-bundle:cleanup-files';
     protected function configure()
     {
@@ -31,7 +42,7 @@ private function cleanupFiles(InputInterface $input)
     {
         $location = $input->getArgument('location');
         if (!$location) {
-            $location = $this->get('emmedy_h5p.options')->getAbsoluteH5PPath() . '/editor';
+            $location = $this->h5POptions->getAbsoluteH5PPath() . '/editor';
         }
         \H5PCore::deleteFileTree($location);
     }

Controller/H5PAJAXController.php

@@ -94,11 +94,9 @@ public function TranslationsCallback(Request $request)
     /**
      * Callback Install library from external file
      *
-     * @param string $token Security token
-     * @param int $content_id Id of content
-     * @param string $machine_name Machine name of library
      * @param Request $request
      *
+     * @return JsonResponse
      * @Route("/library-install/")
      */
     public function libraryInstallCallback(Request $request)
@@ -121,11 +119,8 @@ public function libraryInstallCallback(Request $request)
     /**
      * Callback that returns data for a given library
      *
-     * @param string $machine_name Machine name of library
-     * @param int $major_version Major version of library
-     * @param int $minor_version Minor version of library
-     * @param string $locale Language of your website and plugins  for default is English (EN)
      * @param Request $request
+     * @return JsonResponse
      */
     private function libraryCallback(Request $request)
     {
@@ -158,10 +153,9 @@ private function libraryCallback(Request $request)
     /**
      * Callback for uploading a library
      *
-     * @param string $token Editor security token
-     * @param int $content_id Id of content that is being edited
      * @param Request $request
      *
+     * @return JsonResponse
      * @throws Exception
      * @Route("/library-upload/")
      */
@@ -194,9 +188,8 @@ public function libraryUploadCallback(Request $request)
     /**
      * Callback for file uploads.
      *
-     * @param string $token SecuritlibraryCallbacky token
-     * @param int $content_id Content id
      * @param Request $request
+     * @return JsonResponse
      * @Route("/files/")
      */
     public function filesCallback(Request $request)
@@ -220,9 +213,8 @@ public function filesCallback(Request $request)
     /**
      * Callback for filtering.
      *
-     * @param string $token Security token
-     * @param int $content_id Content id
      * @param Request $request
+     * @return JsonResponse
      * @Route("/filter/")
      */
     public function filterCallback(Request $request)

Controller/H5PController.php

@@ -3,6 +3,7 @@
 
 namespace Emmedy\H5PBundle\Controller;
 
+use Doctrine\ORM\EntityManagerInterface;
 use Emmedy\H5PBundle\Core\H5POptions;
 use Emmedy\H5PBundle\Editor\LibraryStorage;
 use Emmedy\H5PBundle\Entity\Content;
@@ -22,13 +23,16 @@ class H5PController extends AbstractController
 
     protected $h5PIntegrations;
     protected $libraryStorage;
+    protected $entityManager;
 
     public function __construct(
         H5PIntegration $h5PIntegration,
-        LibraryStorage $libraryStorage
+        LibraryStorage $libraryStorage,
+        EntityManagerInterface $entityManager
     ) {
         $this->h5PIntegrations = $h5PIntegration;
         $this->libraryStorage = $libraryStorage;
+        $this->entityManager = $entityManager;
     }
 
     /**
@@ -37,7 +41,7 @@ public function __construct(
      */
     public function listAction()
     {
-        $contents = $this->getDoctrine()->getRepository('Emmedy\H5PBundle\Entity\Content')->findAll();
+        $contents = $this->entityManager->getRepository('Emmedy\H5PBundle\Entity\Content')->findAll();
         return $this->render('@EmmedyH5P/list.html.twig', ['contents' => $contents]);
     }
     /**
@@ -78,11 +82,12 @@ public function newAction(Request $request)
     {
         return $this->handleRequest($request );
     }
+
     /**
      * @Route("edit/{content}")
      * @param Request $request
      * @param Content $content
-     * @return
+     * @return RedirectResponse|Response
      */
     public function editAction(Request $request, Content $content)
     {