Merge pull request #631

* pr-631: [Core,Jobs] failed tests [Core,Jobs] fixed failed jobs pagination filter, ref #628 [Core,Applications] fixed failed application attachment upload, ref #629 [Organization] fixed OrganizationImage::metadata default value to be null. integrated phpunit into github actions [Docker] removed --small-files option for mongodb server [Core] added ability to load additional module during development, ref #613 [Core] fixed mail service path options for FileTransport [Applications] fixed deprecated php each function [Core] fixed RatingFieldset getter properties, ref #626 [Core] fixed tz_date data type conversion, ref #627
cross-solution · Feb 25, 2021 · dc8fc42 · dc8fc42
2 parents 681e591 + c4b5867
commit dc8fc42
Show file tree

Hide file tree

Showing 18 changed files with 161 additions and 49 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,89 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+
+env:
+  COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  COVERAGE: '0'
+  APPLICATION_ENV: 'development'
+  TIMEZONE: Europe/Berlin
+
+jobs:
+  phpunit:
+    name: PHPUnit Test
+    runs-on: ubuntu-latest
+    timeout-minutes: 20
+    strategy:
+      matrix:
+        php:
+          - '7.4'
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+          tools: pecl, composer
+          extensions: intl, bcmath, curl, openssl, mbstring, mongodb, solr
+          coverage: pcov
+          ini-values: memory_limit=-1
+      - name: Start MongoDB
+        uses: supercharge/mongodb-github-action@1.3.0
+        with:
+          mongodb-version: 4.4
+      - name: Copy CI Configuration
+        run: |
+          cp etc/travis/autoload/*.* config/autoload
+      - name: Get composer cache directory
+        id: composercache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache dependencies
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.composercache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Set Composer platform config
+        if: (startsWith(matrix.php, '8.0'))
+        run: |
+          composer config platform.php 7.4.99
+      - name: Update project dependencies
+        run: composer update --no-interaction --no-progress --ansi
+      - name: Run PHPUnit tests
+        run: |
+          mkdir -p build/logs/phpunit
+          if [ "$COVERAGE" = '1' ]; then
+            vendor/bin/phpunit --coverage-clover build/logs/phpunit/clover.xml --log-junit build/logs/phpunit/junit.xml
+          else
+            vendor/bin/phpunit --log-junit build/logs/phpunit/junit.xml
+          fi
+      - name: Upload test artifacts
+        if: always()
+        uses: actions/upload-artifact@v1
+        with:
+          name: phpunit-logs-php${{ matrix.php }}
+          path: build/logs/phpunit
+        continue-on-error: true
+      - name: Upload coverage results to Codecov
+        if: matrix.coverage
+        uses: codecov/codecov-action@v1
+        with:
+          name: phpunit-php${{ matrix.php }}
+          flags: phpunit
+          fail_ci_if_error: true
+        continue-on-error: true
+      - name: Upload coverage results to Coveralls
+        if: matrix.coverage
+        env:
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          composer global require --prefer-dist --no-interaction --no-progress --ansi cedx/coveralls
+          export PATH="$PATH:$HOME/.composer/vendor/bin"
+          coveralls build/logs/phpunit/clover.xml
+          wget https://scrutinizer-ci.com/ocular.phar
+          travis_retry php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
+        continue-on-error: true
diff --git a/.gitignore b/.gitignore
@@ -29,6 +29,7 @@ config/phpdoc.xml
 config/autoload
 config/autoload.bak
 config/autoload/*.php
+!config/autoload/.gitkeep
 
 test/config/*.local.php
 test/TestConfig.php

diff --git a/config/autoload/.gitkeep b/config/autoload/.gitkeep
diff --git a/config/modules.php b/config/modules.php
@@ -8,11 +8,7 @@
  * @license   MIT
  */
 
