v2.2.6 (#230)

Author: bfren

VERSION

@@ -1 +1 @@
-2.2.5
+2.2.6

composer.lock

@@ -23,6 +23,7 @@ church_suite:
   api_application: ''
   api_key: ''
   org: ''
+  service_ids: []
   tag_id_adults: 1
   tag_id_children: 2
 

config-sample.yml

@@ -30,6 +30,13 @@ class Config_ChurchSuite extends Config_Section
      */
     public readonly string $org;
 
+    /**
+     * Church Suite service IDs, to exclude non-service rotas from imports.
+     *
+     * @var int[]
+     */
+    public readonly array $service_ids;
+
     /**
      * Church Suite Tag ID for adults who have consented to be in the Prayer Calendar.
      *
@@ -55,6 +62,7 @@ public function __construct(array $config)
         $this->api_application = Arr::get($config, "api_application", "");
         $this->api_key = Arr::get($config, "api_key", "");
         $this->org = Arr::get($config, "org", "");
+        $this->service_ids = Arr::get($config, "service_ids", []);
         $this->tag_id_adults = Arr::get_integer($config, "tag_id_adults", 0);
         $this->tag_id_children = Arr::get_integer($config, "tag_id_children", 0);
     }
@@ -65,6 +73,7 @@ public function as_array(): array
             "api_application" => $this->api_application,
             "api_key" => $this->api_key,
             "org" => $this->org,
+            "service_ids" => $this->service_ids,
             "tag_id_adults" => $this->tag_id_adults,
             "tag_id_children" => $this->tag_id_children,
         ];

src/classes/config/config-churchsuite.class.php

@@ -43,7 +43,8 @@ public static function create(DateTimeImmutable $first_day, DateTimeImmutable $l
             "group_by" => "time",
             "date_start" => $first_day->format("Y-m-d"),
             "date_end" => $last_day->format("Y-m-d"),
-            "show_empty_dates" => "1"
+            "show_empty_dates" => "1",
+            "service_ids" => C::$churchsuite->service_ids
         );
         $href = sprintf(self::ROTA_HREF, C::$churchsuite->org, http_build_query($query_values));
 

src/pages/upload/rota-period.class.php

@@ -14,7 +14,10 @@
             echo $err;
         }
     }
-    throw new RuntimeException($err);
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';

vendor/autoload.php

@@ -112,8 +112,9 @@ if (PHP_VERSION_ID < 80000) {
         (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
         || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
     ) {
-        return include("phpvfscomposer://" . __DIR__ . '/..'.'/phpstan/phpstan/phpstan');
+        include("phpvfscomposer://" . __DIR__ . '/..'.'/phpstan/phpstan/phpstan');
+        exit(0);
     }
 }
 
-return include __DIR__ . '/..'.'/phpstan/phpstan/phpstan';
+include __DIR__ . '/..'.'/phpstan/phpstan/phpstan';

vendor/bin/phpstan

@@ -0,0 +1,5 @@
+@ECHO OFF
+setlocal DISABLEDELAYEDEXPANSION
+SET BIN_TARGET=%~dp0/phpstan
+SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
+php "%BIN_TARGET%" %*

vendor/bin/phpstan.bat

@@ -112,8 +112,9 @@ if (PHP_VERSION_ID < 80000) {
         (function_exists('stream_get_wrappers') && in_array('phpvfscomposer', stream_get_wrappers(), true))
         || (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper'))
     ) {
-        return include("phpvfscomposer://" . __DIR__ . '/..'.'/phpstan/phpstan/phpstan.phar');
+        include("phpvfscomposer://" . __DIR__ . '/..'.'/phpstan/phpstan/phpstan.phar');
+        exit(0);
     }
 }
 
-return include __DIR__ . '/..'.'/phpstan/phpstan/phpstan.phar';
+include __DIR__ . '/..'.'/phpstan/phpstan/phpstan.phar';

vendor/bin/phpstan.phar

@@ -0,0 +1,5 @@
+@ECHO OFF
+setlocal DISABLEDELAYEDEXPANSION
+SET BIN_TARGET=%~dp0/phpstan.phar
+SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
+php "%BIN_TARGET%" %*