Updated license info and code style (#347)

* Updated license info

* updated license and added code-style action

* Apply php-cs-fixer changes

Co-authored-by: Christian Fasching <christian.fasching@pimcore.com>
Co-authored-by: fashxp <fashxp@users.noreply.github.com>

Author: weisswurstkanone

.github/workflows/php-style.yml

@@ -0,0 +1,20 @@
+name: PHP Style
+
+on: [push, pull_request]
+
+jobs:
+    php-cs-fixer:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+              with:
+                  ref: ${{ github.head_ref }}
+
+            - name: PHP-CS-Fixer
+              uses: docker://oskarstark/php-cs-fixer-ga:2.19.0
+              with:
+                args: --config=.php_cs.dist --allow-risky yes
+
+            - uses: stefanzweifel/git-auto-commit-action@v4
+              with:
+                  commit_message: Apply php-cs-fixer changes

.php_cs.dist

@@ -17,12 +17,12 @@ return PhpCsFixer\Config::create()
                                         'header' => 'Pimcore' . PHP_EOL . PHP_EOL .
                                             'This source file is available under two different licenses:' . PHP_EOL .
                                             '- GNU General Public License version 3 (GPLv3)' . PHP_EOL .
-                                            '- Pimcore Enterprise License (PEL)' . PHP_EOL .
+                                            '- Pimcore Commercial License (PCL)' . PHP_EOL .
                                             'Full copyright and license information is available in' . PHP_EOL .
                                             'LICENSE.md which is distributed with this source code.' . PHP_EOL .
                                             PHP_EOL .
                                             ' @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)' . PHP_EOL .
-                                            ' @license    http://www.pimcore.org/license     GPLv3 and PEL'
+                                            ' @license    http://www.pimcore.org/license     GPLv3 and PCL'
                                     ],
 
         // keep aligned = and => operators as they are: do not force aligning, but do not remove it

LICENSE.md

@@ -3,9 +3,9 @@ Copyright (C) Pimcore GmbH
 
 This software is available under two different licenses: 
 * GNU General Public License version 3 (GPLv3) as Pimcore Community Edition
-* Pimcore Enterprise License (PEL)
+* Pimcore Commercial License (PCL)
 
-The default Pimcore license, without a valid Pimcore Enterprise License agreement, is the Open-Source GPLv3 license.
+The default Pimcore license, without a valid Pimcore Commercial License agreement, is the Open-Source GPLv3 license.
 
 ## GNU General Public License version 3 (GPLv3)
 If you decide to choose the GPLv3 license, you must comply with the following terms: 
@@ -23,11 +23,14 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-## Pimcore Enterprise License (PEL)
+## Pimcore Commercial License (PCL)
 Alternatively, commercial and supported versions of the program - also known as