-if (getenv('ADDITIONAL_MODULES')) {
-
-}
-
-return [
+$modules = [
     'SlmQueue',
     'Core',
     'Auth',
@@ -26,3 +22,14 @@
     'ReleaseTools',
     'Yawik\\Migration'
 ];
+
+// add ability to load additional module in autoload/*.module.php
+use Symfony\Component\Finder\Finder;
+$finder = Finder::create()
+    ->name('*.module.php')
+    ->in(__DIR__.'/autoload');
+foreach($finder->files() as $file){
+    $modules = array_merge($modules, include $file);
+}
+
+return $modules;
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -37,4 +37,4 @@ services:
             - ./etc/docker/mongodb/data:/data/db
         ports:
             - "27017:27017"
-        command: mongod --smallfiles --logpath=/dev/null # --quiet
+        command: mongod --logpath=/dev/null # --quiet
diff --git a/module/Applications/src/Controller/ManageController.php b/module/Applications/src/Controller/ManageController.php
@@ -391,9 +391,13 @@ public function statusAction()
         $form = $this->forms->get('Applications/Mail');
         $form->populateValues($params);
 
-
-
-        $recipient = $params['to'];
+        $to = $params['to'];
+        $email = key($to);
+        $name = $to[$email];
+        $recipient = [
+            'email' => $email,
+            'name' => $name,
+        ];
 
         return [
             'recipient' => $recipient,

diff --git a/module/Applications/src/Repository/Event/UpdateFilesPermissionsSubscriber.php b/module/Applications/src/Repository/Event/UpdateFilesPermissionsSubscriber.php
@@ -26,7 +26,7 @@ class UpdateFilesPermissionsSubscriber implements EventSubscriber
      *
      * @see \Doctrine\Common\EventSubscriber::getSubscribedEvents()
      */
-    public function getSubscribedEvents()
+    public function getSubscribedEvents(): array
     {
         return array(Events::onFlush);
     }
@@ -54,8 +54,10 @@ public function onFlush(OnFlushEventArgs $eventArgs)
             foreach ($documents as $document) { /* @var \Applications\Entity\Application $document */
                 $permissions = $document->getPermissions();
 
-                foreach ($document->getAttachments() as $attachment) {  /* @var \Applications\Entity\Attachment $attachment */
-                    $attachment->getPermissions()
+                foreach ($document->getAttachments() as $attachment) {
+                    /* @var \Applications\Entity\Attachment $attachment */
+                    $attachment->getMetadata()
+                               ->getPermissions()
                                ->clear()
                                ->inherit($permissions);
                     if ($isUpdate) {
@@ -67,9 +69,10 @@ public function onFlush(OnFlushEventArgs $eventArgs)
                 }
 
                 if ($image = $document->getContact()->getImage()) {
-                    $image->getPermissions()
-                          ->clear()
-                          ->inherit($permissions);
+                    $image->getMetadata()
+                        ->getPermissions()
+                        ->clear()
+                        ->inherit($permissions);
                     if ($isUpdate) {
                         $uow->computeChangeSet(
                             $dm->getClassMetadata(get_class($image)),

diff --git a/module/Applications/src/Service/UploadHandler.php b/module/Applications/src/Service/UploadHandler.php
@@ -116,7 +116,9 @@ private function doUploadFile(
         $metadata->setContentType($info['type']);
         $metadata->setName($info['name']);
 
-        $this->dm->persist($user);
+        if(!is_null($user)){
+            $this->dm->persist($user);
+        }
         return $fileManager->uploadFromFile(
             Attachment::class,
             $metadata,

diff --git a/module/Applications/view/applications/manage/status.phtml b/module/Applications/view/applications/manage/status.phtml
@@ -14,13 +14,8 @@ $form->get('mailText')->setAttribute('style', 'height: 250px');
 ?>
 <div>
 <?php
-list ($email, $name) = each ($recipient);
-if (is_int($email)) {
-    $email = $name;
-    $name = '';
-}
 
-echo sprintf($this->translate("To") . ': ' . '"%s" &lt;%s&gt;<br>', $name, $email);
+echo sprintf($this->translate("To") . ': ' . '"%s" &lt;%s&gt;<br>', $recipient['name'], $recipient['email']);
 
 ?>
 </div>

diff --git a/module/Core/src/Entity/FileMetadataInterface.php b/module/Core/src/Entity/FileMetadataInterface.php
@@ -19,18 +19,14 @@ interface FileMetadataInterface extends ResourceInterface
 {
     public function getName(): ?string;
 
-    public function setUser(UserInterface $user);
+    public function setUser(?UserInterface $user): self;
 
     public function getUser(): ?UserInterface;
 
     public function setPermissions(PermissionsInterface $permissions);
 
     public function getPermissions(): ?PermissionsInterface;
 
-    /**
-     * @param string $contentType
-     * @return self
-     */
     public function setContentType(string $contentType);
 
     public function getContentType(): ?string;

diff --git a/module/Core/src/Entity/FileMetadataTrait.php b/module/Core/src/Entity/FileMetadataTrait.php
@@ -48,6 +48,10 @@ public function getContentType(): ?string
         return $this->contentType;
     }
 
+    /**
+     * @param string|null $contentType
+     * @return $this
+     */
     public function setContentType(?string $contentType)
     {
         $this->contentType = $contentType;
@@ -62,7 +66,7 @@ public function getUser(): ?UserInterface
         return $this->user;
     }
 
-    public function setUser(UserInterface $user)
+    public function setUser(?UserInterface $user): self
     {
         if ($this->user) {
             $this->getPermissions()->revoke($this->user, Permissions::PERMISSION_ALL, false);

diff --git a/module/Core/src/Form/RatingFieldset.php b/module/Core/src/Form/RatingFieldset.php
@@ -50,9 +50,15 @@ public function build()
 
         foreach ($properties as $property) {
             $name  = $property->getName();
-            if (0 === strpos($name, '-')) {
+
+            // @TODO: check if '-' check is necessary
+            if (
+                0 === strpos($name, '-')
+                || 0 === strpos($name, '_')
+            ) {
                 continue;
             }
+
             $value = $rating->{'get' . $name}();
             $input = array(
                 'type' => 'Core/Rating',

diff --git a/module/Core/src/Mail/MailServiceFactory.php b/module/Core/src/Mail/MailServiceFactory.php
@@ -70,7 +70,12 @@ public function getTransport(MailServiceOptions $mailServiceOptions)
             return new Smtp($mailServiceOptions);
         } elseif (MailService::TRANSPORT_FILE == $type) {
             $fileOptions = new FileOptions();
-            $fileOptions->setPath($mailServiceOptions->getPath());
+            $path = $mailServiceOptions->getPath();
+            if(!is_dir($path)){
+                mkdir($path, true);
+            }
+
+            $fileOptions->setPath($path);
             return new FileTransport($fileOptions);
         } elseif (MailService::TRANSPORT_SENDMAIL == $type) {
             return new Sendmail();

diff --git a/module/Core/src/Paginator/Adapter/DoctrineMongoLateAdapter.php b/module/Core/src/Paginator/Adapter/DoctrineMongoLateAdapter.php
@@ -23,12 +23,7 @@ class DoctrineMongoLateAdapter implements AdapterInterface
      */
     private QueryBuilder $queryBuilder;
 
-    /**
-     * @var AbstractPaginationQuery
-     */
-    private AbstractPaginationQuery $filter;
-
-    private array $params;
+    private $totalItem;
 
     /**
      * @param QueryBuilder $queryBuilder
@@ -38,8 +33,15 @@ class DoctrineMongoLateAdapter implements AdapterInterface
     public function __construct(QueryBuilder $queryBuilder, AbstractPaginationQuery $filter, $params = array())
     {
         $this->queryBuilder = $queryBuilder;
-        $this->filter = $filter;
-        $this->params = $params;
+        $filtered = $filter->createQuery($params, $queryBuilder);
+        $this->queryBuilder = $queryBuilder;
+
+        // skip count during tests
+        if(!is_null($filtered)){
+            $this->queryBuilder = $filtered;
+            $this->totalItem = (clone $filtered)->count()->getQuery()->execute();
+        }
+
     }
 
     public function getItems($offset, $itemCountPerPage)
@@ -55,13 +57,10 @@ public function getItems($offset, $itemCountPerPage)
 
     /**
      * @return int
-     * @throws \Doctrine\ODM\MongoDB\MongoDBException
-     * FIXME: count method for ODM Module 3
      */
     public function count()
     {
-        $qb = clone $this->queryBuilder;
-        return $qb->count()->getQuery()->execute();
+        return $this->totalItem;
     }
 
 }
diff --git a/module/Core/src/Repository/DoctrineMongoODM/Types/TimezoneAwareDate.php b/module/Core/src/Repository/DoctrineMongoODM/Types/TimezoneAwareDate.php
@@ -117,12 +117,13 @@ public function closureToPhp(): string
             /* CODE FROM: ' . __METHOD__ . ' */
             if (!is_array($value) 
                 || !isset($value["date"]) 
-                || !$value["date"] instanceOf UTCDateTime
+                || is_null($value["date"])
                 || !isset($value["tz"])
             ) {
                 $return = null;
             } else {
-                $date = new \DateTime("@".$value["date"]->sec);
+                //$date = new \DateTime($value["date"]);
+                $date = $value["date"]->toDateTime();
                 $date->setTimezone(new \DateTimeZone($value["tz"]));
                 $return = $date;
             }

diff --git a/module/Jobs/src/Repository/Filter/JobboardPaginationQuery.php b/module/Jobs/src/Repository/Filter/JobboardPaginationQuery.php
@@ -37,8 +37,7 @@ public function createQuery($params, $queryBuilder)
          */
         if (isset($params['search']) && !empty($params['search'])) {
             $search = strtolower($params['search']);
-            $expression = $queryBuilder->expr()->operator('$text', ['$search' => $search]);
-            $queryBuilder->field(null)->equals($expression->getQuery());
+            $queryBuilder->text($search);
         }
         if (isset($params['o']) && !empty($params['o'])) {
             $queryBuilder->field('organization')->equals(new ObjectId($params['o']));

diff --git a/module/Jobs/src/Repository/Filter/PaginationQuery.php b/module/Jobs/src/Repository/Filter/PaginationQuery.php
@@ -81,8 +81,9 @@ public function createQuery($params, $queryBuilder)
          */
         if (isset($params['search']) && !empty($params['search'])) {
             $search = strtolower($params['search']);
-            $expression = $queryBuilder->expr()->operator('$text', ['$search' => $search]);
-            $queryBuilder->field(null)->equals($expression->getQuery());
+            //$expression = $queryBuilder->expr()->operator('$text', ['$search' => $search]);
+            //$queryBuilder->field(null)->equals($expression->getQuery());
+            $queryBuilder->text($search);
         }
         if (isset($params['o']) && !empty($params['o'])) {
             $queryBuilder->field('organization')->equals(new ObjectId($params['o']));

diff --git a/module/Organizations/src/Entity/OrganizationImage.php b/module/Organizations/src/Entity/OrganizationImage.php
@@ -23,7 +23,7 @@ class OrganizationImage implements ImageInterface
     /**
      * @ODM\File\Metadata(targetDocument="Organizations\Entity\OrganizationImageMetadata")
      */
-    protected ?ImageMetadata $metadata;
+    protected ?ImageMetadata $metadata = null;
 
     public function getMetadata(): ?ImageMetadata
     {