From 3c202bc6e31d8d451b135c04f4c935340bdf2fcc Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sun, 14 Jul 2024 02:08:23 -0400 Subject: [PATCH 01/31] Force uppercase comparison for GovernmentModel->getAbbreviationId; fix output field name --- src/app/Models/GovernmentModel.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/Models/GovernmentModel.php b/src/app/Models/GovernmentModel.php index c61e368..c07a134 100644 --- a/src/app/Models/GovernmentModel.php +++ b/src/app/Models/GovernmentModel.php @@ -116,13 +116,13 @@ public function getDetail(int|string $id, string $state): array public function getAbbreviationId(string $id): int { $query = <<db->query($query, [ - $id, + strtoupper($id), ])->getResult(); $id = -1; From 1851b03638c07496bac03df100dffefc23e7809b Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Thu, 1 Aug 2024 20:32:23 -0400 Subject: [PATCH 02/31] DataTables license --- license/dependency/DataTables-MIT.html | 6 +++--- license/dependency/DataTables.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/license/dependency/DataTables-MIT.html b/license/dependency/DataTables-MIT.html index b73aa31..d700fc5 100644 --- a/license/dependency/DataTables-MIT.html +++ b/license/dependency/DataTables-MIT.html @@ -9,7 +9,7 @@ - + @@ -18,8 +18,8 @@ - - + + diff --git a/license/dependency/DataTables.html b/license/dependency/DataTables.html index eb22341..5af5fea 100644 --- a/license/dependency/DataTables.html +++ b/license/dependency/DataTables.html @@ -9,7 +9,7 @@ - + @@ -18,8 +18,8 @@ - - + + From 1ce478f7c5f798f5edcff29ac899d89c711ea8dc Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Thu, 1 Aug 2024 20:36:41 -0400 Subject: [PATCH 03/31] Fix leafet location for development --- src/app/Controllers/Map.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Controllers/Map.php b/src/app/Controllers/Map.php index 7bae504..759df18 100755 --- a/src/app/Controllers/Map.php +++ b/src/app/Controllers/Map.php @@ -74,7 +74,7 @@ public function leaflet(string $state = ''): void echo view('leaflet/state_' . $state, $this->data); } catch (\Throwable) { try { - echo view('development/leaflet_state_' . $state, $this->data); + echo view('development/leaflet/state_' . $state, $this->data); } catch (\Throwable) { echo view('leaflet/state', $this->data); } From 98dd703ece6a9d605f126535c8472d21bf8e34cf Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Thu, 12 Sep 2024 22:36:27 -0400 Subject: [PATCH 04/31] Development: Add File Source table to Event page --- src/app/Controllers/Event.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/Controllers/Event.php b/src/app/Controllers/Event.php index 20b3228..dd48d8a 100755 --- a/src/app/Controllers/Event.php +++ b/src/app/Controllers/Event.php @@ -95,6 +95,11 @@ public function view(string $state, int|string $id): void $SourceCitationModel = new SourceCitationModel(); $query = $SourceCitationModel->getByEvent($id); echo view('source/table_citation', ['query' => $query, 'state' => $state, 'hasColor' => false, 'hasLink' => true, 'title' => 'Source']); + if ($this->isLive()) { + $FileSourceModel = new \App\Models\Development\FileSourceModel(); + $query = $FileSourceModel->getByEvent($id); + echo view(ENVIRONMENT . '/filesource/table', ['query' => $query, 'state' => $state]); + } if ($hasMap) { $i = 0; echo view('leaflet/start', ['type' => 'event', 'includeBase' => true, 'needRotation' => false]); From cdacc6c79de4a08024bdcb073a50bdfbfe21e1da Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Fri, 13 Sep 2024 00:17:16 -0400 Subject: [PATCH 05/31] Move order of commands in PHP Dockerfile to accommodate development version --- docker/php/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index d5544a9..16b63dd 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -25,10 +25,10 @@ RUN mkdir /usr/src/docker COPY ./docker/php/import_common_php.sh ./docker/php/import_dependency.sh ./src/private/development/docker/import_developmen[t]_php.sh ./src/private/production/docke[r]/* ./src/private/personal-production/personal-docke[r]/* /usr/src/docker/ RUN chmod -R 764 /usr/src/docker/* ARG CI_ENVIRONMENT +RUN apt-get update +RUN apt-get install -y unzip zip RUN /usr/src/docker/import_common_php.sh # Restart Apache RUN service apache2 restart # Install Composer and prerequisites -RUN apt-get update -RUN apt-get install -y unzip zip COPY --from=composer:2.6.5 /usr/bin/composer /usr/bin/composer From 89e4b09ce6dc3f13e102c11af306a1469123ea79 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sat, 14 Sep 2024 00:16:22 -0400 Subject: [PATCH 06/31] PostgreSQL backup: bump versions; add governmentname column to plsstownship.plsstownshipname --- inpostgis/postgresql_public_backup.sql | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/inpostgis/postgresql_public_backup.sql b/inpostgis/postgresql_public_backup.sql index a6fe530..e0a1cf6 100644 --- a/inpostgis/postgresql_public_backup.sql +++ b/inpostgis/postgresql_public_backup.sql @@ -2,8 +2,8 @@ -- PostgreSQL database dump -- --- Dumped from database version 16.2 (Debian 16.2-1.pgdg110+2) --- Dumped by pg_dump version 16.2 (Ubuntu 16.2-1.pgdg22.04+1) +-- Dumped from database version 16.4 (Debian 16.4-1.pgdg110+1) +-- Dumped by pg_dump version 16.4 (Ubuntu 16.4-1.pgdg22.04+1) SET statement_timeout = 0; SET lock_timeout = 0; @@ -7842,6 +7842,7 @@ CREATE TABLE geohistory.plsstownship ( plssrangefraction character varying(10) DEFAULT '0'::character varying NOT NULL, plssrangedirection character varying(1) DEFAULT '0'::character varying NOT NULL, plsstownshipduplicate character varying(1) DEFAULT '0'::character varying NOT NULL, + plsstownshipname text DEFAULT ''::text NOT NULL, plsstownshipfull text GENERATED ALWAYS AS ((((( CASE WHEN (plsstownshipnumber = 0) THEN ''::text From 5970097cef18dde3552b42c89fad7b8fc95eb783 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sat, 14 Sep 2024 00:16:37 -0400 Subject: [PATCH 07/31] Bump DataTables licenses --- license/dependency/DataTables-MIT.html | 12 +++++++----- license/dependency/DataTables.html | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/license/dependency/DataTables-MIT.html b/license/dependency/DataTables-MIT.html index d700fc5..9b4303e 100644 --- a/license/dependency/DataTables-MIT.html +++ b/license/dependency/DataTables-MIT.html @@ -9,7 +9,7 @@ - + @@ -18,8 +18,8 @@ - - + + @@ -50,7 +50,8 @@
- DataTables + + DataTables
Advanced interaction
features for your tables.
@@ -58,7 +59,8 @@
- Editor + + Editor
Comprehensive editing
library for DataTables.
diff --git a/license/dependency/DataTables.html b/license/dependency/DataTables.html index 5af5fea..c5d1ef6 100644 --- a/license/dependency/DataTables.html +++ b/license/dependency/DataTables.html @@ -9,7 +9,7 @@ - + @@ -18,8 +18,8 @@ - - + + @@ -50,7 +50,8 @@
- DataTables + + DataTables
Advanced interaction
features for your tables.
@@ -58,7 +59,8 @@
- Editor + + Editor
Comprehensive editing
library for DataTables.
From cb0fcd7ec1aae40746b63776d006f1799a703fae Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sat, 14 Sep 2024 02:08:53 -0400 Subject: [PATCH 08/31] Remove globs from Dockerfiles for conditional COPY files; add conditional COPY file paths to ENV --- docker-compose.yaml | 4 ++++ docker/php/Dockerfile | 6 +++--- docker/postgis/Dockerfile | 5 ++--- env/Sample.env | 17 +++++++++++++++++ 4 files changed, 26 insertions(+), 6 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index 04518f9..01b8f6d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,6 +6,8 @@ services: dockerfile: ./docker/php/Dockerfile args: CI_ENVIRONMENT: ${CI_ENVIRONMENT} + DOCKER_PHP_SH: ${DOCKER_PHP_SH} + DOCKER_PHP_SH_SECONDARY: ${DOCKER_PHP_SH_SECONDARY} restart: always environment: TZ: ${TZ} @@ -28,6 +30,8 @@ services: build: context: ./ dockerfile: ./docker/postgis/Dockerfile + args: + DOCKER_POSTGIS_SH: ${DOCKER_POSTGIS_SH} restart: always command: - "postgres" diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 16b63dd..346c803 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -20,9 +20,9 @@ RUN install-php-extensions gd intl pgsql xsl zip # Adjust configuration files COPY /docker/php/mods-enabled/headers.conf /etc/apache2/mods-enabled/ RUN mkdir /usr/src/docker -# OTHER OPERATING SYSTEMS: May need to use the commented version below instead of the uncommented version 2 lines down -# COPY ./docker/php/import_common_php.sh ./docker/php/import_dependency.sh /usr/src/docker/ -COPY ./docker/php/import_common_php.sh ./docker/php/import_dependency.sh ./src/private/development/docker/import_developmen[t]_php.sh ./src/private/production/docke[r]/* ./src/private/personal-production/personal-docke[r]/* /usr/src/docker/ +ARG DOCKER_PHP_SH +ARG DOCKER_PHP_SH_SECONDARY +COPY /docker/php/import_common_php.sh /docker/php/import_dependency.sh ${DOCKER_PHP_SH} ${DOCKER_PHP_SH_SECONDARY} /usr/src/docker/ RUN chmod -R 764 /usr/src/docker/* ARG CI_ENVIRONMENT RUN apt-get update diff --git a/docker/postgis/Dockerfile b/docker/postgis/Dockerfile index 84277aa..52a92fe 100644 --- a/docker/postgis/Dockerfile +++ b/docker/postgis/Dockerfile @@ -7,9 +7,8 @@ RUN git clone -b v1.1.1 https://github.com/aws/pg_tle.git /tmp/pg_tle/ RUN make -C /tmp/pg_tle/ RUN make -C /tmp/pg_tle/ install # Copy scripts and imports to launch database -# OTHER OPERATING SYSTEMS: May need to use the commented version below instead of the uncommented version 2 lines down -# COPY ./docker/postgis/import_common_postgis.sh ./docker/postgis/import_production_postgis.sh /docker-entrypoint-initdb.d/ -COPY ./docker/postgis/import_common_postgis.sh ./docker/postgis/import_production_postgis.sh ./src/private/development/docker/import_developmen[t]_postgis.sh /docker-entrypoint-initdb.d/ +ARG DOCKER_POSTGIS_SH +COPY /docker/postgis/import_common_postgis.sh ${DOCKER_POSTGIS_SH} /docker-entrypoint-initdb.d/ RUN mkdir /tmp/inpostgis/ RUN chmod -R 777 /tmp/inpostgis/ RUN rm -rf /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/env/Sample.env b/env/Sample.env index d6ebeb5..a5aaa65 100644 --- a/env/Sample.env +++ b/env/Sample.env @@ -20,6 +20,23 @@ CI_ENVIRONMENT=production +# Optional location of PHP shell script for Docker +# This location should be relative to root path and without spaces +# Leave blank if no shell script needs to be run + +DOCKER_PHP_SH= + +# Optional location of secondary PHP shell script for Docker +# This location should be relative to root path and without spaces +# Leave blank if no shell script needs to be run + +DOCKER_PHP_SH_SECONDARY= + +# Location of PostGIS import shell script +# This location should be relative to root path and without spaces + +DOCKER_POSTGIS_SH=/docker/postgis/import_production_postgis.sh + # Default time zone (Eastern Time Zone, United States) TZ=America/New_York From 905fad8c076ece63a48b9fb7eeaa9b30cc73f596 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sat, 14 Sep 2024 02:10:17 -0400 Subject: [PATCH 09/31] README: Update installation instructions for Ubuntu 24.04 LTS --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1f9ae57..76ef565 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ These instructions were created using Ubuntu; however, URLs to software instruct Several components must be installed to build the application. On Ubuntu, run the following code via Terminal: ```bash -sudo apt-get install git docker docker-compose +sudo apt-get install git docker.io docker-compose-v2 ``` More detailed installation instructions for Docker and Docker Compose are available at: @@ -64,7 +64,7 @@ The **inpostgis** folder contains 2 SQL files containing the structural elements The final step to deploying the application is to build it using Docker Compose. Run the following command using a program such as Command Prompt (Windows), Git BASH, or Terminal: ```bash -sudo docker-compose up --detach +sudo docker compose up --detach ``` ### Check installation From 31464214a73e11ea8920f43983308e77de120ac6 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sun, 15 Sep 2024 00:47:59 -0400 Subject: [PATCH 10/31] Add hassource check for governmentsourceextra(cache) --- src/app/Models/GovernmentSourceModel.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/Models/GovernmentSourceModel.php b/src/app/Models/GovernmentSourceModel.php index 9db0e3b..27a52c1 100644 --- a/src/app/Models/GovernmentSourceModel.php +++ b/src/app/Models/GovernmentSourceModel.php @@ -174,6 +174,7 @@ public function getByEvent(int $id, string $state): array AND governmentsourceevent.event = ? LEFT JOIN extra.governmentsourceextracache ON governmentsource.governmentsourceid = governmentsourceextracache.governmentsourceid + AND governmentsourceextracache.hassource ORDER BY 12 QUERY; @@ -281,6 +282,7 @@ private function getSlugId(string $id): int SELECT governmentsourceextracache.governmentsourceid AS id FROM extra.governmentsourceextracache WHERE governmentsourceextracache.governmentsourceslug = ? + AND governmentsourceextracache.hassource QUERY; $query = $this->db->query($query, [ From 7647b621acf1828ca1dacab6a417188cdf643699 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sun, 15 Sep 2024 13:27:10 -0400 Subject: [PATCH 11/31] php:8.2.11 -> php:8.3.11 --- docker/php/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 346c803..02d716c 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.11-apache +FROM php:8.3.11-apache # Create writable dictory for CodeIgniter RUN mkdir /writable RUN mkdir /writable/cache From 392ea9c76b9dae85f5e40517d5d7c308322774d7 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sun, 15 Sep 2024 13:27:27 -0400 Subject: [PATCH 12/31] Exclude app/ThirdParty/development from phpstan --- src/phpstan.neon.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/src/phpstan.neon.dist b/src/phpstan.neon.dist index f152ad2..bbd77c1 100644 --- a/src/phpstan.neon.dist +++ b/src/phpstan.neon.dist @@ -24,6 +24,7 @@ parameters: - app/Config/View.php - app/Controllers/Development - app/Models/Development + - app/ThirdParty/development - app/Views/development - app/Views/errors checkMissingCallableSignature: true From 867b42d4683db23323bd6932551da278d85bdb78 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sun, 15 Sep 2024 13:30:03 -0400 Subject: [PATCH 13/31] CodeIgniter 4.5.2 -> 4.5.5; php-cs-fixer 3.59.3 -> 3.64.0; extension-installer 1.4.1 -> 1.4.3; phpstan 1.11.5 -> 1.12.3; rector 1.1.0 -> 1.2.5 --- src/composer.json | 10 +- src/composer.lock | 306 ++++++++++++++++++++++++---------------------- 2 files changed, 164 insertions(+), 152 deletions(-) diff --git a/src/composer.json b/src/composer.json index ea0f2c8..d10904b 100644 --- a/src/composer.json +++ b/src/composer.json @@ -1,14 +1,14 @@ { "require": { - "codeigniter4/framework": "4.5.2" + "codeigniter4/framework": "4.5.5" }, "require-dev": { "codeigniter/phpstan-codeigniter": "1.4.3", - "friendsofphp/php-cs-fixer": "3.59.3", - "phpstan/extension-installer": "1.4.1", - "phpstan/phpstan": "1.11.5", + "friendsofphp/php-cs-fixer": "3.64.0", + "phpstan/extension-installer": "1.4.3", + "phpstan/phpstan": "1.12.3", "phpstan/phpstan-strict-rules": "1.6.0", - "rector/rector": "1.1.0" + "rector/rector": "1.2.5" }, "config": { "allow-plugins": { diff --git a/src/composer.lock b/src/composer.lock index 5d75732..b8a45e9 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0405f4f335476abe899a35376a415429", + "content-hash": "4b711120b995b8ec46bf0ffa932314e6", "packages": [ { "name": "codeigniter4/framework", - "version": "v4.5.2", + "version": "v4.5.5", "source": { "type": "git", "url": "https://github.com/codeigniter4/framework.git", - "reference": "163f11101a49d7ab70287f6163e5b647a0e26fa4" + "reference": "2849e7ff36b4c4aa1376d990a9a1e3f0c393b8d0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/codeigniter4/framework/zipball/163f11101a49d7ab70287f6163e5b647a0e26fa4", - "reference": "163f11101a49d7ab70287f6163e5b647a0e26fa4", + "url": "https://api.github.com/repos/codeigniter4/framework/zipball/2849e7ff36b4c4aa1376d990a9a1e3f0c393b8d0", + "reference": "2849e7ff36b4c4aa1376d990a9a1e3f0c393b8d0", "shasum": "" }, "require": { @@ -34,7 +34,7 @@ "kint-php/kint": "^5.0.4", "mikey179/vfsstream": "^1.6", "nexusphp/cs-config": "^3.6", - "phpunit/phpunit": "^10.5.16", + "phpunit/phpunit": "^10.5.16 || ^11.2", "predis/predis": "^1.1 || ^2.0" }, "suggest": { @@ -78,7 +78,7 @@ "slack": "https://codeigniterchat.slack.com", "source": "https://github.com/codeigniter4/CodeIgniter4" }, - "time": "2024-06-10T08:02:36+00:00" + "time": "2024-09-07T08:49:38+00:00" }, { "name": "laminas/laminas-escaper", @@ -144,16 +144,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -188,9 +188,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-09-11T13:17:53+00:00" } ], "packages-dev": [ @@ -334,30 +334,38 @@ }, { "name": "composer/pcre", - "version": "3.1.4", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "04229f163664973f68f38f6f73d917799168ef24" + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", - "reference": "04229f163664973f68f38f6f73d917799168ef24", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, "require-dev": { - "phpstan/phpstan": "^1.3", + "phpstan/phpstan": "^1.11.10", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -385,7 +393,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.4" + "source": "https://github.com/composer/pcre/tree/3.3.1" }, "funding": [ { @@ -401,20 +409,20 @@ "type": "tidelift" } ], - "time": "2024-05-27T13:40:54+00:00" + "time": "2024-08-27T18:44:43+00:00" }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.2", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6", + "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", "shasum": "" }, "require": { @@ -466,7 +474,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.2" }, "funding": [ { @@ -482,7 +490,7 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-07-12T11:35:52+00:00" }, { "name": "composer/xdebug-handler", @@ -599,16 +607,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" + "reference": "8520451a140d3f46ac33042715115e290cf5785f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", "shasum": "" }, "require": { @@ -648,7 +656,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" }, "funding": [ { @@ -656,20 +664,20 @@ "type": "github" } ], - "time": "2024-02-07T09:43:46+00:00" + "time": "2024-08-06T10:04:20+00:00" }, { "name": "friendsofphp/php-cs-fixer", - "version": "v3.59.3", + "version": "v3.64.0", "source": { "type": "git", "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", - "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29" + "reference": "58dd9c931c785a79739310aef5178928305ffa67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/30ba9ecc2b0e5205e578fe29973c15653d9bfd29", - "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67", + "reference": "58dd9c931c785a79739310aef5178928305ffa67", "shasum": "" }, "require": { @@ -751,7 +759,7 @@ ], "support": { "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", - "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.3" + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0" }, "funding": [ { @@ -759,26 +767,26 @@ "type": "github" } ], - "time": "2024-06-16T14:17:03+00:00" + "time": "2024-08-30T23:09:38+00:00" }, { "name": "phpstan/extension-installer", - "version": "1.4.1", + "version": "1.4.3", "source": { "type": "git", "url": "https://github.com/phpstan/extension-installer.git", - "reference": "f6b87faf9fc7978eab2f7919a8760bc9f58f9203" + "reference": "85e90b3942d06b2326fba0403ec24fe912372936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/f6b87faf9fc7978eab2f7919a8760bc9f58f9203", - "reference": "f6b87faf9fc7978eab2f7919a8760bc9f58f9203", + "url": "https://api.github.com/repos/phpstan/extension-installer/zipball/85e90b3942d06b2326fba0403ec24fe912372936", + "reference": "85e90b3942d06b2326fba0403ec24fe912372936", "shasum": "" }, "require": { "composer-plugin-api": "^2.0", "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.9.0" + "phpstan/phpstan": "^1.9.0 || ^2.0" }, "require-dev": { "composer/composer": "^2.0", @@ -799,24 +807,28 @@ "MIT" ], "description": "Composer plugin for automatic installation of PHPStan extensions", + "keywords": [ + "dev", + "static analysis" + ], "support": { "issues": "https://github.com/phpstan/extension-installer/issues", - "source": "https://github.com/phpstan/extension-installer/tree/1.4.1" + "source": "https://github.com/phpstan/extension-installer/tree/1.4.3" }, - "time": "2024-06-10T08:20:49+00:00" + "time": "2024-09-04T20:21:43+00:00" }, { "name": "phpstan/phpstan", - "version": "1.11.5", + "version": "1.12.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443" + "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/490f0ae1c92b082f154681d7849aee776a7c1443", - "reference": "490f0ae1c92b082f154681d7849aee776a7c1443", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0fcbf194ab63d8159bb70d9aa3e1350051632009", + "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009", "shasum": "" }, "require": { @@ -861,7 +873,7 @@ "type": "github" } ], - "time": "2024-06-17T15:10:54+00:00" + "time": "2024-09-09T08:10:35+00:00" }, { "name": "phpstan/phpstan-strict-rules", @@ -1389,31 +1401,31 @@ }, { "name": "react/socket", - "version": "v1.15.0", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/reactphp/socket.git", - "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038" + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/socket/zipball/216d3aec0b87f04a40ca04f481e6af01bdd1d038", - "reference": "216d3aec0b87f04a40ca04f481e6af01bdd1d038", + "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", "shasum": "" }, "require": { "evenement/evenement": "^3.0 || ^2.0 || ^1.0", "php": ">=5.3.0", - "react/dns": "^1.11", + "react/dns": "^1.13", "react/event-loop": "^1.2", - "react/promise": "^3 || ^2.6 || ^1.2.1", - "react/stream": "^1.2" + "react/promise": "^3.2 || ^2.6 || ^1.2.1", + "react/stream": "^1.4" }, "require-dev": { "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", - "react/async": "^4 || ^3 || ^2", + "react/async": "^4.3 || ^3.3 || ^2", "react/promise-stream": "^1.4", - "react/promise-timer": "^1.10" + "react/promise-timer": "^1.11" }, "type": "library", "autoload": { @@ -1457,7 +1469,7 @@ ], "support": { "issues": "https://github.com/reactphp/socket/issues", - "source": "https://github.com/reactphp/socket/tree/v1.15.0" + "source": "https://github.com/reactphp/socket/tree/v1.16.0" }, "funding": [ { @@ -1465,7 +1477,7 @@ "type": "open_collective" } ], - "time": "2023-12-15T11:02:10+00:00" + "time": "2024-07-26T10:38:09+00:00" }, { "name": "react/stream", @@ -1547,21 +1559,21 @@ }, { "name": "rector/rector", - "version": "1.1.0", + "version": "1.2.5", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "556509e2dcf527369892b7d411379c4a02f31859" + "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/556509e2dcf527369892b7d411379c4a02f31859", - "reference": "556509e2dcf527369892b7d411379c4a02f31859", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/e98aa793ca3fcd17e893cfaf9103ac049775d339", + "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.11" + "phpstan/phpstan": "^1.12.2" }, "conflict": { "rector/rector-doctrine": "*", @@ -1594,7 +1606,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/1.1.0" + "source": "https://github.com/rectorphp/rector/tree/1.2.5" }, "funding": [ { @@ -1602,20 +1614,20 @@ "type": "github" } ], - "time": "2024-05-18T09:40:27+00:00" + "time": "2024-09-08T17:43:24+00:00" }, { "name": "sebastian/diff", - "version": "6.0.1", + "version": "6.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "ab83243ecc233de5655b76f577711de9f842e712" + "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ab83243ecc233de5655b76f577711de9f842e712", - "reference": "ab83243ecc233de5655b76f577711de9f842e712", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/b4ccd857127db5d41a5b676f24b51371d76d8544", + "reference": "b4ccd857127db5d41a5b676f24b51371d76d8544", "shasum": "" }, "require": { @@ -1661,7 +1673,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", "security": "https://github.com/sebastianbergmann/diff/security/policy", - "source": "https://github.com/sebastianbergmann/diff/tree/6.0.1" + "source": "https://github.com/sebastianbergmann/diff/tree/6.0.2" }, "funding": [ { @@ -1669,20 +1681,20 @@ "type": "github" } ], - "time": "2024-03-02T07:30:33+00:00" + "time": "2024-07-03T04:53:05+00:00" }, { "name": "symfony/console", - "version": "v7.1.1", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3" + "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", - "reference": "9b008f2d7b21c74ef4d0c3de6077a642bc55ece3", + "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111", + "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111", "shasum": "" }, "require": { @@ -1746,7 +1758,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.1" + "source": "https://github.com/symfony/console/tree/v7.1.4" }, "funding": [ { @@ -1762,7 +1774,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-08-15T22:48:53+00:00" }, { "name": "symfony/deprecation-contracts", @@ -1989,16 +2001,16 @@ }, { "name": "symfony/filesystem", - "version": "v7.1.1", + "version": "v7.1.2", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2" + "reference": "92a91985250c251de9b947a14bb2c9390b1a562c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/802e87002f919296c9f606457d9fa327a0b3d6b2", - "reference": "802e87002f919296c9f606457d9fa327a0b3d6b2", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c", + "reference": "92a91985250c251de9b947a14bb2c9390b1a562c", "shasum": "" }, "require": { @@ -2035,7 +2047,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.1.1" + "source": "https://github.com/symfony/filesystem/tree/v7.1.2" }, "funding": [ { @@ -2051,20 +2063,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-06-28T10:03:55+00:00" }, { "name": "symfony/finder", - "version": "v7.1.1", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6" + "reference": "d95bbf319f7d052082fb7af147e0f835a695e823" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/fbb0ba67688b780efbc886c1a0a0948dcf7205d6", - "reference": "fbb0ba67688b780efbc886c1a0a0948dcf7205d6", + "url": "https://api.github.com/repos/symfony/finder/zipball/d95bbf319f7d052082fb7af147e0f835a695e823", + "reference": "d95bbf319f7d052082fb7af147e0f835a695e823", "shasum": "" }, "require": { @@ -2099,7 +2111,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.1.1" + "source": "https://github.com/symfony/finder/tree/v7.1.4" }, "funding": [ { @@ -2115,7 +2127,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-08-13T14:28:19+00:00" }, { "name": "symfony/options-resolver", @@ -2186,20 +2198,20 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", - "reference": "0424dff1c58f028c451efff2045f5d92410bd540", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -2245,7 +2257,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -2261,24 +2273,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/64647a7c30b2283f5d49b874d84a18fc22054b7a", - "reference": "64647a7c30b2283f5d49b874d84a18fc22054b7a", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -2323,7 +2335,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -2339,24 +2351,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/a95281b0be0d9ab48050ebd988b967875cdb9fdb", - "reference": "a95281b0be0d9ab48050ebd988b967875cdb9fdb", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -2404,7 +2416,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -2420,24 +2432,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -2484,7 +2496,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -2500,24 +2512,24 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2564,7 +2576,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -2580,24 +2592,24 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.30.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", - "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -2640,7 +2652,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" }, "funding": [ { @@ -2656,20 +2668,20 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v7.1.1", + "version": "v7.1.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "febf90124323a093c7ee06fdb30e765ca3c20028" + "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/febf90124323a093c7ee06fdb30e765ca3c20028", - "reference": "febf90124323a093c7ee06fdb30e765ca3c20028", + "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca", + "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca", "shasum": "" }, "require": { @@ -2701,7 +2713,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.1" + "source": "https://github.com/symfony/process/tree/v7.1.3" }, "funding": [ { @@ -2717,7 +2729,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:57:53+00:00" + "time": "2024-07-26T12:44:47+00:00" }, { "name": "symfony/service-contracts", @@ -2866,16 +2878,16 @@ }, { "name": "symfony/string", - "version": "v7.1.1", + "version": "v7.1.4", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "60bc311c74e0af215101235aa6f471bcbc032df2" + "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/60bc311c74e0af215101235aa6f471bcbc032df2", - "reference": "60bc311c74e0af215101235aa6f471bcbc032df2", + "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b", + "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b", "shasum": "" }, "require": { @@ -2933,7 +2945,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.1" + "source": "https://github.com/symfony/string/tree/v7.1.4" }, "funding": [ { @@ -2949,7 +2961,7 @@ "type": "tidelift" } ], - "time": "2024-06-04T06:40:14+00:00" + "time": "2024-08-12T09:59:40+00:00" } ], "aliases": [], From ae2b729915d224856ee938da6d4cd94436146650 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Sun, 15 Sep 2024 13:31:04 -0400 Subject: [PATCH 14/31] LanguageRedirect: Refactor for RequestInterface objects without getLocale method --- src/app/Filters/LanguageRedirect.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/Filters/LanguageRedirect.php b/src/app/Filters/LanguageRedirect.php index 18ed714..d975f24 100755 --- a/src/app/Filters/LanguageRedirect.php +++ b/src/app/Filters/LanguageRedirect.php @@ -11,7 +11,7 @@ class LanguageRedirect implements FilterInterface public function before(RequestInterface $request, $arguments = null): void { $segments = $request->getUri()->getSegments(); - $locale = $request->getLocale(); + $locale = method_exists($request, 'getLocale') ? $request->getLocale() : 'en'; if (isset($segments[0]) && $segments[0] !== $locale && $segments !== ['robots.txt']) { $segments[0] = $locale; $segments = '/' . implode('/', $segments) . '/'; From c03197318b6c48a76671fd5ce05df3fb92b1902c Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Mon, 23 Sep 2024 00:53:58 -0400 Subject: [PATCH 15/31] Reconfigure environment-specific files in Dockerfiles --- docker-compose.yaml | 6 +++--- docker/php/Dockerfile | 6 +++--- docker/postgis/Dockerfile | 4 ++-- env/Sample.env | 20 +++++++++---------- .../default/docker/import_env_postgis.sh | 0 src/private/default/docker/personal/.gitkeep | 0 .../personal-default/docker/personal/.gitkeep | 0 7 files changed, 17 insertions(+), 19 deletions(-) rename docker/postgis/import_production_postgis.sh => src/private/default/docker/import_env_postgis.sh (100%) create mode 100644 src/private/default/docker/personal/.gitkeep create mode 100644 src/private/personal-default/docker/personal/.gitkeep diff --git a/docker-compose.yaml b/docker-compose.yaml index 01b8f6d..7650a18 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -6,8 +6,8 @@ services: dockerfile: ./docker/php/Dockerfile args: CI_ENVIRONMENT: ${CI_ENVIRONMENT} - DOCKER_PHP_SH: ${DOCKER_PHP_SH} - DOCKER_PHP_SH_SECONDARY: ${DOCKER_PHP_SH_SECONDARY} + DOCKER_PHP: ${DOCKER_PHP} + DOCKER_PHP_PERSONAL: ${DOCKER_PHP_PERSONAL} restart: always environment: TZ: ${TZ} @@ -31,7 +31,7 @@ services: context: ./ dockerfile: ./docker/postgis/Dockerfile args: - DOCKER_POSTGIS_SH: ${DOCKER_POSTGIS_SH} + DOCKER_POSTGIS: ${DOCKER_POSTGIS} restart: always command: - "postgres" diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 02d716c..6aa7fd9 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -20,9 +20,9 @@ RUN install-php-extensions gd intl pgsql xsl zip # Adjust configuration files COPY /docker/php/mods-enabled/headers.conf /etc/apache2/mods-enabled/ RUN mkdir /usr/src/docker -ARG DOCKER_PHP_SH -ARG DOCKER_PHP_SH_SECONDARY -COPY /docker/php/import_common_php.sh /docker/php/import_dependency.sh ${DOCKER_PHP_SH} ${DOCKER_PHP_SH_SECONDARY} /usr/src/docker/ +ARG DOCKER_PHP +ARG DOCKER_PHP_PERSONAL +COPY /docker/php/import_common_php.sh /src/private/${DOCKER_PHP}/docker/* /src/private/${DOCKER_PHP_PERSONAL}/docker/personal/* /usr/src/docker/ RUN chmod -R 764 /usr/src/docker/* ARG CI_ENVIRONMENT RUN apt-get update diff --git a/docker/postgis/Dockerfile b/docker/postgis/Dockerfile index 52a92fe..dbfa390 100644 --- a/docker/postgis/Dockerfile +++ b/docker/postgis/Dockerfile @@ -7,8 +7,8 @@ RUN git clone -b v1.1.1 https://github.com/aws/pg_tle.git /tmp/pg_tle/ RUN make -C /tmp/pg_tle/ RUN make -C /tmp/pg_tle/ install # Copy scripts and imports to launch database -ARG DOCKER_POSTGIS_SH -COPY /docker/postgis/import_common_postgis.sh ${DOCKER_POSTGIS_SH} /docker-entrypoint-initdb.d/ +ARG DOCKER_POSTGIS +COPY /docker/postgis/import_common_postgis.sh /src/private/${DOCKER_POSTGIS}/docker/import_env_postgis.sh /docker-entrypoint-initdb.d/ RUN mkdir /tmp/inpostgis/ RUN chmod -R 777 /tmp/inpostgis/ RUN rm -rf /docker-entrypoint-initdb.d/10_postgis.sh diff --git a/env/Sample.env b/env/Sample.env index 6fff272..1e6a943 100644 --- a/env/Sample.env +++ b/env/Sample.env @@ -20,22 +20,20 @@ CI_ENVIRONMENT=production -# Optional location of PHP shell script for Docker -# This location should be relative to root path and without spaces -# Leave blank if no shell script needs to be run +# Folder within /src/private/ where environment-specific +# files are located for PHP import -DOCKER_PHP_SH= +DOCKER_PHP=default -# Optional location of secondary PHP shell script for Docker -# This location should be relative to root path and without spaces -# Leave blank if no shell script needs to be run +# Folder within /src/private/ where environment-specific +# files are located for PHP personal import -DOCKER_PHP_SH_SECONDARY= +DOCKER_PHP_PERSONAL=personal-default -# Location of PostGIS import shell script -# This location should be relative to root path and without spaces +# Folder within /src/private/ where environment-specific +# files are located for PostGIS import -DOCKER_POSTGIS_SH=/docker/postgis/import_production_postgis.sh +DOCKER_POSTGIS=default # Default time zone (Eastern Time Zone, United States) diff --git a/docker/postgis/import_production_postgis.sh b/src/private/default/docker/import_env_postgis.sh similarity index 100% rename from docker/postgis/import_production_postgis.sh rename to src/private/default/docker/import_env_postgis.sh diff --git a/src/private/default/docker/personal/.gitkeep b/src/private/default/docker/personal/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/src/private/personal-default/docker/personal/.gitkeep b/src/private/personal-default/docker/personal/.gitkeep new file mode 100644 index 0000000..e69de29 From cb53236471d888ac62bcd4eca8b48289917fb732 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Mon, 23 Sep 2024 01:15:45 -0400 Subject: [PATCH 16/31] Simplification of folder structure --- docker/php/Dockerfile | 2 +- src/private/personal-default/docker/{personal => }/.gitkeep | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename src/private/personal-default/docker/{personal => }/.gitkeep (100%) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 6aa7fd9..5dda20a 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -22,7 +22,7 @@ COPY /docker/php/mods-enabled/headers.conf /etc/apache2/mods-enabled/ RUN mkdir /usr/src/docker ARG DOCKER_PHP ARG DOCKER_PHP_PERSONAL -COPY /docker/php/import_common_php.sh /src/private/${DOCKER_PHP}/docker/* /src/private/${DOCKER_PHP_PERSONAL}/docker/personal/* /usr/src/docker/ +COPY /docker/php/import_common_php.sh /src/private/${DOCKER_PHP}/docker/* /src/private/${DOCKER_PHP_PERSONAL}/docker/* /usr/src/docker/ RUN chmod -R 764 /usr/src/docker/* ARG CI_ENVIRONMENT RUN apt-get update diff --git a/src/private/personal-default/docker/personal/.gitkeep b/src/private/personal-default/docker/.gitkeep similarity index 100% rename from src/private/personal-default/docker/personal/.gitkeep rename to src/private/personal-default/docker/.gitkeep From cbbce2a2fea7fb0b4f95bb987fc9cec5a74a97b0 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Mon, 23 Sep 2024 01:31:05 -0400 Subject: [PATCH 17/31] PHP Dockerfile: Restore improvidently removed file to COPY --- docker/php/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 5dda20a..964e1f1 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -22,7 +22,7 @@ COPY /docker/php/mods-enabled/headers.conf /etc/apache2/mods-enabled/ RUN mkdir /usr/src/docker ARG DOCKER_PHP ARG DOCKER_PHP_PERSONAL -COPY /docker/php/import_common_php.sh /src/private/${DOCKER_PHP}/docker/* /src/private/${DOCKER_PHP_PERSONAL}/docker/* /usr/src/docker/ +COPY /docker/php/import_common_php.sh /docker/php/import_dependency.sh /src/private/${DOCKER_PHP}/docker/* /src/private/${DOCKER_PHP_PERSONAL}/docker/* /usr/src/docker/ RUN chmod -R 764 /usr/src/docker/* ARG CI_ENVIRONMENT RUN apt-get update From 7fef2f7e3cc010b962292d6cc9d8101e0ac056f3 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Fri, 27 Sep 2024 23:23:11 -0400 Subject: [PATCH 18/31] DataTables: Use GitHub license.txt instead of website --- docker/php/import_dependency.sh | 3 +- env/Sample.env | 2 + license/dependency/DataTables-MIT.html | 148 ------------------------- license/dependency/DataTables.html | 146 ------------------------ license/dependency/DataTables.txt | 9 ++ 5 files changed, 12 insertions(+), 296 deletions(-) delete mode 100644 license/dependency/DataTables-MIT.html delete mode 100644 license/dependency/DataTables.html create mode 100644 license/dependency/DataTables.txt diff --git a/docker/php/import_dependency.sh b/docker/php/import_dependency.sh index 61ef5c8..1433f29 100644 --- a/docker/php/import_dependency.sh +++ b/docker/php/import_dependency.sh @@ -15,8 +15,7 @@ curl -s -S -o "${license_folder}/D3.txt" "https:/${dependency_d3}/../LICENSE" curl -s -S -o ${asset_folder}/css/dataTables.dataTables.min.css "https:/${dependency_datatables}/css/dataTables.dataTables.min.css" curl -s -S -o ${asset_folder}/js/dataTables.min.js "https:/${dependency_datatables}/js/dataTables.min.js" -curl -s -S -o "${license_folder}/DataTables.html" "https://datatables.net/license/" -curl -s -S -o "${license_folder}/DataTables-MIT.html" "https://datatables.net/license/mit" +curl -s -S -o "${license_folder}/DataTables.txt" "https:/${dependency_datatables_license}" curl -s -S --output-dir ${asset_folder} -O "https:/${dependency_html_to_image}/html-to-image.js" curl -s -S -o "${license_folder}/Html to Image.txt" "https:/${dependency_html_to_image}/../LICENSE" diff --git a/env/Sample.env b/env/Sample.env index 1e6a943..efb789c 100644 --- a/env/Sample.env +++ b/env/Sample.env @@ -208,6 +208,8 @@ dependency_d3=unpkg.com/d3@5.16.0/dist dependency_datatables=cdn.datatables.net/2.0.8 +dependency_datatables_license=raw.githubusercontent.com/DataTables/DataTablesSrc/refs/tags/2.0.8/license.txt + dependency_html_to_image=unpkg.com/html-to-image@1.11.11/dist dependency_jquery=unpkg.com/jquery@3.7.1/dist diff --git a/license/dependency/DataTables-MIT.html b/license/dependency/DataTables-MIT.html deleted file mode 100644 index 9b4303e..0000000 --- a/license/dependency/DataTables-MIT.html +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - DataTables | MIT license - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - -
-
- -
-
-
-
-
- - - DataTables -
- Advanced interaction
features for your tables. -
- -
-
- - - Editor -
- Comprehensive editing
library for DataTables. -
- -
-
- -
-
- Manual -
-
- Download -
-
- -
-
-
- -
-
-
-
-
-
-
-
-
- -
- -
- -
-
- -
- -
- ≡ Show site navigation -
-
- -
-
- - -

DataTables | MIT license

- - -

DataTables is available under the MIT license. In short, this means that you are free to use DataTables as you wish, including modifying and redistributing the code, as long as the original copyright notice is retained.

- -

MIT license

- -

Copyright (C) 2008-2024, SpryMedia Ltd.

- -

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

- -

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

- -

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

- -
-
- -
-
-
Page navigation
-
-
-
- -
-
-

DataTables

-

- DataTables designed and created by SpryMedia Ltd.
- © 2007-2024 MIT licensed. Privacy policy. Supporters.
- SpryMedia Ltd is registered in Scotland, company no. SC456502. -

-
-
- - diff --git a/license/dependency/DataTables.html b/license/dependency/DataTables.html deleted file mode 100644 index c5d1ef6..0000000 --- a/license/dependency/DataTables.html +++ /dev/null @@ -1,146 +0,0 @@ - - - - - - - DataTables | Licensing - - - - - - - - - - - - - - - - - - - -
-
- - - - - - - -
-
- -
-
-
-
-
- - - DataTables -
- Advanced interaction
features for your tables. -
- -
-
- - - Editor -
- Comprehensive editing
library for DataTables. -
- -
-
- -
-
- Manual -
-
- Download -
-
- -
-
-
- -
-
-
-
-
-
-
-
-
- -
- -
- -
-
- -
- -
- ≡ Show site navigation -
-
- -
-
- - -

DataTables | Licensing

- - -

Licensing is an important part of software licensing, particularly when using open source libraries such as DataTables.

- -

DataTables

- -

DataTables 1.10 and newer is available under the terms MIT license. This places almost no restrictions on what you can do with DataTables, and you are free to use it in any way (including commercial projects), as long as the copyright header is left intact. Please see the MIT license page for the complete license.

- -

DataTables 1.9 and earlier

- -

DataTables 1.9 (and previous versions) were made available under both the GPL v2 license and the BSD (3-point) style license. These licenses still apply to those software releases, but newer versions use the MIT license (see above).

- -
-
- -
-
-
Page navigation
-
-
-
- -
-
-

DataTables

-

- DataTables designed and created by SpryMedia Ltd.
- © 2007-2024 MIT licensed. Privacy policy. Supporters.
- SpryMedia Ltd is registered in Scotland, company no. SC456502. -

-
-
- - diff --git a/license/dependency/DataTables.txt b/license/dependency/DataTables.txt new file mode 100644 index 0000000..a1258be --- /dev/null +++ b/license/dependency/DataTables.txt @@ -0,0 +1,9 @@ +The MIT License (MIT) + +Copyright (C) 2008-present, SpryMedia Ltd. + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. From f6665efefd5de44ead11f29b1564edfc7de4e854 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Mon, 7 Oct 2024 01:13:57 -0400 Subject: [PATCH 19/31] Remove $data array from controllers; remove $query immediately ingested by views --- src/app/Controllers/About.php | 14 ++--- src/app/Controllers/Adjudication.php | 27 +++------- src/app/Controllers/Area.php | 41 ++++++--------- src/app/Controllers/Bot.php | 11 +--- src/app/Controllers/Disclaimer.php | 11 +--- src/app/Controllers/Event.php | 54 ++++++-------------- src/app/Controllers/Fourofour.php | 11 +--- src/app/Controllers/Government.php | 52 ++++++------------- src/app/Controllers/Governmentidentifier.php | 19 ++----- src/app/Controllers/Governmentsource.php | 20 ++------ src/app/Controllers/Key.php | 11 +--- src/app/Controllers/Law.php | 24 +++------ src/app/Controllers/Map.php | 19 ++----- src/app/Controllers/Metes.php | 18 ++----- src/app/Controllers/Reporter.php | 23 +++------ src/app/Controllers/Search.php | 50 ++++++++---------- src/app/Controllers/Source.php | 25 +++------ src/app/Controllers/Statistics.php | 53 +++++++++---------- src/app/Controllers/Welcome.php | 11 +--- 19 files changed, 154 insertions(+), 340 deletions(-) diff --git a/src/app/Controllers/About.php b/src/app/Controllers/About.php index bb845c1..f322489 100755 --- a/src/app/Controllers/About.php +++ b/src/app/Controllers/About.php @@ -6,21 +6,13 @@ class About extends BaseController { - private array $data = [ - 'title' => 'About', - ]; - - public function __construct() - { - } + private string $title = 'About'; public function index(string $state = ''): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); $DocumentationModel = new DocumentationModel(); - $query = $DocumentationModel->getAboutDetail($state); - echo view('about/index', ['query' => $query]); + echo view('about/index', ['query' => $DocumentationModel->getAboutDetail($state)]); echo view('core/footer'); } } diff --git a/src/app/Controllers/Adjudication.php b/src/app/Controllers/Adjudication.php index c2acd06..a0e7aa8 100755 --- a/src/app/Controllers/Adjudication.php +++ b/src/app/Controllers/Adjudication.php @@ -10,25 +10,17 @@ class Adjudication extends BaseController { - private array $data = [ - 'title' => 'Adjudication Detail', - ]; - - public function __construct() - { - } + private string $title = 'Adjudication Detail'; public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state, int|string $id): void { - $this->data['state'] = $state; $id = $this->getIdInt($id); $AdjudicationModel = new AdjudicationModel(); $query = $AdjudicationModel->getDetail($id, $state); @@ -36,21 +28,16 @@ public function view(string $state, int|string $id): void $this->noRecord($state); } else { $id = $query[0]->adjudicationid; - $this->data['pageTitle'] = $query[0]->adjudicationtitle; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title, 'pageTitle' => $query[0]->adjudicationtitle]); echo view('adjudication/view', ['query' => $query]); $AdjudicationLocationModel = new AdjudicationLocationModel(); - $query = $AdjudicationLocationModel->getByAdjudication($id); - echo view('adjudication/location', ['query' => $query]); + echo view('adjudication/location', ['query' => $AdjudicationLocationModel->getByAdjudication($id)]); $FilingModel = new FilingModel(); - $query = $FilingModel->getByAdjudication($id); - echo view('adjudication/filing', ['query' => $query]); + echo view('adjudication/filing', ['query' => $FilingModel->getByAdjudication($id)]); $AdjudicationSourceCitationModel = new AdjudicationSourceCitationModel(); - $query = $AdjudicationSourceCitationModel->getByAdjudication($id); - echo view('reporter/table', ['query' => $query, 'state' => $state, 'hasLink' => true, 'title' => 'Reporter Links']); + echo view('reporter/table', ['query' => $AdjudicationSourceCitationModel->getByAdjudication($id), 'state' => $state, 'hasLink' => true, 'title' => 'Reporter Links']); $EventModel = new EventModel(); - $query = $EventModel->getByAdjudication($id); - echo view('event/table', ['query' => $query, 'state' => $state, 'title' => 'Event Links', 'eventRelationship' => true]); + echo view('event/table', ['query' => $EventModel->getByAdjudication($id), 'state' => $state, 'title' => 'Event Links', 'eventRelationship' => true]); echo view('core/footer'); } diff --git a/src/app/Controllers/Area.php b/src/app/Controllers/Area.php index 43af4e5..899c18f 100755 --- a/src/app/Controllers/Area.php +++ b/src/app/Controllers/Area.php @@ -9,14 +9,9 @@ class Area extends BaseController { - private array $data = [ - 'title' => 'Area Detail', - 'extraAttribution' => '', - ]; + private string $extraAttribution = ''; - public function __construct() - { - } + private string $title = 'Area Detail'; public function address(string $state): void { @@ -25,7 +20,7 @@ public function address(string $state): void $data = file_get_contents('https://us1.locationiq.com/v1/search.php?key=' . getenv('locationiq_key') . '&format=json&countrycodes=us&dedupe=1&q=' . urlencode($addressText)); if (($data = json_decode($data, true)) !== false) { if (count($data) === 1) { - $this->data['extraAttribution'] = 'Address searching courtesy of LocationIQ.'; + $this->extraAttribution = 'Address searching courtesy of LocationIQ.'; $this->point($state, $data[0]['lat'], $data[0]['lon'], $addressText); } else { $this->addressCensusBureau($state, $addressText); @@ -42,7 +37,7 @@ public function addressCensusBureau(string $state, string $addressText): void $data = file_get_contents('https://geocoding.geo.census.gov/geocoder/locations/onelineaddress?benchmark=9&format=json&address=' . $addressText); if (($data = json_decode($data, true)) !== false) { if (count($data['result']['addressMatches']) === 1 && strtolower($data['result']['addressMatches'][0]['addressComponents']['state']) === $state) { - $this->data['extraAttribution'] = 'Address searching courtesy of the U.S. Census Bureau.'; + $this->extraAttribution = 'Address searching courtesy of the U.S. Census Bureau.'; $this->point($state, $data['result']['addressMatches'][0]['coordinates']['y'], $data['result']['addressMatches'][0]['coordinates']['x'], $addressText); } else { $this->noRecord($state); @@ -55,8 +50,7 @@ public function addressCensusBureau(string $state, string $addressText): void public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } @@ -86,7 +80,6 @@ public function point(string $state, float $y = 0, float $x = 0, string $address public function view(string $state, int|string $id, float $y = 0, float $x = 0, string $addressText = ''): void { - $this->data['state'] = $state; if (($this->isLive() || $y !== 0.0 || $x !== 0.0) && preg_match('/^\d{1,9}$/', $id)) { $id = (int) $id; } @@ -102,13 +95,14 @@ public function view(string $state, int|string $id, float $y = 0, float $x = 0, $currentQuery[0]->governmentcountyshort, $currentQuery[0]->governmentstateabbreviation ]; + $pageTitle = ''; foreach ($governmentArray as $g) { if ($g !== '' && !str_starts_with($g, 'Unincorporated') && !str_starts_with($g, 'Unorganized') && !str_starts_with($g, 'Unknown')) { - $this->data['pageTitle'] = $g; + $pageTitle = $g; break; } } - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title, 'pageTitle' => $pageTitle]); $searchParameter = []; if ($addressText !== '') { $searchParameter['Address'] = $addressText; @@ -130,12 +124,10 @@ public function view(string $state, int|string $id, float $y = 0, float $x = 0, } } $MetesDescriptionModel = new MetesDescriptionModel(); - $query = $MetesDescriptionModel->getByGovernmentShape($id); - echo view('metes/table', ['query' => $query, 'hasLink' => true, 'state' => $state, 'title' => 'Metes and Bounds Description']); + echo view('metes/table', ['query' => $MetesDescriptionModel->getByGovernmentShape($id), 'hasLink' => true, 'state' => $state, 'title' => 'Metes and Bounds Description']); $events = array_unique($events); $EventModel = new EventModel(); - $query = $EventModel->getByGovernmentShapeFailure($id, $events); - echo view('event/table', ['query' => $query, 'state' => $state, 'title' => 'Other Event Links']); + echo view('event/table', ['query' => $EventModel->getByGovernmentShapeFailure($id, $events), 'state' => $state, 'title' => 'Other Event Links']); echo view('leaflet/start', ['type' => 'area', 'includeBase' => true, 'needRotation' => false]); echo view('core/gis', [ 'query' => $currentQuery, @@ -149,13 +141,12 @@ public function view(string $state, int|string $id, float $y = 0, float $x = 0, $includePoint = false; if ($x !== 0.0 && $y !== 0.0) { $includePoint = true; - $query = [(object)[ - 'line' => '', - 'pointdescription' => '', - 'pointgeometry' => '{"type":"Point","coordinates":[' . $x . ',' . $y . ']}', - ]]; echo view('core/gis', [ - 'query' => $query, + 'query' => [(object)[ + 'line' => '', + 'pointdescription' => '', + 'pointgeometry' => '{"type":"Point","coordinates":[' . $x . ',' . $y . ']}', + ]], 'element' => 'point', 'onEachFeature' => false, 'onEachFeature2' => false, @@ -163,7 +154,7 @@ public function view(string $state, int|string $id, float $y = 0, float $x = 0, 'color' => 'D5103F', 'fillOpacity' => .5, 'radius' => 6, - 'attribution' => $this->data['extraAttribution'] + 'attribution' => $this->extraAttribution ]); } echo view('area/end', ['includePoint' => $includePoint]); diff --git a/src/app/Controllers/Bot.php b/src/app/Controllers/Bot.php index c339026..fdfb789 100755 --- a/src/app/Controllers/Bot.php +++ b/src/app/Controllers/Bot.php @@ -4,18 +4,11 @@ class Bot extends BaseController { - private array $data = [ - 'title' => 'Bot', - ]; - - public function __construct() - { - } + private string $title = 'Bot'; public function index(string $state = ''): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('bot/index'); echo view('core/footer'); } diff --git a/src/app/Controllers/Disclaimer.php b/src/app/Controllers/Disclaimer.php index 4538408..236b4ee 100755 --- a/src/app/Controllers/Disclaimer.php +++ b/src/app/Controllers/Disclaimer.php @@ -4,18 +4,11 @@ class Disclaimer extends BaseController { - private array $data = [ - 'title' => 'Disclaimers', - ]; - - public function __construct() - { - } + private string $title = 'Disclaimers'; public function index(string $state = ''): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('disclaimer/index'); echo view('core/footer'); } diff --git a/src/app/Controllers/Event.php b/src/app/Controllers/Event.php index dd48d8a..ed90f31 100755 --- a/src/app/Controllers/Event.php +++ b/src/app/Controllers/Event.php @@ -15,25 +15,17 @@ class Event extends BaseController { - private array $data = [ - 'title' => 'Event Detail', - ]; - - public function __construct() - { - } + private string $title = 'Event Detail'; public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state, int|string $id): void { - $this->data['state'] = $state; $id = $this->getIdInt($id); $EventModel = new EventModel(); $query = $EventModel->getDetail($id, $state); @@ -42,9 +34,7 @@ public function view(string $state, int|string $id): void } else { $id = $query[0]->eventid; $eventIsMapped = ($query[0]->eventismapped === 't'); - $this->data['pageTitle'] = $query[0]->eventlong; - $this->data['pageTitleType'] = $query[0]->eventtypeshort; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title, 'pageTitle' => $query[0]->eventlong, 'pageTitleType' => $query[0]->eventtypeshort]); echo view('event/view', ['query' => $query]); $AffectedGovernmentGroupModel = new AffectedGovernmentGroupModel(); $affectedGovernment = $AffectedGovernmentGroupModel->getByEventGovernment($id, $state); @@ -56,8 +46,8 @@ public function view(string $state, int|string $id): void } else { $MetesDescriptionLineModel = new \App\Models\MetesDescriptionLineModel(); } - $metesdescriptiongisquery = $MetesDescriptionLineModel->getGeometryByEvent($id, $state); - if ($metesdescriptiongisquery !== []) { + $metesDescriptionGisQuery = $MetesDescriptionLineModel->getGeometryByEvent($id, $state); + if ($metesDescriptionGisQuery !== []) { $hasMap = true; } if (!$this->isLive() && !$eventIsMapped) { @@ -69,36 +59,26 @@ public function view(string $state, int|string $id): void if (isset($affectedGovernment['rows']) && count($affectedGovernment['rows']) > 0) { echo view('event/table_affectedgovernment', ['affectedGovernment' => $affectedGovernment, 'state' => $state, 'includeDate' => false, 'isComplete' => true]); } - $query = $AffectedGovernmentGroupModel->getByEventForm($id, $state); - echo view('event/table_affectedgovernmentform', ['includeGovernment' => true, 'query' => $query]); + echo view('event/table_affectedgovernmentform', ['includeGovernment' => true, 'query' => $AffectedGovernmentGroupModel->getByEventForm($id, $state)]); $CurrentGovernmentModel = new CurrentGovernmentModel(); - $query = $CurrentGovernmentModel->getByEvent($id, $state); - echo view('event/table_currentgovernment', ['query' => $query, 'state' => $state]); + echo view('event/table_currentgovernment', ['query' => $CurrentGovernmentModel->getByEvent($id, $state), 'state' => $state]); $MetesDescriptionModel = new MetesDescriptionModel(); - $query = $MetesDescriptionModel->getByEvent($id); - echo view('metes/table', ['query' => $query, 'hasLink' => true, 'state' => $state, 'title' => 'Metes and Bounds Description']); + echo view('metes/table', ['query' => $MetesDescriptionModel->getByEvent($id), 'hasLink' => true, 'state' => $state, 'title' => 'Metes and Bounds Description']); $PlssModel = new PlssModel(); - $query = $PlssModel->getByEvent($id); - echo view('event/plss', ['query' => $query]); + echo view('event/plss', ['query' => $PlssModel->getByEvent($id)]); $AdjudicationModel = new AdjudicationModel(); - $query = $AdjudicationModel->getByEvent($id); - echo view('adjudication/table', ['query' => $query, 'state' => $state, 'eventRelationship' => true]); + echo view('adjudication/table', ['query' => $AdjudicationModel->getByEvent($id), 'state' => $state, 'eventRelationship' => true]); $LawSectionModel = new LawSectionModel(); - $query = $LawSectionModel->getByEvent($id); - echo view('law/table', ['query' => $query, 'state' => $state, 'title' => 'Law', 'type' => 'relationship', 'includeLawGroup' => true]); + echo view('law/table', ['query' => $LawSectionModel->getByEvent($id), 'state' => $state, 'title' => 'Law', 'type' => 'relationship', 'includeLawGroup' => true]); $RecordingModel = new RecordingModel(); - $query = $RecordingModel->getByEvent($id, $state); - echo view('event/recording', ['query' => $query]); + echo view('event/recording', ['query' => $RecordingModel->getByEvent($id, $state)]); $GovernmentSourceModel = new GovernmentSourceModel(); - $query = $GovernmentSourceModel->getByEvent($id, $state); - echo view('governmentsource/table', ['query' => $query, 'state' => $state, 'type' => 'event']); + echo view('governmentsource/table', ['query' => $GovernmentSourceModel->getByEvent($id, $state), 'state' => $state, 'type' => 'event']); $SourceCitationModel = new SourceCitationModel(); - $query = $SourceCitationModel->getByEvent($id); - echo view('source/table_citation', ['query' => $query, 'state' => $state, 'hasColor' => false, 'hasLink' => true, 'title' => 'Source']); + echo view('source/table_citation', ['query' => $SourceCitationModel->getByEvent($id), 'state' => $state, 'hasColor' => false, 'hasLink' => true, 'title' => 'Source']); if ($this->isLive()) { $FileSourceModel = new \App\Models\Development\FileSourceModel(); - $query = $FileSourceModel->getByEvent($id); - echo view(ENVIRONMENT . '/filesource/table', ['query' => $query, 'state' => $state]); + echo view(ENVIRONMENT . '/filesource/table', ['query' => $FileSourceModel->getByEvent($id), 'state' => $state]); } if ($hasMap) { $i = 0; @@ -116,9 +96,9 @@ public function view(string $state, int|string $id): void ]); } $layers = []; - if ($this->isLive() && $metesdescriptiongisquery !== []) { + if ($this->isLive() && $metesDescriptionGisQuery !== []) { echo view('core/gis', [ - 'query' => $metesdescriptiongisquery, + 'query' => $metesDescriptionGisQuery, 'element' => 'metesdescription', 'onEachFeature' => false, 'onEachFeature2' => false, diff --git a/src/app/Controllers/Fourofour.php b/src/app/Controllers/Fourofour.php index b19f36b..4408102 100755 --- a/src/app/Controllers/Fourofour.php +++ b/src/app/Controllers/Fourofour.php @@ -4,19 +4,12 @@ class Fourofour extends BaseController { - private array $data = [ - 'title' => '404', - ]; - - public function __construct() - { - } + private string $title = '404'; public function index(string $state = ''): void { $this->response->setStatusCode(404); - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/error'); echo view('core/footer'); } diff --git a/src/app/Controllers/Government.php b/src/app/Controllers/Government.php index 0100c25..c6dd58e 100755 --- a/src/app/Controllers/Government.php +++ b/src/app/Controllers/Government.php @@ -13,25 +13,17 @@ class Government extends BaseController { - private array $data = [ - 'title' => 'Government Detail', - ]; - - public function __construct() - { - } + private string $title = 'Government Detail'; public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state, int|string $id, bool $isHistory = false): void { - $this->data['state'] = $state; $id = $this->getIdInt($id); if ($this->isLive()) { $GovernmentFormGovernmentModel = new \App\Models\Development\GovernmentFormGovernmentModel(); @@ -59,10 +51,8 @@ public function view(string $state, int|string $id, bool $isHistory = false): vo exit(); } else { $id = $query[0]->governmentid; - $this->data['isHistory'] = $isHistory; - $this->data['pageTitle'] = $query[0]->governmentlong; - $this->data['isMultiple'] = ($query[0]->governmentsubstitutemultiple === 't'); - echo view('core/header', $this->data); + $isMultiple = ($query[0]->governmentsubstitutemultiple === 't'); + echo view('core/header', ['state' => $state, 'title' => $this->title, 'pageTitle' => $query[0]->governmentlong]); $isMunicipalityOrLower = ($query[0]->governmentlevel === 'municipality or lower'); $isCountyOrLower = ($query[0]->governmentlevel === 'municipality or lower' || $query[0]->governmentlevel === 'county'); $isCountyOrState = ($query[0]->governmentlevel === 'state' || $query[0]->governmentlevel === 'county'); @@ -85,16 +75,14 @@ public function view(string $state, int|string $id, bool $isHistory = false): vo if ($populationQuery !== []) { echo view('core/chart'); } - $query = $GovernmentModel->getRelated($id, $state); - echo view('government/related', ['query' => $query]); + echo view('government/related', ['query' => $GovernmentModel->getRelated($id, $state)]); $GovernmentIdentifierModel = new GovernmentIdentifierModel(); - $query = $GovernmentIdentifierModel->getByGovernment($id, $state); - echo view('governmentidentifier/table', ['query' => $query, 'title' => 'Identifier', 'isMultiple' => $this->data['isMultiple']]); + echo view('governmentidentifier/table', ['query' => $GovernmentIdentifierModel->getByGovernment($id, $state), 'title' => 'Identifier', 'isMultiple' => $isMultiple]); } $AffectedGovernmentGroupModel = new AffectedGovernmentGroupModel(); $query = $AffectedGovernmentGroupModel->getByGovernmentGovernment($id, $state); $events = []; - echo view('government/affectedgovernment', ['query' => $query, 'isMultiple' => $this->data['isMultiple']]); + echo view('government/affectedgovernment', ['query' => $query, 'isMultiple' => $isMultiple]); foreach ($query as $row) { $events[] = $row->event; } @@ -107,39 +95,33 @@ public function view(string $state, int|string $id, bool $isHistory = false): vo $EventModel = new EventModel(); if (!$isHistory) { if ($isCountyOrLower) { - $query = $EventModel->getByGovernmentSuccess($id, $events); - echo view('event/table', ['query' => $query, 'state' => $state, 'title' => 'Other Successful Event Links', 'tableId' => 'successfulevent']); + echo view('event/table', ['query' => $EventModel->getByGovernmentSuccess($id, $events), 'state' => $state, 'title' => 'Other Successful Event Links', 'tableId' => 'successfulevent']); } $GovernmentSourceModel = new GovernmentSourceModel(); - $query = $GovernmentSourceModel->getByGovernment($id, $state); - echo view('governmentsource/table', ['query' => $query, 'state' => $state, 'type' => 'government', 'isMultiple' => $this->data['isMultiple']]); + echo view('governmentsource/table', ['query' => $GovernmentSourceModel->getByGovernment($id, $state), 'state' => $state, 'type' => 'government', 'isMultiple' => $isMultiple]); $query = $GovernmentModel->getNote($id, $state); if ($query !== []) { - echo view(ENVIRONMENT . '/government/note', ['query' => $query, 'isMultiple' => $this->data['isMultiple']]); + echo view(ENVIRONMENT . '/government/note', ['query' => $query, 'isMultiple' => $isMultiple]); } $query = $GovernmentFormGovernmentModel->getByGovernment($id, $state); if ($query !== []) { - echo view(ENVIRONMENT . '/government/governmentform', ['query' => $query, 'isMultiple' => $this->data['isMultiple']]); + echo view(ENVIRONMENT . '/government/governmentform', ['query' => $query, 'isMultiple' => $isMultiple]); } $query = $GovernmentModel->getSchoolDistrict($id, $state); if ($query !== []) { - echo view(ENVIRONMENT . '/government/schooldistrict', ['query' => $query, 'isMultiple' => $this->data['isMultiple']]); + echo view(ENVIRONMENT . '/government/schooldistrict', ['query' => $query, 'isMultiple' => $isMultiple]); } - $query = $SourceModel->getByGovernment($id); - echo view('source/table', ['query' => $query, 'hasLink' => true]); + echo view('source/table', ['query' => $SourceModel->getByGovernment($id), 'hasLink' => true]); $ResearchLogModel = new ResearchLogModel(); - $query = $ResearchLogModel->getByGovernment($id, $state); - echo view('government/researchlog', ['query' => $query, 'isMultiple' => $this->data['isMultiple']]); + echo view('government/researchlog', ['query' => $ResearchLogModel->getByGovernment($id, $state), 'isMultiple' => $isMultiple]); $NationalArchivesModel = new NationalArchivesModel(); - $query = $NationalArchivesModel->getByGovernment($id, $state); - echo view('government/nationalarchives', ['query' => $query, 'isMultiple' => $this->data['isMultiple']]); + echo view('government/nationalarchives', ['query' => $NationalArchivesModel->getByGovernment($id, $state), 'isMultiple' => $isMultiple]); if ($isCountyOrLower) { - $query = $EventModel->getByGovernmentFailure($id, $events); - echo view('event/table', ['query' => $query, 'state' => $state, 'title' => 'Other Event Links', 'tableId' => 'otherevent']); + echo view('event/table', ['query' => $EventModel->getByGovernmentFailure($id, $events), 'state' => $state, 'title' => 'Other Event Links', 'tableId' => 'otherevent']); } $query = $GovernmentModel->getOffice($id, $state); if ($query !== []) { - echo view(ENVIRONMENT . '/government/office', ['query' => $query, 'isMultiple' => $this->data['isMultiple']]); + echo view(ENVIRONMENT . '/government/office', ['query' => $query, 'isMultiple' => $isMultiple]); } if (file_exists(APPPATH . 'Views/' . ENVIRONMENT . '/government/live.php')) { echo view(ENVIRONMENT . '/government/live', ['id' => $id, 'state' => $state, 'isMunicipalityOrLower' => $isMunicipalityOrLower, 'isCountyOrLower' => $isCountyOrLower, 'isCountyOrState' => $isCountyOrState, 'isState' => $isStateOrHigher, 'includeGovernment' => false]); diff --git a/src/app/Controllers/Governmentidentifier.php b/src/app/Controllers/Governmentidentifier.php index 15e4076..4e84f51 100755 --- a/src/app/Controllers/Governmentidentifier.php +++ b/src/app/Controllers/Governmentidentifier.php @@ -7,18 +7,11 @@ class Governmentidentifier extends BaseController { - private readonly array $data; - - public function __construct() - { - $this->data = [ - 'title' => 'Government Identifier Detail', - ]; - } + private string $title = 'Government Identifier Detail'; public function noRecord(): void { - echo view('core/header', $this->data); + echo view('core/header', ['state' => '', 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } @@ -40,13 +33,11 @@ public function view(string $type, string $id): null|RedirectResponse } else { $governmentidentifierids = $query[0]->governmentidentifierids; $governments = $query[0]->governments; - echo view('core/header', $this->data); + echo view('core/header', ['state' => '', 'title' => $this->title]); echo view('governmentidentifier/table', ['query' => $query, 'title' => 'Detail']); $GovernmentModel = new GovernmentModel(); - $query = $GovernmentModel->getByGovernmentIdentifier($governmentidentifierids); - echo view('government/table', ['query' => $query, 'title' => 'Government', 'type' => 'identifier']); - $query = $GovernmentIdentifierModel->getRelated($governments, $governmentidentifierids); - echo view('governmentidentifier/table', ['query' => $query, 'title' => 'Related']); + echo view('government/table', ['query' => $GovernmentModel->getByGovernmentIdentifier($governmentidentifierids), 'title' => 'Government', 'type' => 'identifier']); + echo view('governmentidentifier/table', ['query' => $GovernmentIdentifierModel->getRelated($governments, $governmentidentifierids), 'title' => 'Related']); if ($type === 'us-census' || $type === 'usgs') { if ($type === 'us-census') { $query = $GovernmentIdentifierModel->getCensus($governmentidentifierids); diff --git a/src/app/Controllers/Governmentsource.php b/src/app/Controllers/Governmentsource.php index a542b86..7849649 100755 --- a/src/app/Controllers/Governmentsource.php +++ b/src/app/Controllers/Governmentsource.php @@ -8,25 +8,17 @@ class Governmentsource extends BaseController { - private array $data = [ - 'title' => 'Government Source Detail', - ]; - - public function __construct() - { - } + private string $title = 'Government Source Detail'; public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state, int|string $id): void { - $this->data['state'] = $state; $id = $this->getIdInt($id); $GovernmentSourceModel = new GovernmentSourceModel(); $query = $GovernmentSourceModel->getDetail($id, $state); @@ -34,15 +26,13 @@ public function view(string $state, int|string $id): void $this->noRecord($state); } else { $id = $query[0]->governmentsourceid; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('governmentsource/table', ['query' => $query, 'state' => $state, 'type' => 'source']); echo view('source/table', ['query' => $query, 'hasLink' => $this->isLive()]); $SourceItemPartModel = new SourceItemPartModel(); - $query = $SourceItemPartModel->getByGovernmentSource($id); - echo view('core/url', ['query' => $query, 'state' => $state, 'title' => 'Calculated URL']); + echo view('core/url', ['query' => $SourceItemPartModel->getByGovernmentSource($id), 'state' => $state, 'title' => 'Calculated URL']); $EventModel = new EventModel(); - $query = $EventModel->getByGovernmentSource($id); - echo view('event/table', ['query' => $query, 'state' => $state, 'title' => 'Event Links']); + echo view('event/table', ['query' => $EventModel->getByGovernmentSource($id), 'state' => $state, 'title' => 'Event Links']); echo view('core/footer'); } } diff --git a/src/app/Controllers/Key.php b/src/app/Controllers/Key.php index a9aa41d..f8087ea 100755 --- a/src/app/Controllers/Key.php +++ b/src/app/Controllers/Key.php @@ -6,18 +6,11 @@ class Key extends BaseController { - private array $data = [ - 'title' => 'Key', - ]; - - public function __construct() - { - } + private string $title = 'Key'; public function index(string $state = ''): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); $keyQueries = []; diff --git a/src/app/Controllers/Law.php b/src/app/Controllers/Law.php index 544d2cd..3530b3f 100755 --- a/src/app/Controllers/Law.php +++ b/src/app/Controllers/Law.php @@ -7,25 +7,17 @@ class Law extends BaseController { - private array $data = [ - 'title' => 'Law Detail', - ]; - - public function __construct() - { - } + private string $title = 'Law Detail'; public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state, int|string $id): void { - $this->data['state'] = $state; if (str_ends_with($id, '-alternate')) { $function = 'getByLawAlternateSection'; $LawSectionModel = new \App\Models\LawAlternateSectionModel(); @@ -39,8 +31,7 @@ public function view(string $state, int|string $id): void $this->noRecord($state); } else { $id = $query[0]->lawsectionid; - $this->data['pageTitle'] = $query[0]->lawsectioncitation; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title, 'pageTitle' => $query[0]->lawsectioncitation]); echo view('law/view', ['query' => $query]); echo view('source/table', ['query' => $query, 'hasLink' => false]); if ($query[0]->url !== '') { @@ -65,14 +56,11 @@ public function view(string $state, int|string $id): void if ($query !== []) { echo view(ENVIRONMENT . '/lawgroup/table', ['query' => $query, 'includeForm' => false]); } - $query = $LawSectionModel->getRelated($id); - echo view('law/table', ['query' => $query, 'state' => $state, 'title' => 'Related Law', 'type' => 'relationship']); + echo view('law/table', ['query' => $LawSectionModel->getRelated($id), 'state' => $state, 'title' => 'Related Law', 'type' => 'relationship']); $SourceItemPartModel = new SourceItemPartModel(); - $query = $SourceItemPartModel->$function($id); - echo view('core/url', ['query' => $query, 'state' => $state, 'title' => 'Calculated URL']); + echo view('core/url', ['query' => $SourceItemPartModel->$function($id), 'state' => $state, 'title' => 'Calculated URL']); $EventModel = new EventModel(); - $query = $EventModel->$function($id); - echo view('event/table', ['query' => $query, 'state' => $state, 'title' => 'Event Links', 'eventRelationship' => true, 'includeLawGroup' => true]); + echo view('event/table', ['query' => $EventModel->$function($id), 'state' => $state, 'title' => 'Event Links', 'eventRelationship' => true, 'includeLawGroup' => true]); echo view('core/footer'); } } diff --git a/src/app/Controllers/Map.php b/src/app/Controllers/Map.php index 759df18..1414168 100755 --- a/src/app/Controllers/Map.php +++ b/src/app/Controllers/Map.php @@ -7,14 +7,6 @@ class Map extends BaseController { - private array $data = [ - 'title' => 'Map', - ]; - - public function __construct() - { - } - public function baseStyle(int $maxZoom = 14, ResponseInterface $response = null): void { if (!$response instanceof \CodeIgniter\HTTP\ResponseInterface) { @@ -64,19 +56,18 @@ public function baseStyle(int $maxZoom = 14, ResponseInterface $response = null) public function leaflet(string $state = ''): void { - $this->data['state'] = ($state === 'zoom' ? '' : $state); - $this->data['zoom'] = ($state === 'zoom'); + $zoom = ($state === 'zoom'); $this->response->removeHeader('Cache-Control'); $this->response->setHeader('Cache-Control', 'max-age=86400'); $this->response->setHeader('Content-Type', 'application/javascript'); - echo view('leaflet/state_base', $this->data); + echo view('leaflet/state_base', ['state' => $state, 'zoom' => $zoom]); try { - echo view('leaflet/state_' . $state, $this->data); + echo view('leaflet/state_' . $state); } catch (\Throwable) { try { - echo view('development/leaflet/state_' . $state, $this->data); + echo view('development/leaflet/state_' . $state); } catch (\Throwable) { - echo view('leaflet/state', $this->data); + echo view('leaflet/state'); } } } diff --git a/src/app/Controllers/Metes.php b/src/app/Controllers/Metes.php index 67c96f9..b7aec0a 100755 --- a/src/app/Controllers/Metes.php +++ b/src/app/Controllers/Metes.php @@ -6,25 +6,17 @@ class Metes extends BaseController { - private array $data = [ - 'title' => 'Metes and Bounds Description Detail', - ]; - - public function __construct() - { - } + private string $title = 'Metes and Bounds Description Detail'; public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state, int|string $id): void { - $this->data['state'] = $state; $id = $this->getIdInt($id); $MetesDescriptionModel = new MetesDescriptionModel(); $areaQuery = $MetesDescriptionModel->getDetail($id, $state); @@ -32,8 +24,7 @@ public function view(string $state, int|string $id): void $this->noRecord($state); } else { $id = $areaQuery[0]->metesdescriptionid; - $this->data['pageTitle'] = $areaQuery[0]->metesdescriptionlong; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title, 'pageTitle' => $areaQuery[0]->metesdescriptionlong]); echo view('metes/table', ['query' => $areaQuery, 'hasLink' => false, 'title' => 'Detail']); $hasMap = false; $hasMetes = false; @@ -50,8 +41,7 @@ public function view(string $state, int|string $id): void $hasMap = true; echo view('core/map', ['includeBase' => $hasBegin, 'includeDisclaimer' => true]); } - $query = $MetesDescriptionLineModel->getByMetesDescription($id); - echo view('metes/row', ['query' => $query]); + echo view('metes/row', ['query' => $MetesDescriptionLineModel->getByMetesDescription($id)]); echo view('event/table', ['query' => $areaQuery, 'state' => $state, 'title' => 'Event Links']); if ($hasMap) { echo view('leaflet/start', ['type' => 'metes', 'includeBase' => $hasBegin, 'needRotation' => false]); diff --git a/src/app/Controllers/Reporter.php b/src/app/Controllers/Reporter.php index d2fcc20..71e933a 100755 --- a/src/app/Controllers/Reporter.php +++ b/src/app/Controllers/Reporter.php @@ -9,25 +9,17 @@ class Reporter extends BaseController { - private array $data = [ - 'title' => 'Reporter Details', - ]; - - public function __construct() - { - } + private string $title = 'Reporter Details'; public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state, int|string $id): void { - $this->data['state'] = $state; $id = $this->getIdInt($id); $AdjudicationSourceCitationModel = new AdjudicationSourceCitationModel(); $query = $AdjudicationSourceCitationModel->getDetail($id, $state); @@ -35,7 +27,7 @@ public function view(string $state, int|string $id): void $this->noRecord($state); } else { $id = $query[0]->adjudicationsourcecitationid; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('reporter/table', ['query' => $query, 'state' => $state, 'hasLink' => false, 'title' => 'Detail']); echo view('source/table', ['query' => $query, 'hasLink' => false]); echo view('reporter/authorship', ['query' => $query]); @@ -43,14 +35,11 @@ public function view(string $state, int|string $id): void echo view('core/url', ['query' => $query, 'title' => 'Actual URL']); } $SourceItemPartModel = new SourceItemPartModel(); - $query = $SourceItemPartModel->getByAdjudicationSourceCitation($id); - echo view('core/url', ['query' => $query, 'state' => $state, 'title' => 'Calculated URL']); + echo view('core/url', ['query' => $SourceItemPartModel->getByAdjudicationSourceCitation($id), 'state' => $state, 'title' => 'Calculated URL']); $AdjudicationModel = new AdjudicationModel(); - $query = $AdjudicationModel->getByAdjudicationSourceCitation($id); - echo view('adjudication/table', ['query' => $query, 'state' => $state]); + echo view('adjudication/table', ['query' => $AdjudicationModel->getByAdjudicationSourceCitation($id), 'state' => $state]); $EventModel = new EventModel(); - $query = $EventModel->getByAdjudicationSourceCitation($id); - echo view('event/table', ['query' => $query, 'state' => $state, 'title' => 'Event Links']); + echo view('event/table', ['query' => $EventModel->getByAdjudicationSourceCitation($id), 'state' => $state, 'title' => 'Event Links']); echo view('core/footer'); } } diff --git a/src/app/Controllers/Search.php b/src/app/Controllers/Search.php index fe97f80..2427163 100755 --- a/src/app/Controllers/Search.php +++ b/src/app/Controllers/Search.php @@ -9,9 +9,7 @@ class Search extends BaseController { - private array $data = [ - 'title' => 'Search', - ]; + private string $title = 'Search'; private array $categoryType = [ 'event' => 'Event', @@ -43,10 +41,6 @@ class Search extends BaseController 'statewide' => 'Statewide', ]; - public function __construct() - { - } - private function governmentLevel(string $a): int { return match ($a) { @@ -59,42 +53,42 @@ private function governmentLevel(string $a): int public function governmentlookup(string $state, string $government = '', string $type = ''): void { - $this->data['state'] = $state; $GovernmentModel = new GovernmentModel(); $type = 'getLookupBy' . ucwords(str_replace('parent', 'Parent', $type)); - $this->data['query'] = $GovernmentModel->$type($state, $government); $this->response->setHeader('Content-Type', 'application/json'); - echo json_encode($this->data['query']); + echo json_encode($GovernmentModel->$type($state, $government)); } public function index(string $state = ''): void { $stateArray = $this->getJurisdictions(); - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); if (!$this->isLive() && !in_array($state, $stateArray)) { echo view('search/unavailable'); } else { $GovernmentModel = new GovernmentModel(); - $this->data['id'] = $GovernmentModel->getSlug($GovernmentModel->getAbbreviationId($state)); + $id = $GovernmentModel->getSlug($GovernmentModel->getAbbreviationId($state)); + echo view('core/ui'); $EventTypeModel = new EventTypeModel(); - $this->data['eventTypeQuery'] = $EventTypeModel->getSearch($state); - $this->data['months'] = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; - foreach ($this->data['months'] as $k => $m) { - $this->data['months'][$k] = [ + $GovernmentIdentifierTypeModel = new GovernmentIdentifierTypeModel(); + $SourceModel = new SourceModel(); + $months = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December']; + foreach ($months as $k => $m) { + $months[$k] = [ 'monthNumber' => $k + 1, 'monthName' => $m ]; } - $this->data['tribunalgovernmentshortQuery'] = $GovernmentModel->getSearch($state); - $GovernmentIdentifierTypeModel = new GovernmentIdentifierTypeModel(); - $this->data['governmentIdentifierTypeQuery'] = $GovernmentIdentifierTypeModel->getSearch($state); - $SourceModel = new SourceModel(); - $this->data['reporterQuery'] = $SourceModel->getSearch($state); - echo view('core/ui', $this->data); - echo view('search/index', $this->data); + echo view('search/index', [ + 'eventTypeQuery' => $EventTypeModel->getSearch($state), + 'governmentIdentifierTypeQuery' => $GovernmentIdentifierTypeModel->getSearch($state), + 'months' => $months, + 'reporterQuery' => $SourceModel->getSearch($state), + 'state' => $state, + 'tribunalgovernmentshortQuery' => $GovernmentModel->getSearch($state), + ]); if (file_exists(APPPATH . 'Views/' . ENVIRONMENT . '/government/live.php')) { - echo view(ENVIRONMENT . '/government/live', ['id' => $this->data['id'], 'state' => $state, 'isMunicipalityOrLower' => false, 'isCountyOrLower' => false, 'isCountyOrState' => false, 'isState' => true, 'includeGovernment' => true]); + echo view(ENVIRONMENT . '/government/live', ['id' => $id, 'state' => $state, 'isMunicipalityOrLower' => false, 'isCountyOrLower' => false, 'isCountyOrState' => false, 'isState' => true, 'includeGovernment' => true]); } } echo view('core/footer'); @@ -102,7 +96,6 @@ public function index(string $state = ''): void public function view(string $state, string $category): void { - $this->data['state'] = $state; $type = $this->request->getPost('type'); $fields = []; $model = ''; @@ -173,11 +166,10 @@ public function view(string $state, string $category): void } if ($fields !== [] && $model !== '') { - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); $model = "App\\Models\\" . $model; $model = new $model(); $modelType = 'getSearchBy'. ucwords($type); - $query = $model->$modelType($fields); $searchParameter = [ 'Search For' => $this->categoryType[$category], 'Search By' => $this->typeType[$this->request->getPost('type')], @@ -188,7 +180,7 @@ public function view(string $state, string $category): void } } echo view('core/parameter', ['searchParameter' => $searchParameter]); - echo view($category . '/table', ['query' => $query, 'state' => $state, 'title' => 'Results:', 'type' => $type]); + echo view($category . '/table', ['query' => $model->$modelType($fields), 'state' => $state, 'title' => 'Results:', 'type' => $type]); echo view('core/footer'); } else { $this->response->setHeader('Content-Type', 'application/json'); diff --git a/src/app/Controllers/Source.php b/src/app/Controllers/Source.php index 595d869..e0c40f9 100755 --- a/src/app/Controllers/Source.php +++ b/src/app/Controllers/Source.php @@ -9,25 +9,17 @@ class Source extends BaseController { - private array $data = [ - 'title' => 'Source Detail', - ]; - - public function __construct() - { - } + private string $title = 'Source Detail'; public function noRecord(string $state): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state, int|string $id): void { - $this->data['state'] = $state; $id = $this->getIdInt($id); $SourceCitationModel = new SourceCitationModel(); $query = $SourceCitationModel->getDetail($id, $state); @@ -35,22 +27,19 @@ public function view(string $state, int|string $id): void $this->noRecord($state); } else { $id = $query[0]->sourcecitationid; - $this->data['pageTitle'] = $query[0]->sourceabbreviation . ($query[0]->sourcecitationpage === '' ? '' : ' ' . $query[0]->sourcecitationpage); - echo view('core/header', $this->data); + $pageTitle = $query[0]->sourceabbreviation . ($query[0]->sourcecitationpage === '' ? '' : ' ' . $query[0]->sourcecitationpage); + echo view('core/header', ['state' => $state, 'title' => $this->title, 'pageTitle' => $pageTitle]); echo view('source/table_citation', ['query' => $query, 'state' => $state, 'hasColor' => false, 'hasLink' => false, 'title' => 'Detail']); echo view('source/table', ['query' => $query, 'hasLink' => $this->isLive()]); if ($query[0]->url !== '') { echo view('core/url', ['query' => $query, 'title' => 'Actual URL']); } $SourceCitationNoteModel = new SourceCitationNoteModel(); - $query = $SourceCitationNoteModel->getBySourceCitation($id); - echo view('source/note', ['query' => $query, 'state' => $state]); + echo view('source/note', ['query' => $SourceCitationNoteModel->getBySourceCitation($id), 'state' => $state]); $SourceItemPartModel = new SourceItemPartModel(); - $query = $SourceItemPartModel->getBySourceCitation($id); - echo view('core/url', ['query' => $query, 'state' => $state, 'title' => 'Calculated URL']); + echo view('core/url', ['query' => $SourceItemPartModel->getBySourceCitation($id), 'state' => $state, 'title' => 'Calculated URL']); $EventModel = new EventModel(); - $query = $EventModel->getBySourceCitation($id); - echo view('event/table', ['query' => $query, 'state' => $state, 'title' => 'Event Links']); + echo view('event/table', ['query' => $EventModel->getBySourceCitation($id), 'state' => $state, 'title' => 'Event Links']); echo view('core/footer'); } } diff --git a/src/app/Controllers/Statistics.php b/src/app/Controllers/Statistics.php index 661c42f..ecef295 100755 --- a/src/app/Controllers/Statistics.php +++ b/src/app/Controllers/Statistics.php @@ -6,9 +6,7 @@ class Statistics extends BaseController { - private array $data = [ - 'title' => 'Statistics', - ]; + private string $title = 'Statistics'; private array $byType = [ 'current' => 'Modern-Day Jurisdictions', @@ -26,33 +24,28 @@ class Statistics extends BaseController 'mapped_review' => 'Reviewed Municipalities', ]; - public function __construct() - { - } - public function index(string $state = ''): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); - echo view('core/ui', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); + echo view('core/ui'); $EventTypeModel = new EventTypeModel(); - $this->data['eventTypeQuery'] = $EventTypeModel->getManyByStatistics($state); - echo view('statistics/index', $this->data); + echo view('statistics/index', [ + 'state' => $state, + 'eventTypeQuery' => $EventTypeModel->getManyByStatistics($state) + ]); echo view('core/footer'); } public function noRecord(string $state = ''): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); echo view('core/norecord'); echo view('core/footer'); } public function view(string $state = ''): void { - $this->data['state'] = $state; - echo view('core/header', $this->data); + echo view('core/header', ['state' => $state, 'title' => $this->title]); $by = $this->request->getPost('by'); $for = $this->request->getPost('for'); @@ -143,23 +136,27 @@ public function view(string $state = ''): void $model = new $model(); $type = 'getByStatistics' . ($state === '' ? 'Nation' : 'State') . 'Whole'; - $this->data['wholeQuery'] = $model->$type($fields); - if ($this->data['wholeQuery'][0]->datarow === '["x"]') { - $this->data['wholeQuery'] = []; + $wholeQuery = $model->$type($fields); + if ($wholeQuery[0]->datarow === '["x"]') { + $wholeQuery = []; + $query = []; } else { $type = str_replace('Whole', 'Part', $type); - $this->data['query'] = $model->$type($fields); - foreach ($this->data['query'] as $key => $row) { - $this->data['query'][$key] = '"' . $row->series . '":{"xrow":' . $row->xrow . ',"yrow":' . $row->yrow . ',"ysum":' . $row->ysum . '}'; + $query = $model->$type($fields); + foreach ($query as $key => $row) { + $query[$key] = '"' . $row->series . '":{"xrow":' . $row->xrow . ',"yrow":' . $row->yrow . ',"ysum":' . $row->ysum . '}'; } - $this->data['query'] = '{' . implode(',', $this->data['query']) . '}'; + $query = '{' . implode(',', $query) . '}'; } - - $this->data['isContemporaneous'] = ($searchParameter['Grouped By'] === 'Contemporaneous Jurisdictions'); - $this->data['notEvent'] = ($searchParameter['Metric'] === 'Events by Event Type'); echo view('core/parameter', ['searchParameter' => $searchParameter]); - echo view('statistics/view', $this->data); - echo view('core/chartjs', ['query' => $this->data['wholeQuery'], 'xLabel' => 'Year', 'yLabel' => ($for === 'createddissolved' ? 'Governments' : 'Events')]); + echo view('statistics/view', [ + 'wholeQuery' => $wholeQuery, + 'isContemporaneous' => ($searchParameter['Grouped By'] === 'Contemporaneous Jurisdictions'), + 'notEvent' => ($searchParameter['Metric'] === 'Events by Event Type'), + 'query' => $query, + 'state' => $state, + ]); + echo view('core/chartjs', ['query' => $wholeQuery, 'xLabel' => 'Year', 'yLabel' => ($for === 'createddissolved' ? 'Governments' : 'Events')]); echo view('core/footer'); } } diff --git a/src/app/Controllers/Welcome.php b/src/app/Controllers/Welcome.php index 6c0bffd..7cbc728 100755 --- a/src/app/Controllers/Welcome.php +++ b/src/app/Controllers/Welcome.php @@ -6,19 +6,12 @@ class Welcome extends BaseController { - private readonly array $data; - - public function __construct() - { - $this->data = [ - 'title' => 'Welcome', - ]; - } + private string $title = 'Welcome'; public function index(): void { $stateArray = $this->getJurisdictions(); - echo view('core/header', $this->data); + echo view('core/header', ['state' => '', 'title' => $this->title]); echo view('welcome/index', ['stateArray' => $stateArray]); echo view('core/footer'); } From 6d3e52bbe6ee4d4aa4456b9be7b7622b973f25b0 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Mon, 7 Oct 2024 03:26:57 -0400 Subject: [PATCH 20/31] Map->leaflet(): Restore $state variable --- src/app/Controllers/Map.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/Controllers/Map.php b/src/app/Controllers/Map.php index 1414168..28c2a60 100755 --- a/src/app/Controllers/Map.php +++ b/src/app/Controllers/Map.php @@ -57,6 +57,7 @@ public function baseStyle(int $maxZoom = 14, ResponseInterface $response = null) public function leaflet(string $state = ''): void { $zoom = ($state === 'zoom'); + $state = ($state === 'zoom' ? '' : $state); $this->response->removeHeader('Cache-Control'); $this->response->setHeader('Cache-Control', 'max-age=86400'); $this->response->setHeader('Content-Type', 'application/javascript'); From ec5a29e672c630256048c7f94776e595fa1dbb8e Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Mon, 7 Oct 2024 19:06:59 -0400 Subject: [PATCH 21/31] Move Disclaimers text to database --- env/Sample.env | 8 -------- src/app/Controllers/Disclaimer.php | 5 ++++- src/app/Models/DocumentationModel.php | 15 +++++++++++++++ src/app/Views/disclaimer/index.php | 27 ++++++++++++++++----------- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/env/Sample.env b/env/Sample.env index efb789c..099a9f1 100644 --- a/env/Sample.env +++ b/env/Sample.env @@ -73,14 +73,6 @@ app_title_en=*** app_title_fr=*** -# Venue under Governing Law in Disclaimers. - -app_venue_county=*** - -app_venue_state=*** - -app_venue_country=*** - # Name and contact information in the footer and Disclaimers. app_compiler_name=*** diff --git a/src/app/Controllers/Disclaimer.php b/src/app/Controllers/Disclaimer.php index 236b4ee..247b525 100755 --- a/src/app/Controllers/Disclaimer.php +++ b/src/app/Controllers/Disclaimer.php @@ -2,6 +2,8 @@ namespace App\Controllers; +use App\Models\DocumentationModel; + class Disclaimer extends BaseController { private string $title = 'Disclaimers'; @@ -9,7 +11,8 @@ class Disclaimer extends BaseController public function index(string $state = ''): void { echo view('core/header', ['state' => $state, 'title' => $this->title]); - echo view('disclaimer/index'); + $DocumentationModel = new DocumentationModel(); + echo view('disclaimer/index', ['query' => $DocumentationModel->getDisclaimer()]); echo view('core/footer'); } } diff --git a/src/app/Models/DocumentationModel.php b/src/app/Models/DocumentationModel.php index 80bde5b..c6f1b21 100644 --- a/src/app/Models/DocumentationModel.php +++ b/src/app/Models/DocumentationModel.php @@ -24,6 +24,21 @@ public function getAboutDetail(string $state): array ])->getResult(); } + public function getDisclaimer(): array + { + $query = <<db->query($query)->getResult(); + } + public function getKey(string $type): array { $query = <<Scope and Purpose of Project: This project aims to educate users and disseminate information concerning the geographic history and structure of political subdivisions and local government.

-

Quality and Completeness: The data included in this resource is incomplete. Records from previous centuries do not contain as much information as desired. Certain primary records are inaccessible or no longer existent. Depending on the era, local government boundaries were able to be altered by municipal, county, state, provincial, federal, or royal officials, each maintaining their own sets of records, which may or may not have survived the test of time. Land surveys conducted prior to the invention of modern surveying equipment were often inaccurate, and may not align properly with other surveys of the same boundary. While every effort has been made to include data of high quality within this project, certain data may be inaccurate or of low quality due to data entry errors or inaccuracies in source documents.

-

Not a Government Document: While much of the data on this resource is derived from official government records, this resource is not affiliated with or endorsed by any government agency at any level.

-

Not Legal Advice: The information in this project was not compiled or reviewed by an attorney, and does not constitute either legal advice or the opinion of an attorney. If you have questions of law concerning the data in this project, or concerning a local boundary line, you are encouraged to contact an attorney licensed in the appropriate jurisdiction.

-

Not the Product of a Surveyor: The information in this project was not compiled or reviewed by a land surveyor. Any mapping or other data on this resource only shows approximate boundaries, and is not of surveying or engineering quality. If you have questions about the exact location of a boundary, or need to ascertain a boundary, you are encouraged to contact a land surveyor licensed in the appropriate jurisdiction.

-

Copyright and Intellectual Property: The compiler only holds copyright for the format in which the data for this project is presented, and for any original information presented. Certain mapping data is copyrighted by the original data creator, and is used on this site pursuant to licensing agreements. If you believe any portion of this resource violates any copyright or trademark you hold, please contact the compiler immediately. Every effort will be made to evaluate a claim within five (5) business days of receipt.

-

Bandwidth and Data Extraction: Manual and automated extraction of a substantial portion of the content of this site, unless allowed by the robots.txt file, is prohibited. Users who have substantial data needs must use the repositories instead. Users may not use project API keys to remote services, such as base layer mapping, for purposes other than viewing content as presented on this site. In order to keep this information available for free online to the widest possible audience, the compiler reserves the right to restrict access by high-volume users to this site.

-

Governing Law: This resource is governed by the laws of the and the . By using this resource, you agree that the venue of any disputes arising herefrom is .

-

Language: If there are any discrepancies between different languages' versions of these disclaimers, the English-language version shall prevail.

-

Compiler Contact Information:

Email:
Fax:

-

These disclaimers were last updated April 10, 2023.

\ No newline at end of file + +
+

documentationshort ?>

+

+ documentationlong ?> +

+
+ +
+

Compiler Contact Information

+

+
+ Email:
+ Fax: +

+
\ No newline at end of file From 6ec242d218616a8d91f5ec1ba8c158e579b032bd Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Mon, 7 Oct 2024 19:25:11 -0400 Subject: [PATCH 22/31] Move ids in h2 tags to section --- src/app/Views/about/index.php | 6 +++--- src/app/Views/key/start.php | 10 +++++----- src/app/Views/key/table.php | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/app/Views/about/index.php b/src/app/Views/about/index.php index 9868c16..6216dc8 100755 --- a/src/app/Views/about/index.php +++ b/src/app/Views/about/index.php @@ -1,12 +1,12 @@ -
+
keyshort ?>
-
-

keyshort ?>

+
+

keyshort ?>

keylong ?>

+
Date
Name and Abbreviation
-
-

Date

+
+

Date

Many municipal incorporation compilations use Incorporation Date, generally based on the date of the incorporation law, court decree, proclamation, or local government enactment, in relation to events. In contrast, this resource uses Effective Date, which is based on when an event took effect under law. These dates often differ, sometimes by over a year. When statutes provided for a transition period where a government existed as a legal entity for certain purposes but its territory retained its previous government temporarily, the date when this transition period ceased is used. In some cases, the actual effective date may be ambiguous, particularly when based on a clerical action such as filing or recording a document in a particular office. When this occurs, the best possible date is used. For transparency, how an effective date is determined is shown when possible.

Under Event Year(s), this resource separately tracks the years between when a proposed change was initiated and when it either took effect or failed. When no effective date is entered, this year range is often used instead of the effective date. For sorting purposes, an exact sort date is assigned to each event, although the full sort date is only displayed in timelapses mapped in the Government pages.

With three exceptions, dates are recorded using the calendar in effect at the time of the event or source document. For areas under British control, dates before the effective date of the Calendar (New Style) Act 1750 will use the Julian Calendar and will reflect the beginning of the year as March 25. The following exceptions to this rule substitute the Proleptic Gregorian calendar:

@@ -18,8 +18,8 @@
  • Timelapses mapped in the Government pages, which use sort dates.
    • -
    -

    Name and Abbreviation

    +
    +

    Name and Abbreviation

    When possible, abbreviations used in this resource are modeled on the Indigo Book. The names and types of governments are never abbreviated, although articles (e.g., "The") and formulaic portions of the corporate style, such as the "Mayor and Council of," are omitted. In particular, words such as Mount and Saint are spelled out in government names even if primary source documents abbreviate them.

    Some governments may have used different name spelling variants over time. If there is no evidence of a formal name change event and the variance in name spelling is minor, only the modern spelling is used.

    \ No newline at end of file diff --git a/src/app/Views/key/table.php b/src/app/Views/key/table.php index 7d9c281..9324b9a 100755 --- a/src/app/Views/key/table.php +++ b/src/app/Views/key/table.php @@ -2,8 +2,8 @@ $title ??= ''; $type ??= ''; ?> -
    -

    +
    +

    From 1a52e874ed426b41c06220ba3b8e3d7000f74796 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Mon, 7 Oct 2024 19:25:26 -0400 Subject: [PATCH 23/31] Change css for #topheader to apply to h1 --- src/app/Views/core/header.php | 2 +- src/html/asset/css/geohistory.css | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/Views/core/header.php b/src/app/Views/core/header.php index fea8d6e..38ee0e7 100755 --- a/src/app/Views/core/header.php +++ b/src/app/Views/core/header.php @@ -94,5 +94,5 @@ function gtag() {
    > -

    +

    \ No newline at end of file diff --git a/src/html/asset/css/geohistory.css b/src/html/asset/css/geohistory.css index dca2fc6..00da998 100755 --- a/src/html/asset/css/geohistory.css +++ b/src/html/asset/css/geohistory.css @@ -419,7 +419,7 @@ screen and (min-width: 690px) and (max-width: 1019px) { align-items: center; } -#topheader { +h1 { text-align: center; font-size: 175%; } From 9fb1b3a30cd9ced6f045b78cddddf378668b3bf4 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:15:41 -0400 Subject: [PATCH 24/31] DataTables 2.0.8 -> 2.1.8 (with CSS adjustments); MapLibre GL 4.4.1 -> 4.7.1; Maplibre GL Leaflet 0.0.21 -> 0.0.22; PMTiles 3.0.6 -> 3.2.0 --- env/Sample.env | 10 +++++----- src/html/asset/css/geohistory.css | 10 ++++++++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/env/Sample.env b/env/Sample.env index 099a9f1..b4d8210 100644 --- a/env/Sample.env +++ b/env/Sample.env @@ -198,9 +198,9 @@ dependency_classybrew=unpkg.com/classybrew@0.0.3/src dependency_d3=unpkg.com/d3@5.16.0/dist -dependency_datatables=cdn.datatables.net/2.0.8 +dependency_datatables=cdn.datatables.net/2.1.8 -dependency_datatables_license=raw.githubusercontent.com/DataTables/DataTablesSrc/refs/tags/2.0.8/license.txt +dependency_datatables_license=raw.githubusercontent.com/DataTables/DataTablesSrc/refs/tags/2.1.8/license.txt dependency_html_to_image=unpkg.com/html-to-image@1.11.11/dist @@ -210,11 +210,11 @@ dependency_leaflet=unpkg.com/leaflet@1.9.4/dist dependency_leaflet_fullscreen=unpkg.com/leaflet-fullscreen@1.0.2/dist -dependency_maplibre_gl=unpkg.com/maplibre-gl@4.4.1/dist +dependency_maplibre_gl=unpkg.com/maplibre-gl@4.7.1/dist -dependency_maplibre_gl_leaflet=unpkg.com/@maplibre/maplibre-gl-leaflet@0.0.21 +dependency_maplibre_gl_leaflet=unpkg.com/@maplibre/maplibre-gl-leaflet@0.0.22 -dependency_pmtiles=unpkg.com/pmtiles@3.0.6/dist +dependency_pmtiles=unpkg.com/pmtiles@3.2.0/dist dependency_selectize=unpkg.com/selectize@0.12.2/dist diff --git a/src/html/asset/css/geohistory.css b/src/html/asset/css/geohistory.css index 00da998..e46bcef 100755 --- a/src/html/asset/css/geohistory.css +++ b/src/html/asset/css/geohistory.css @@ -181,6 +181,10 @@ header A:hover { display: inline-block; } +div.dt-container div.dt-layout-row { + margin: 0.35em 0 !important; +} + @media screen { .headerfooter { background-color: #003A70; @@ -214,11 +218,13 @@ header A:hover { color: white; } - table.dataTable.stripe > tbody > tr:nth-child(2n+1) > *, table.dataTable.display > tbody > tr:nth-child(2n+1) > * { + table.dataTable.stripe>tbody>tr:nth-child(2n+1)>*, + table.dataTable.display>tbody>tr:nth-child(2n+1)>* { background-color: #EFEFEE !important; } - table.dataTable.stripe > tbody > tr:nth-child(2n) > *, table.dataTable.display > tbody > tr:nth-child(2n) > * { + table.dataTable.stripe>tbody>tr:nth-child(2n)>*, + table.dataTable.display>tbody>tr:nth-child(2n)>* { background-color: #E0DFDD !important; } From f88e9fe5b5be5ae55d1b7508ed8fca1d942255e0 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:31:34 -0400 Subject: [PATCH 25/31] PhpStan 1.12.3 -> 1.12.6; Phpstan-strict-rules 1.6.0 -> 1.6.1; Rector 1.2.5 -> 1.2.6 --- src/composer.json | 6 +-- src/composer.lock | 104 +++++++++++++++++++++++----------------------- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/src/composer.json b/src/composer.json index d10904b..4a44255 100644 --- a/src/composer.json +++ b/src/composer.json @@ -6,9 +6,9 @@ "codeigniter/phpstan-codeigniter": "1.4.3", "friendsofphp/php-cs-fixer": "3.64.0", "phpstan/extension-installer": "1.4.3", - "phpstan/phpstan": "1.12.3", - "phpstan/phpstan-strict-rules": "1.6.0", - "rector/rector": "1.2.5" + "phpstan/phpstan": "1.12.6", + "phpstan/phpstan-strict-rules": "1.6.1", + "rector/rector": "1.2.6" }, "config": { "allow-plugins": { diff --git a/src/composer.lock b/src/composer.lock index b8a45e9..54cd8eb 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4b711120b995b8ec46bf0ffa932314e6", + "content-hash": "96ae6c5ac079e357fddb57a28c86f98c", "packages": [ { "name": "codeigniter4/framework", @@ -413,24 +413,24 @@ }, { "name": "composer/semver", - "version": "3.4.2", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/c51258e759afdb17f1fd1fe83bc12baaef6309d6", - "reference": "c51258e759afdb17f1fd1fe83bc12baaef6309d6", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -474,7 +474,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.2" + "source": "https://github.com/composer/semver/tree/3.4.3" }, "funding": [ { @@ -490,7 +490,7 @@ "type": "tidelift" } ], - "time": "2024-07-12T11:35:52+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "composer/xdebug-handler", @@ -819,16 +819,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.12.3", + "version": "1.12.6", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009" + "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/0fcbf194ab63d8159bb70d9aa3e1350051632009", - "reference": "0fcbf194ab63d8159bb70d9aa3e1350051632009", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/dc4d2f145a88ea7141ae698effd64d9df46527ae", + "reference": "dc4d2f145a88ea7141ae698effd64d9df46527ae", "shasum": "" }, "require": { @@ -873,25 +873,25 @@ "type": "github" } ], - "time": "2024-09-09T08:10:35+00:00" + "time": "2024-10-06T15:03:59+00:00" }, { "name": "phpstan/phpstan-strict-rules", - "version": "1.6.0", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan-strict-rules.git", - "reference": "363f921dd8441777d4fc137deb99beb486c77df1" + "reference": "daeec748b53de80a97498462513066834ec28f8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/363f921dd8441777d4fc137deb99beb486c77df1", - "reference": "363f921dd8441777d4fc137deb99beb486c77df1", + "url": "https://api.github.com/repos/phpstan/phpstan-strict-rules/zipball/daeec748b53de80a97498462513066834ec28f8b", + "reference": "daeec748b53de80a97498462513066834ec28f8b", "shasum": "" }, "require": { "php": "^7.2 || ^8.0", - "phpstan/phpstan": "^1.11" + "phpstan/phpstan": "^1.12.4" }, "require-dev": { "nikic/php-parser": "^4.13.0", @@ -920,9 +920,9 @@ "description": "Extra strict and opinionated rules for PHPStan", "support": { "issues": "https://github.com/phpstan/phpstan-strict-rules/issues", - "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.6.0" + "source": "https://github.com/phpstan/phpstan-strict-rules/tree/1.6.1" }, - "time": "2024-04-20T06:37:51+00:00" + "time": "2024-09-20T14:04:44+00:00" }, { "name": "psr/container", @@ -1559,21 +1559,21 @@ }, { "name": "rector/rector", - "version": "1.2.5", + "version": "1.2.6", "source": { "type": "git", "url": "https://github.com/rectorphp/rector.git", - "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339" + "reference": "6ca85da28159dbd3bb36211c5104b7bc91278e99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rectorphp/rector/zipball/e98aa793ca3fcd17e893cfaf9103ac049775d339", - "reference": "e98aa793ca3fcd17e893cfaf9103ac049775d339", + "url": "https://api.github.com/repos/rectorphp/rector/zipball/6ca85da28159dbd3bb36211c5104b7bc91278e99", + "reference": "6ca85da28159dbd3bb36211c5104b7bc91278e99", "shasum": "" }, "require": { "php": "^7.2|^8.0", - "phpstan/phpstan": "^1.12.2" + "phpstan/phpstan": "^1.12.5" }, "conflict": { "rector/rector-doctrine": "*", @@ -1606,7 +1606,7 @@ ], "support": { "issues": "https://github.com/rectorphp/rector/issues", - "source": "https://github.com/rectorphp/rector/tree/1.2.5" + "source": "https://github.com/rectorphp/rector/tree/1.2.6" }, "funding": [ { @@ -1614,7 +1614,7 @@ "type": "github" } ], - "time": "2024-09-08T17:43:24+00:00" + "time": "2024-10-03T08:56:44+00:00" }, { "name": "sebastian/diff", @@ -1685,16 +1685,16 @@ }, { "name": "symfony/console", - "version": "v7.1.4", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111" + "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/1eed7af6961d763e7832e874d7f9b21c3ea9c111", - "reference": "1eed7af6961d763e7832e874d7f9b21c3ea9c111", + "url": "https://api.github.com/repos/symfony/console/zipball/0fa539d12b3ccf068a722bbbffa07ca7079af9ee", + "reference": "0fa539d12b3ccf068a722bbbffa07ca7079af9ee", "shasum": "" }, "require": { @@ -1758,7 +1758,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.1.4" + "source": "https://github.com/symfony/console/tree/v7.1.5" }, "funding": [ { @@ -1774,7 +1774,7 @@ "type": "tidelift" } ], - "time": "2024-08-15T22:48:53+00:00" + "time": "2024-09-20T08:28:38+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2001,16 +2001,16 @@ }, { "name": "symfony/filesystem", - "version": "v7.1.2", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "92a91985250c251de9b947a14bb2c9390b1a562c" + "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/92a91985250c251de9b947a14bb2c9390b1a562c", - "reference": "92a91985250c251de9b947a14bb2c9390b1a562c", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/61fe0566189bf32e8cfee78335d8776f64a66f5a", + "reference": "61fe0566189bf32e8cfee78335d8776f64a66f5a", "shasum": "" }, "require": { @@ -2047,7 +2047,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.1.2" + "source": "https://github.com/symfony/filesystem/tree/v7.1.5" }, "funding": [ { @@ -2063,7 +2063,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T10:03:55+00:00" + "time": "2024-09-17T09:16:35+00:00" }, { "name": "symfony/finder", @@ -2672,16 +2672,16 @@ }, { "name": "symfony/process", - "version": "v7.1.3", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca" + "reference": "5c03ee6369281177f07f7c68252a280beccba847" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7f2f542c668ad6c313dc4a5e9c3321f733197eca", - "reference": "7f2f542c668ad6c313dc4a5e9c3321f733197eca", + "url": "https://api.github.com/repos/symfony/process/zipball/5c03ee6369281177f07f7c68252a280beccba847", + "reference": "5c03ee6369281177f07f7c68252a280beccba847", "shasum": "" }, "require": { @@ -2713,7 +2713,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.1.3" + "source": "https://github.com/symfony/process/tree/v7.1.5" }, "funding": [ { @@ -2729,7 +2729,7 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:44:47+00:00" + "time": "2024-09-19T21:48:23+00:00" }, { "name": "symfony/service-contracts", @@ -2878,16 +2878,16 @@ }, { "name": "symfony/string", - "version": "v7.1.4", + "version": "v7.1.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b" + "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/6cd670a6d968eaeb1c77c2e76091c45c56bc367b", - "reference": "6cd670a6d968eaeb1c77c2e76091c45c56bc367b", + "url": "https://api.github.com/repos/symfony/string/zipball/d66f9c343fa894ec2037cc928381df90a7ad4306", + "reference": "d66f9c343fa894ec2037cc928381df90a7ad4306", "shasum": "" }, "require": { @@ -2945,7 +2945,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.1.4" + "source": "https://github.com/symfony/string/tree/v7.1.5" }, "funding": [ { @@ -2961,7 +2961,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T09:59:40+00:00" + "time": "2024-09-20T08:28:38+00:00" } ], "aliases": [], From cf86992bad696cbe3e340e6df61c187d8e5a274c Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:31:49 -0400 Subject: [PATCH 26/31] PhpStan fixes --- src/app/Views/disclaimer/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/Views/disclaimer/index.php b/src/app/Views/disclaimer/index.php index a8e7aba..669d6f2 100755 --- a/src/app/Views/disclaimer/index.php +++ b/src/app/Views/disclaimer/index.php @@ -1,3 +1,4 @@ +

    documentationshort ?>

    From 97afc543f234bd490ad822c4d372072371f96133 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Tue, 8 Oct 2024 22:54:37 -0400 Subject: [PATCH 27/31] Bump database version; Extend geohistory.documentation.documentationshort; Remove comments from geohistory.recording.recordingrepositoryitemfrom & recordingrepositoryitemto; Change logic to extra.governmentindigobook(integer); Add hassource to extra.governmentsourceextra[cache]; Add extra.recordingextra[cache] --- inpostgis/postgresql_public_backup.sql | 374 ++++++++++++++----------- 1 file changed, 207 insertions(+), 167 deletions(-) diff --git a/inpostgis/postgresql_public_backup.sql b/inpostgis/postgresql_public_backup.sql index e0a1cf6..5dfb90a 100644 --- a/inpostgis/postgresql_public_backup.sql +++ b/inpostgis/postgresql_public_backup.sql @@ -2,8 +2,8 @@ -- PostgreSQL database dump -- --- Dumped from database version 16.4 (Debian 16.4-1.pgdg110+1) --- Dumped by pg_dump version 16.4 (Ubuntu 16.4-1.pgdg22.04+1) +-- Dumped from database version 16.4 (Debian 16.4-1.pgdg110+2) +-- Dumped by pg_dump version 16.4 (Ubuntu 16.4-0ubuntu0.24.04.2) SET statement_timeout = 0; SET lock_timeout = 0; @@ -311,12 +311,13 @@ CREATE FUNCTION extra.governmentindigobook(integer) RETURNS text LANGUAGE sql STABLE AS $_$ SELECT CASE - WHEN governmentindigobook = '' THEN governmentabbreviation || '.' - ELSE - governmentindigobook END AS governmentindigobook + WHEN governmentindigobook = '' AND governmentabbreviation <> '' THEN governmentabbreviation || '.' + WHEN governmentindigobook = '' THEN governmentname || '.' + ELSE governmentindigobook + END AS governmentindigobook FROM geohistory.government WHERE governmentid = $1; - $_$; +$_$; ALTER FUNCTION extra.governmentindigobook(integer) OWNER TO postgres; @@ -1353,6 +1354,8 @@ RAISE INFO '%', clock_timestamp(); REFRESH MATERIALIZED VIEW extra.lawsectionextracache; RAISE INFO '%', clock_timestamp(); REFRESH MATERIALIZED VIEW extra.metesdescriptionextracache; +RAISE INFO '%', clock_timestamp(); + REFRESH MATERIALIZED VIEW extra.recordingextracache; RAISE INFO '%', clock_timestamp(); REFRESH MATERIALIZED VIEW extra.sourcecitationextracache; RAISE INFO '%', clock_timestamp(); @@ -4666,10 +4669,10 @@ CREATE VIEW extra.governmentsourceextra AS CASE WHEN ((governmentsource.governmentsourcevolume)::text <> ''::text) THEN ('-v'::text || (governmentsource.governmentsourcevolume)::text) ELSE ''::text - END) || '-'::text) || extra.rangefix((governmentsource.governmentsourcepagefrom)::text, (governmentsource.governmentsourcepageto)::text)), '[\s\-\.\/''\(\);:,&"#§\?\[\]]+'::text, '-'::text, 'g'::text)), '-'::text) AS governmentsourcepartslug + END) || '-'::text) || extra.rangefix((governmentsource.governmentsourcepagefrom)::text, (governmentsource.governmentsourcepageto)::text)), '[\s\-\.\/''\(\);:,&"#§\?\[\]]+'::text, '-'::text, 'g'::text)), '-'::text) AS governmentsourcepartslug, + (governmentsource.source IS NOT NULL) AS hassource FROM (geohistory.governmentsource JOIN extra.governmentextra ON ((governmentsource.government = governmentextra.governmentid))) - WHERE (governmentsource.source IS NOT NULL) ), governmentsourceslugcounts AS ( SELECT count(*) AS rowct, governmentsourceslugs_1.governmentsourcepartslug @@ -4681,7 +4684,8 @@ CREATE VIEW extra.governmentsourceextra AS CASE WHEN (governmentsourceslugcounts.rowct > 1) THEN ('-'::text || rank() OVER (PARTITION BY governmentsourceslugcounts.governmentsourcepartslug ORDER BY governmentsourceslugs.governmentsourceid)) ELSE ''::text - END) AS governmentsourceslug + END) AS governmentsourceslug, + governmentsourceslugs.hassource FROM (governmentsourceslugs JOIN governmentsourceslugcounts ON ((governmentsourceslugs.governmentsourcepartslug = governmentsourceslugcounts.governmentsourcepartslug))) ORDER BY governmentsourceslugs.governmentsourceid; @@ -4695,7 +4699,8 @@ ALTER VIEW extra.governmentsourceextra OWNER TO postgres; CREATE MATERIALIZED VIEW extra.governmentsourceextracache AS SELECT governmentsourceid, - governmentsourceslug + governmentsourceslug, + hassource FROM extra.governmentsourceextra WITH NO DATA; @@ -4882,6 +4887,155 @@ CREATE MATERIALIZED VIEW extra.metesdescriptionextracache AS ALTER MATERIALIZED VIEW extra.metesdescriptionextracache OWNER TO postgres; +-- +-- Name: recording; Type: TABLE; Schema: geohistory; Owner: postgres +-- + +CREATE TABLE geohistory.recording ( + recordingid integer NOT NULL, + recordingoffice integer NOT NULL, + recordingvolume character varying(50) DEFAULT ''::character varying NOT NULL, + recordingpage bigint, + recordingpagetext character varying(25) DEFAULT ''::character varying NOT NULL, + recordingdescription text DEFAULT ''::character varying NOT NULL, + recordingdate calendar.historicdatetext DEFAULT (''::text)::calendar.historicdatetext NOT NULL, + recordingrepositorylevel integer, + recordingrepositoryshort character varying(30) DEFAULT ''::text NOT NULL, + recordingrepositoryitemnumber character varying(10) DEFAULT ''::text NOT NULL, + recordingrepositoryitemfrom integer, + recordingrepositoryitemto integer, + recordingrepositoryitemlocation character varying(25) DEFAULT ''::character varying NOT NULL, + recordingrepositoryextractdate calendar.historicdatetext DEFAULT (''::text)::calendar.historicdatetext NOT NULL, + recordingrepositoryorder smallint, + recordingrepositoryentry character varying(75) DEFAULT ''::text NOT NULL, + recordingisrelevant character varying(1) DEFAULT ''::character varying NOT NULL, + recordingobtainedcopy character varying(1) DEFAULT ''::character varying NOT NULL, + recordingtype integer, + recordingnumbertype integer, + recordingnumber bigint, + recordingnumbertext character varying(25) DEFAULT ''::character varying NOT NULL, + recordingvolumeofficerinitials character varying(10) DEFAULT ''::character varying NOT NULL, + recordingrepositoryseries character varying(50) DEFAULT ''::character varying NOT NULL, + recordingrepositorycontainer character varying(50) DEFAULT ''::character varying NOT NULL +); + + +ALTER TABLE geohistory.recording OWNER TO postgres; + +-- +-- Name: COLUMN recording.recordingdescription; Type: COMMENT; Schema: geohistory; Owner: postgres +-- + +COMMENT ON COLUMN geohistory.recording.recordingdescription IS 'This field is used for internal tracking purposes, and is not included in open data.'; + + +-- +-- Name: COLUMN recording.recordingrepositoryshort; Type: COMMENT; Schema: geohistory; Owner: postgres +-- + +COMMENT ON COLUMN geohistory.recording.recordingrepositoryshort IS 'Conform with new abbreviations as of 2018-01-31'; + + +-- +-- Name: COLUMN recording.recordingisrelevant; Type: COMMENT; Schema: geohistory; Owner: postgres +-- + +COMMENT ON COLUMN geohistory.recording.recordingisrelevant IS 'This field is used for internal tracking purposes, and is not included in open data.'; + + +-- +-- Name: COLUMN recording.recordingobtainedcopy; Type: COMMENT; Schema: geohistory; Owner: postgres +-- + +COMMENT ON COLUMN geohistory.recording.recordingobtainedcopy IS 'This field is used for internal tracking purposes, and is not included in open data.'; + + +-- +-- Name: recordingoffice; Type: TABLE; Schema: geohistory; Owner: postgres +-- + +CREATE TABLE geohistory.recordingoffice ( + recordingofficeid integer NOT NULL, + government integer NOT NULL, + recordingofficetype integer NOT NULL, + recordingofficedistrictcircuit character varying(2) DEFAULT ''::character varying NOT NULL +); + + +ALTER TABLE geohistory.recordingoffice OWNER TO postgres; + +-- +-- Name: recordingofficetype; Type: TABLE; Schema: geohistory; Owner: postgres +-- + +CREATE TABLE geohistory.recordingofficetype ( + recordingofficetypeid integer NOT NULL, + recordingofficetypelevel integer NOT NULL, + recordingofficetypeshort character varying(25) DEFAULT ''::character varying NOT NULL, + recordingofficetypelong text NOT NULL, + recordingofficetypedivision character varying(50) DEFAULT ''::character varying NOT NULL, + recordingofficetypeisaftergovernment boolean DEFAULT false NOT NULL, + abbreviationverified boolean DEFAULT false NOT NULL, + CONSTRAINT recordingofficetype_check CHECK ((recordingofficetypelong <> ''::text)) +); + + +ALTER TABLE geohistory.recordingofficetype OWNER TO postgres; + +-- +-- Name: recordingtype; Type: TABLE; Schema: geohistory; Owner: postgres +-- + +CREATE TABLE geohistory.recordingtype ( + recordingtypeid integer NOT NULL, + recordingtypetype character varying(20) DEFAULT 'Book'::text NOT NULL, + recordingtypeabbreviation character varying(45) NOT NULL, + recordingtypelong character varying(45) NOT NULL, + recordingtypeshort character varying(25) NOT NULL, + recordingtypevolumetype character varying(15) DEFAULT 'Volume'::text NOT NULL, + recordingtypepagetype character varying(10) DEFAULT 'Page'::text NOT NULL, + recordingisnumber boolean DEFAULT false NOT NULL, + CONSTRAINT recordingtype_check CHECK ((((recordingtypeabbreviation)::text <> ''::text) AND ((recordingtypelong)::text <> ''::text) AND ((recordingtypeshort)::text <> ''::text))) +); + + +ALTER TABLE geohistory.recordingtype OWNER TO postgres; + +-- +-- Name: recordingextra; Type: VIEW; Schema: extra; Owner: postgres +-- + +CREATE VIEW extra.recordingextra AS + SELECT recording.recordingid, + lower(regexp_replace(regexp_replace(regexp_replace(replace((((( + CASE + WHEN (recording.recordingtype IS NOT NULL) THEN ((((((((((recordingtype.recordingtypelong)::text || '-'::text) || (recordingtype.recordingtypetype)::text) || '-'::text) || (recording.recordingvolume)::text) || '-'::text) || (recording.recordingvolumeofficerinitials)::text) || '-'::text) || COALESCE((recording.recordingpage)::text, ''::text)) || (recording.recordingpagetext)::text) + WHEN (recording.recordingnumbertype IS NOT NULL) THEN ((((((recordingnumbertype.recordingtypelong)::text || '-'::text) || (recordingnumbertype.recordingtypetype)::text) || '-'::text) || COALESCE((recording.recordingnumber)::text, ''::text)) || (recording.recordingnumbertext)::text) + ELSE ''::text + END || '-of-'::text) || "left"((recording.recordingdate)::text, 4)) || '-'::text) || recording.recordingid), ', '::text, ' '::text), '[ \/'',"]'::text, '-'::text, 'g'::text), '[\-]+'::text, '-'::text, 'g'::text), '[\(\)\?\.\[\]]'::text, ''::text, 'g'::text)) AS recordingslug + FROM ((((geohistory.recording + LEFT JOIN geohistory.recordingoffice ON ((recording.recordingoffice = recordingoffice.recordingofficeid))) + LEFT JOIN geohistory.recordingofficetype ON ((recordingoffice.recordingofficetype = recordingofficetype.recordingofficetypeid))) + LEFT JOIN geohistory.recordingtype ON ((recording.recordingtype = recordingtype.recordingtypeid))) + LEFT JOIN geohistory.recordingtype recordingnumbertype ON ((recording.recordingnumbertype = recordingnumbertype.recordingtypeid))) + ORDER BY recording.recordingid; + + +ALTER VIEW extra.recordingextra OWNER TO postgres; + +-- +-- Name: recordingextracache; Type: MATERIALIZED VIEW; Schema: extra; Owner: postgres +-- + +CREATE MATERIALIZED VIEW extra.recordingextracache AS + SELECT recordingid, + recordingslug + FROM extra.recordingextra + WITH NO DATA; + + +ALTER MATERIALIZED VIEW extra.recordingextracache OWNER TO postgres; + -- -- Name: sourcecitation; Type: TABLE; Schema: geohistory; Owner: postgres -- @@ -6091,83 +6245,6 @@ COMMENT ON COLUMN geohistory.researchlogtype.researchlogtypelongpart IS 'This fi COMMENT ON COLUMN geohistory.researchlogtype.researchlogtypeisrecord IS 'Rows with FALSE values are used for internal tracking purposes, and are not included in open data.'; --- --- Name: recording; Type: TABLE; Schema: geohistory; Owner: postgres --- - -CREATE TABLE geohistory.recording ( - recordingid integer NOT NULL, - recordingoffice integer NOT NULL, - recordingvolume character varying(50) DEFAULT ''::character varying NOT NULL, - recordingpage bigint, - recordingpagetext character varying(25) DEFAULT ''::character varying NOT NULL, - recordingdescription text DEFAULT ''::character varying NOT NULL, - recordingdate calendar.historicdatetext DEFAULT (''::text)::calendar.historicdatetext NOT NULL, - recordingrepositorylevel integer, - recordingrepositoryshort character varying(30) DEFAULT ''::text NOT NULL, - recordingrepositoryitemnumber character varying(10) DEFAULT ''::text NOT NULL, - recordingrepositoryitemfrom integer, - recordingrepositoryitemto integer, - recordingrepositoryitemlocation character varying(25) DEFAULT ''::character varying NOT NULL, - recordingrepositoryextractdate calendar.historicdatetext DEFAULT (''::text)::calendar.historicdatetext NOT NULL, - recordingrepositoryorder smallint, - recordingrepositoryentry character varying(75) DEFAULT ''::text NOT NULL, - recordingisrelevant character varying(1) DEFAULT ''::character varying NOT NULL, - recordingobtainedcopy character varying(1) DEFAULT ''::character varying NOT NULL, - recordingtype integer, - recordingnumbertype integer, - recordingnumber bigint, - recordingnumbertext character varying(25) DEFAULT ''::character varying NOT NULL, - recordingvolumeofficerinitials character varying(10) DEFAULT ''::character varying NOT NULL, - recordingrepositoryseries character varying(50) DEFAULT ''::character varying NOT NULL, - recordingrepositorycontainer character varying(50) DEFAULT ''::character varying NOT NULL -); - - -ALTER TABLE geohistory.recording OWNER TO postgres; - --- --- Name: COLUMN recording.recordingdescription; Type: COMMENT; Schema: geohistory; Owner: postgres --- - -COMMENT ON COLUMN geohistory.recording.recordingdescription IS 'This field is used for internal tracking purposes, and is not included in open data.'; - - --- --- Name: COLUMN recording.recordingrepositoryshort; Type: COMMENT; Schema: geohistory; Owner: postgres --- - -COMMENT ON COLUMN geohistory.recording.recordingrepositoryshort IS 'Conform with new abbreviations as of 2018-01-31'; - - --- --- Name: COLUMN recording.recordingrepositoryitemfrom; Type: COMMENT; Schema: geohistory; Owner: postgres --- - -COMMENT ON COLUMN geohistory.recording.recordingrepositoryitemfrom IS 'For instances where this field is used for internal tracking purposes, particular values may be omitted in open data.'; - - --- --- Name: COLUMN recording.recordingrepositoryitemto; Type: COMMENT; Schema: geohistory; Owner: postgres --- - -COMMENT ON COLUMN geohistory.recording.recordingrepositoryitemto IS 'For instances where this field is used for internal tracking purposes, particular values may be omitted in open data.'; - - --- --- Name: COLUMN recording.recordingisrelevant; Type: COMMENT; Schema: geohistory; Owner: postgres --- - -COMMENT ON COLUMN geohistory.recording.recordingisrelevant IS 'This field is used for internal tracking purposes, and is not included in open data.'; - - --- --- Name: COLUMN recording.recordingobtainedcopy; Type: COMMENT; Schema: geohistory; Owner: postgres --- - -COMMENT ON COLUMN geohistory.recording.recordingobtainedcopy IS 'This field is used for internal tracking purposes, and is not included in open data.'; - - -- -- Name: recordingevent; Type: TABLE; Schema: geohistory; Owner: postgres -- @@ -6184,39 +6261,6 @@ CREATE TABLE geohistory.recordingevent ( ALTER TABLE geohistory.recordingevent OWNER TO postgres; --- --- Name: recordingoffice; Type: TABLE; Schema: geohistory; Owner: postgres --- - -CREATE TABLE geohistory.recordingoffice ( - recordingofficeid integer NOT NULL, - government integer NOT NULL, - recordingofficetype integer NOT NULL, - recordingofficedistrictcircuit character varying(2) DEFAULT ''::character varying NOT NULL -); - - -ALTER TABLE geohistory.recordingoffice OWNER TO postgres; - --- --- Name: recordingtype; Type: TABLE; Schema: geohistory; Owner: postgres --- - -CREATE TABLE geohistory.recordingtype ( - recordingtypeid integer NOT NULL, - recordingtypetype character varying(20) DEFAULT 'Book'::text NOT NULL, - recordingtypeabbreviation character varying(45) NOT NULL, - recordingtypelong character varying(45) NOT NULL, - recordingtypeshort character varying(25) NOT NULL, - recordingtypevolumetype character varying(15) DEFAULT 'Volume'::text NOT NULL, - recordingtypepagetype character varying(10) DEFAULT 'Page'::text NOT NULL, - recordingisnumber boolean DEFAULT false NOT NULL, - CONSTRAINT recordingtype_check CHECK ((((recordingtypeabbreviation)::text <> ''::text) AND ((recordingtypelong)::text <> ''::text) AND ((recordingtypeshort)::text <> ''::text))) -); - - -ALTER TABLE geohistory.recordingtype OWNER TO postgres; - -- -- Name: sourcecitationnote; Type: TABLE; Schema: geohistory; Owner: postgres -- @@ -6694,7 +6738,7 @@ ALTER SEQUENCE geohistory.currentgovernment_currentgovernmentid_seq OWNED BY geo CREATE TABLE geohistory.documentation ( documentationid integer NOT NULL, documentationtype character varying(30) NOT NULL, - documentationshort character varying(15) NOT NULL, + documentationshort character varying(50) NOT NULL, documentationlong text NOT NULL, documentationcolor character varying(40) DEFAULT ''::character varying NOT NULL, documentationlocale character varying(2) DEFAULT 'en'::character varying NOT NULL, @@ -8028,24 +8072,6 @@ ALTER SEQUENCE geohistory.recordingoffice_recordingofficeid_seq OWNER TO postgre ALTER SEQUENCE geohistory.recordingoffice_recordingofficeid_seq OWNED BY geohistory.recordingoffice.recordingofficeid; --- --- Name: recordingofficetype; Type: TABLE; Schema: geohistory; Owner: postgres --- - -CREATE TABLE geohistory.recordingofficetype ( - recordingofficetypeid integer NOT NULL, - recordingofficetypelevel integer NOT NULL, - recordingofficetypeshort character varying(25) DEFAULT ''::character varying NOT NULL, - recordingofficetypelong text NOT NULL, - recordingofficetypedivision character varying(50) DEFAULT ''::character varying NOT NULL, - recordingofficetypeisaftergovernment boolean DEFAULT false NOT NULL, - abbreviationverified boolean DEFAULT false NOT NULL, - CONSTRAINT recordingofficetype_check CHECK ((recordingofficetypelong <> ''::text)) -); - - -ALTER TABLE geohistory.recordingofficetype OWNER TO postgres; - -- -- Name: recordingofficetype_recordingofficetypeid_seq; Type: SEQUENCE; Schema: geohistory; Owner: postgres -- @@ -13219,6 +13245,48 @@ GRANT SELECT ON TABLE extra.metesdescriptionextra TO readonly; GRANT SELECT ON TABLE extra.metesdescriptionextracache TO readonly; +-- +-- Name: TABLE recording; Type: ACL; Schema: geohistory; Owner: postgres +-- + +GRANT SELECT ON TABLE geohistory.recording TO readonly; + + +-- +-- Name: TABLE recordingoffice; Type: ACL; Schema: geohistory; Owner: postgres +-- + +GRANT SELECT ON TABLE geohistory.recordingoffice TO readonly; + + +-- +-- Name: TABLE recordingofficetype; Type: ACL; Schema: geohistory; Owner: postgres +-- + +GRANT SELECT ON TABLE geohistory.recordingofficetype TO readonly; + + +-- +-- Name: TABLE recordingtype; Type: ACL; Schema: geohistory; Owner: postgres +-- + +GRANT SELECT ON TABLE geohistory.recordingtype TO readonly; + + +-- +-- Name: TABLE recordingextra; Type: ACL; Schema: extra; Owner: postgres +-- + +GRANT SELECT ON TABLE extra.recordingextra TO readonly; + + +-- +-- Name: TABLE recordingextracache; Type: ACL; Schema: extra; Owner: postgres +-- + +GRANT SELECT ON TABLE extra.recordingextracache TO readonly; + + -- -- Name: TABLE sourcecitation; Type: ACL; Schema: geohistory; Owner: postgres -- @@ -13338,13 +13406,6 @@ GRANT SELECT ON TABLE geohistory.researchlog TO readonly; GRANT SELECT ON TABLE geohistory.researchlogtype TO readonly; --- --- Name: TABLE recording; Type: ACL; Schema: geohistory; Owner: postgres --- - -GRANT SELECT ON TABLE geohistory.recording TO readonly; - - -- -- Name: TABLE recordingevent; Type: ACL; Schema: geohistory; Owner: postgres -- @@ -13352,20 +13413,6 @@ GRANT SELECT ON TABLE geohistory.recording TO readonly; GRANT SELECT ON TABLE geohistory.recordingevent TO readonly; --- --- Name: TABLE recordingoffice; Type: ACL; Schema: geohistory; Owner: postgres --- - -GRANT SELECT ON TABLE geohistory.recordingoffice TO readonly; - - --- --- Name: TABLE recordingtype; Type: ACL; Schema: geohistory; Owner: postgres --- - -GRANT SELECT ON TABLE geohistory.recordingtype TO readonly; - - -- -- Name: TABLE sourcecitationnote; Type: ACL; Schema: geohistory; Owner: postgres -- @@ -13534,13 +13581,6 @@ GRANT SELECT ON TABLE geohistory.plssspecialsurvey TO readonly; GRANT SELECT ON TABLE geohistory.plsstownship TO readonly; --- --- Name: TABLE recordingofficetype; Type: ACL; Schema: geohistory; Owner: postgres --- - -GRANT SELECT ON TABLE geohistory.recordingofficetype TO readonly; - - -- -- Name: TABLE shorttype; Type: ACL; Schema: geohistory; Owner: postgres -- From 69274a471f3a4b0c194a31529e6ae1e19b1ddca8 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:08:41 -0400 Subject: [PATCH 28/31] Update CodeIgniter license --- license/CodeIgniter.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/license/CodeIgniter.txt b/license/CodeIgniter.txt index 0119e5f..148e7f7 100644 --- a/license/CodeIgniter.txt +++ b/license/CodeIgniter.txt @@ -1,7 +1,7 @@ The MIT License (MIT) Copyright (c) 2014-2019 British Columbia Institute of Technology -Copyright (c) 2019-2023 CodeIgniter Foundation +Copyright (c) 2019-2024 CodeIgniter Foundation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From c17e78c188ad760b8eb80059cf9d0f7b1cf745ee Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Tue, 8 Oct 2024 23:48:19 -0400 Subject: [PATCH 29/31] Add changelog entries for 2.1.0 --- CHANGELOG.md | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 10584be..89ac157 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,49 @@ # Changelog +## [2.1.0] - 2024-10-08 + +### Added + +- Database column hassource to views extra.governmentsourceextra and extra.governmentsourceextracache. +- Database column plsstownshipname to geohistory.plsstownship. +- Database views extra.recordingextra and extra.recordingextracache. +- Functionality to accommodate changes to related private repositories. +- Google Analytics support. + +### Changed + +- CodeIgniter from 4.5.2 to 4.5.5. +- Controller properties and view calls to remove $this->data array; pass model results directly in more situations. +- CSS and HTML tag id references. +- Database column documentationshort in geohistory.documentation to lengthen field. +- Database extract pg_dump and OS versions. +- Database function extra.governmentindigobook(integer) to cover additional scenarios. +- DataTables from 2.0.8 to 2.1.8. +- Dockerfile to accommodate changes to related private repositories. +- Dockerfiles to remove globs and reconfigure folder structure for environment-specific files. +- MapLibre GL JS from 4.4.1 to 4.7.1. +- MapLibre GL Leaflet from 0.0.21 to 0.0.22. +- PHP CS Fixer from 3.59.3 to 3.64.0. +- PHP docker image from 8.2.11-apache to php:8.3.11-apache. +- PHPStan Extension Installer from 1.4.1 to 1.4.3. +- PHPStan from 1.11.5 to 1.12.6. +- PHPStan Strict Rules from 1.6.0 to 1.6.1. +- PMTiles from 3.0.6 to 3.2.0. +- README to update installation instructions to accommodate Ubuntu 24.04 LTS. +- Rector from 1.1.0 to 1.2.6. + +### Fixed + +- App\Filters\LanguageRedirect to accommodate classes without a getLocale method. +- Functionality to accommodate changes to related private repositories. +- GovernmentModel->getAbbreviationid(string) to force uppercase comparison and output proper response column. + +### Removed + +- Database extract exclusion warnings from comments for columns recordingrepositoryitemfrom and recordingrepositoryitemto in geohistory.recording. +- Disclaimer text and venue environmental variables from repository (to be stored in Open Data repository). +- PHPStan review of certain development directories. + ## [2.0.2] - 2024-06-20 ### Changed @@ -273,6 +317,7 @@ - Public release of the Local Geohistory Project: Application repository. +[2.1.0]: https://github.com/localgeohistoryproject/application/compare/v2.0.2...v2.1.0 [2.0.2]: https://github.com/localgeohistoryproject/application/compare/v2.0.1...v2.0.2 [2.0.1]: https://github.com/localgeohistoryproject/application/compare/v2.0.0...v2.0.1 [2.0.0]: https://github.com/localgeohistoryproject/application/compare/v1.2.2...v2.0.0 From b240daf582520b1686f632d7cf541066151c4f4e Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Wed, 9 Oct 2024 00:23:45 -0400 Subject: [PATCH 30/31] Changelog: Bump release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89ac157..69c33be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [2.1.0] - 2024-10-08 +## [2.1.0] - 2024-10-09 ### Added From 0edd7a2adbf6206191ffbdc32e97eb60e82c2e86 Mon Sep 17 00:00:00 2001 From: "Mark A. Connelly" <16519297+markconnellypro@users.noreply.github.com> Date: Wed, 9 Oct 2024 00:33:58 -0400 Subject: [PATCH 31/31] README: remove other OS warning --- CHANGELOG.md | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 69c33be..482c34d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,7 @@ - PHPStan from 1.11.5 to 1.12.6. - PHPStan Strict Rules from 1.6.0 to 1.6.1. - PMTiles from 3.0.6 to 3.2.0. -- README to update installation instructions to accommodate Ubuntu 24.04 LTS. +- README to update installation instructions to accommodate Ubuntu 24.04 LTS, and remove other OS warning. - Rector from 1.1.0 to 1.2.6. ### Fixed diff --git a/README.md b/README.md index 76ef565..cb82867 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ The application uses symbolic links to propagate the .env file to 2 other locati src/.env ``` -The application also contains 2 Dockerfiles, one in **docker/php** and one in **docker/postgis**, which may need to be modified in other operating systems where COPY statements will fail if the file does not exist. In these situations, uncomment the line starting with **COPY** that is immediately below the line starting with **# OTHER OPERATING SYSTEMS** by removing **#** from the beginning of the line, and then go to the following **COPY** line and add **#** to the beginning of the line to comment it out. +The application also contains 2 Dockerfiles, one in **docker/php** and one in **docker/postgis**. ### Copy data files into the inpostgis folder