-Enterprise Distributions - must be used in accordance with the terms and conditions
-contained in a separate written agreement between you and Pimcore GmbH. For more information about the Pimcore Enterprise License (PEL) please contact info@pimcore.com.
+Commercial Distributions - must be used in accordance with the terms and conditions
+contained in a separate written agreement between you and Pimcore GmbH. 
+For more information about the Pimcore Commercial License (PCL) please contact info@pimcore.com.
 
 
-Please see also (files in this directory):  
-[GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - gpl-3.0.txt](gpl-3.0.txt)  
+
+Please see also (files in this directory):
+- [Licensing FAQ - license-faq.md](https://github.com/pimcore/pimcore/blob/master/license-faq.md)
+- [GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 - gpl-3.0.txt](gpl-3.0.txt)

src/Command/GraphQL/RebuildDefinitionsCommand.php

@@ -1,15 +1,16 @@
 <?php
+
 /**
  * Pimcore
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
  *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle\Command\GraphQL;
@@ -29,7 +30,7 @@ protected function configure()
     {
         $this
             ->setName('datahub:graphql:rebuild-definitions')
-            ->setDescription("Rebuild GraphQL endpoint definitions")
+            ->setDescription('Rebuild GraphQL endpoint definitions')
             ->addOption(
             'definitions',
                 null,
@@ -41,7 +42,9 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
+     *
      * @return int|void|null
+     *
      * @throws \Exception
      */
     public function execute(InputInterface $input, OutputInterface $output)
@@ -54,12 +57,11 @@ public function execute(InputInterface $input, OutputInterface $output)
             $list = Configuration\Dao::getList();
             foreach ($list as $configuration) {
                 $endpoint = $configuration->getName();
-                $included[]= $endpoint;
+                $included[] = $endpoint;
             }
         }
 
         foreach ($included as $endpoint) {
-
             $config = Configuration::getByName($endpoint);
             if (!$config) {
                 $this->output->writeln('<error>Could not find config: ' . $endpoint . '</error>');

src/ConfigEvents.php

@@ -5,12 +5,12 @@
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
  *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle;

src/Configuration.php

@@ -5,12 +5,12 @@
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
  *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle;
@@ -22,11 +22,12 @@
 
 /**
  * Class Configuration
+ *
  * @package Pimcore\Bundle\DataHubBundle
  */
 class Configuration extends AbstractModel
 {
-    public const SECURITYCONFIG_AUTH_APIKEY = "datahub_apikey";
+    public const SECURITYCONFIG_AUTH_APIKEY = 'datahub_apikey';
 
     /**
      * @var string
@@ -179,8 +180,8 @@ public function save(): void
         $this->configuration['general']['name'] = $this->name;
 
         $securityConfig = $this->getSecurityConfig();
-        if (($this->configuration['general']['active']  ?? false) && isset($securityConfig['method']) && $securityConfig['method'] === self::SECURITYCONFIG_AUTH_APIKEY) {
-            $apikey = $securityConfig['apikey'] ?? "";
+        if (($this->configuration['general']['active'] ?? false) && isset($securityConfig['method']) && $securityConfig['method'] === self::SECURITYCONFIG_AUTH_APIKEY) {
+            $apikey = $securityConfig['apikey'] ?? '';
             if (strlen($apikey) < 16) {
                 throw new \Exception('API key does not satisfy the minimum length of 16 characters');
             }
@@ -202,7 +203,7 @@ public function delete(): void
         $this->getDao()->delete();
 
         $event = new GenericEvent($this);
-        $event->setArgument("configuration", $this);
+        $event->setArgument('configuration', $this);
         \Pimcore::getEventDispatcher()->dispatch($event, ConfigurationEvents::CONFIGURATION_POST_DELETE);
     }
 
@@ -221,7 +222,7 @@ public static function getList()
      *
      * @return Configuration|null
      */
-    public static function getByName($name): ?Configuration
+    public static function getByName($name): ?self
     {
         return Dao::getByName($name);
     }
@@ -289,6 +290,7 @@ public function getMutationEntityConfig($entityName)
     public function getQueryColumnConfig($entityName)
     {
         $config = $this->getQueryEntityConfig($entityName);
+
         return $config['columnConfig'] ?? null;
     }
 

src/Configuration/Dao.php

@@ -5,12 +5,12 @@
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
  *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- *  @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle\Configuration;
@@ -22,6 +22,7 @@
 
 /**
  * Class Dao
+ *
  * @package Pimcore\Bundle\DataHubBundle\Configuration
  */
 class Dao extends AbstractDao
@@ -194,6 +195,7 @@ private static function deleteFolderRec(&$config, $path): void
     /**
      * @param $who
      * @param $to
+     *
      * @throws \Exception
      */
     public static function moveConfiguration($who, $to): void
@@ -212,6 +214,7 @@ public static function moveConfiguration($who, $to): void
     /**
      * @param $who
      * @param $to
+     *
      * @throws \Exception
      */
     public static function moveFolder($who, $to): void
@@ -225,6 +228,7 @@ public static function moveFolder($who, $to): void
     /**
      * @param $who
      * @param $to
+     *
      * @throws \Exception
      */
     private static function moveFolderRec($who, $to): void
@@ -253,6 +257,7 @@ private static function moveFolderRec($who, $to): void
     /**
      * @param $old
      * @param $now
+     *
      * @throws \Exception
      */
     private static function moveSubfolders($old, $now): void

src/Configuration/Workspace/AbstractWorkspace.php

@@ -1,18 +1,16 @@
 <?php
+
 /**
  * Pimcore
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- * @category   Pimcore
- * @package    User
- *
- * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- * @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle\Configuration\Workspace;
@@ -59,7 +57,6 @@ class AbstractWorkspace extends AbstractModel
      */
     public $delete = false;
 
-
     /**
      * @return string
      */
@@ -124,8 +121,6 @@ public function setCreate(bool $create): void
         $this->create = $create;
     }
 
-
-
     /**
      * @return bool
      */

src/Configuration/Workspace/Asset.php

@@ -1,18 +1,16 @@
 <?php
+
 /**
  * Pimcore
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- * @category   Pimcore
- * @package    User
- *
- * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- * @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle\Configuration\Workspace;

src/Configuration/Workspace/Dao.php

@@ -1,18 +1,16 @@
 <?php
+
 /**
  * Pimcore
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- * @category   Pimcore
- * @package    User
- *
- * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- * @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle\Configuration\Workspace;

src/Configuration/Workspace/DataObject.php

@@ -1,18 +1,16 @@
 <?php
+
 /**
  * Pimcore
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- * @category   Pimcore
- * @package    User
- *
- * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- * @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle\Configuration\Workspace;

src/Configuration/Workspace/Document.php

@@ -1,18 +1,16 @@
 <?php
+
 /**
  * Pimcore
  *
  * This source file is available under two different licenses:
  * - GNU General Public License version 3 (GPLv3)
- * - Pimcore Enterprise License (PEL)
+ * - Pimcore Commercial License (PCL)
  * Full copyright and license information is available in
  * LICENSE.md which is distributed with this source code.
  *
- * @category   Pimcore
- * @package    User
- *
- * @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
- * @license    http://www.pimcore.org/license     GPLv3 and PEL
+ *  @copyright  Copyright (c) Pimcore GmbH (http://www.pimcore.org)
+ *  @license    http://www.pimcore.org/license     GPLv3 and PCL
  */
 
 namespace Pimcore\Bundle\DataHubBundle\Configuration\Workspace;