Merge branch '2024.11'

tine-groupware · Nov 19, 2024 · 97957c7 · 97957c7
2 parents 4178e77 + c7badfa
commit 97957c7
Show file tree

Hide file tree

Showing 4 changed files with 1,449 additions and 382 deletions.
diff --git a/ci/gitlab-ci/test_jobs.yml b/ci/gitlab-ci/test_jobs.yml
@@ -140,6 +140,7 @@ phpcs-analysis:
       changes:
         paths:
           - "**/*.php"
+          - "tine20/phpcs.baseline.xml"
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_LABELS =~ /phpcs-analysis/
     - if: $PIPELINE_TYPE =~ /default-tests/
     - if: $PIPELINE_TYPE =~ /mr-tests/

diff --git a/tine20/ActiveSync/Acl/Rights.php b/tine20/ActiveSync/Acl/Rights.php
@@ -98,7 +98,7 @@ public function getAllApplicationRights()
 
     /**
      * get translated right descriptions
-     * 
+     *
      * @return  array with translated descriptions for this applications rights
      */
     public static function getTranslatedRightDescriptions()

diff --git a/tine20/composer.json b/tine20/composer.json
@@ -229,7 +229,7 @@
     "build": "./vendor/bin/phing",
     "phpcs": "bash -c 'php ./vendor/bin/phpcs -s --standard=PSR12 --report=full --exclude=PSR1.Classes.ClassDeclaration,Squiz.Classes.ValidClassName,PSR2.Classes.PropertyDeclaration,PSR2.Methods.MethodDeclaration --extensions=php --ignore=vendor,library,Tinebase/views/autodiscover,Tinebase/js,config.inc.php --basepath=. ${1:-.}' --",
     "phpcbf": "bash -c 'php ./vendor/bin/phpcbf -s --standard=PSR12 --report=full --exclude=PSR1.Classes.ClassDeclaration,Squiz.Classes.ValidClassName,PSR2.Classes.PropertyDeclaration,PSR2.Methods.MethodDeclaration --extensions=php --ignore=vendor,library,Tinebase/views/autodiscover --basepath=. ${1:-.}' --",
-    "phpcs-baseline": "php ./vendor/bin/phpcs -s --standard=PSR12 --report=\\\\DR\\\\CodeSnifferBaseline\\\\Reports\\\\Baseline --report-file=phpcs.baseline.xml --exclude=PSR1.Classes.ClassDeclaration,Squiz.Classes.ValidClassName,PSR2.Classes.PropertyDeclaration,PSR2.Methods.MethodDeclaration --extensions=php --ignore=vendor,library,Tinebase/views/autodiscover --basepath=. ."
+    "phpcs-baseline": "php ./vendor/bin/phpcs -s --standard=PSR12 --report=\\\\DR\\\\CodeSnifferBaseline\\\\Reports\\\\Baseline --report-file=phpcs.baseline.xml --exclude=PSR1.Classes.ClassDeclaration,Squiz.Classes.ValidClassName,PSR2.Classes.PropertyDeclaration,PSR2.Methods.MethodDeclaration --extensions=php --ignore=vendor,library,Tinebase/views/autodiscover,Tinebase/js --basepath=. ."
   },
   "support": {
     "issues": "https://github.com/tine20/Tine-2.0-Open-Source-Groupware-and-CRM/issues",
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,7 @@ public function getAllApplicationRights() @@
         /**
          * get translated right descriptions
-         *
+         *
          * @return  array with translated descriptions for this applications rights
          */
         public static function getTranslatedRightDescriptions()
@@ Expand Down @@