From 34206ce9c931f2e819b7be2a200cf76a660b88c1 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 19 Sep 2024 17:03:24 -0400 Subject: [PATCH 001/173] #47: Add symfony framework structure and remove phpcas. Generated with composer create-project symfony/skeleton:"6.4.*" catalog-symfony then manually merged into the application directory. --- .env | 20 + .gitignore | 10 + bin/console | 21 + composer.json | 60 +- composer.lock | 2451 ++++++++++++++++++++++++--- config/bundles.php | 5 + config/packages/cache.yaml | 19 + config/packages/framework.yaml | 24 + config/packages/http_discovery.yaml | 10 + config/packages/routing.yaml | 12 + config/preload.php | 5 + config/routes.yaml | 5 + config/routes/framework.yaml | 4 + config/services.yaml | 24 + public/index.php | 9 + src/Controller/.gitignore | 0 src/Kernel.php | 11 + symfony.lock | 79 + 18 files changed, 2510 insertions(+), 259 deletions(-) create mode 100644 .env create mode 100644 bin/console create mode 100644 config/bundles.php create mode 100644 config/packages/cache.yaml create mode 100644 config/packages/framework.yaml create mode 100644 config/packages/http_discovery.yaml create mode 100644 config/packages/routing.yaml create mode 100644 config/preload.php create mode 100644 config/routes.yaml create mode 100644 config/routes/framework.yaml create mode 100644 config/services.yaml create mode 100644 public/index.php create mode 100644 src/Controller/.gitignore create mode 100644 src/Kernel.php create mode 100644 symfony.lock diff --git a/.env b/.env new file mode 100644 index 00000000..eb5b0b14 --- /dev/null +++ b/.env @@ -0,0 +1,20 @@ +# In all environments, the following files are loaded if they exist, +# the latter taking precedence over the former: +# +# * .env contains default values for the environment variables needed by the app +# * .env.local uncommitted file with local overrides +# * .env.$APP_ENV committed environment-specific defaults +# * .env.$APP_ENV.local uncommitted environment-specific overrides +# +# Real environment variables win over .env files. +# +# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES. +# https://symfony.com/doc/current/configuration/secrets.html +# +# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2). +# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration + +###> symfony/framework-bundle ### +APP_ENV=dev +APP_SECRET=af0c5e8cb62edd2dd690260da18618a2 +###< symfony/framework-bundle ### diff --git a/.gitignore b/.gitignore index 1ac4c29f..92027b3a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,13 @@ progress.txt vendor/ .phpunit.result.cache .php-cs-fixer.cache + +###> symfony/framework-bundle ### +/.env.local +/.env.local.php +/.env.*.local +/config/secrets/prod/prod.decrypt.private.php +/public/bundles/ +/var/ +/vendor/ +###< symfony/framework-bundle ### diff --git a/bin/console b/bin/console new file mode 100644 index 00000000..d8d530e2 --- /dev/null +++ b/bin/console @@ -0,0 +1,21 @@ +#!/usr/bin/env php +=8.1", + "ext-ctype": "*", + "ext-iconv": "*", "onelogin/php-saml": "^4.2", - "microsoft/microsoft-graph": "^2.12" + "microsoft/microsoft-graph": "^2.12", + "symfony/console": "6.4.*", + "symfony/dotenv": "6.4.*", + "symfony/flex": "^2", + "symfony/framework-bundle": "6.4.*", + "symfony/runtime": "6.4.*", + "symfony/yaml": "6.4.*" + }, + "require-dev": { }, "config": { "allow-plugins": { - "php-http/discovery": true + "php-http/discovery": true, + "symfony/flex": true, + "symfony/runtime": true + }, + "sort-packages": true + }, + "autoload": { + "psr-4": { + "App\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "App\\Tests\\": "tests/" + } + }, + "replace": { + "symfony/polyfill-ctype": "*", + "symfony/polyfill-iconv": "*", + "symfony/polyfill-php72": "*", + "symfony/polyfill-php73": "*", + "symfony/polyfill-php74": "*", + "symfony/polyfill-php80": "*", + "symfony/polyfill-php81": "*" + }, + "scripts": { + "auto-scripts": { + "cache:clear": "symfony-cmd", + "assets:install %PUBLIC_DIR%": "symfony-cmd" + }, + "post-install-cmd": [ + "@auto-scripts" + ], + "post-update-cmd": [ + "@auto-scripts" + ] + }, + "conflict": { + "symfony/symfony": "*" + }, + "extra": { + "symfony": { + "allow-contrib": false, + "require": "6.4.*" } } } diff --git a/composer.lock b/composer.lock index 7f2c2233..ef7c151c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,79 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1270962f00552945670e2e690a9a2bf9", + "content-hash": "61fab6c025a173671a288e10c9d8ba16", "packages": [ - { - "name": "apereo/phpcas", - "version": "1.6.1", - "source": { - "type": "git", - "url": "https://github.com/apereo/phpCAS.git", - "reference": "c129708154852656aabb13d8606cd5b12dbbabac" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/apereo/phpCAS/zipball/c129708154852656aabb13d8606cd5b12dbbabac", - "reference": "c129708154852656aabb13d8606cd5b12dbbabac", - "shasum": "" - }, - "require": { - "ext-curl": "*", - "ext-dom": "*", - "php": ">=7.1.0", - "psr/log": "^1.0 || ^2.0 || ^3.0" - }, - "require-dev": { - "monolog/monolog": "^1.0.0 || ^2.0.0", - "phpstan/phpstan": "^1.5", - "phpunit/phpunit": ">=7.5" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "files": [ - "source/CAS.php" - ], - "classmap": [ - "source/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "Apache-2.0" - ], - "authors": [ - { - "name": "Joachim Fritschi", - "email": "jfritschi@freenet.de", - "homepage": "https://github.com/jfritschi" - }, - { - "name": "Adam Franco", - "homepage": "https://github.com/adamfranco" - }, - { - "name": "Henry Pan", - "homepage": "https://github.com/phy25" - } - ], - "description": "Provides a simple API for authenticating users against a CAS server", - "homepage": "https://wiki.jasig.org/display/CASC/phpCAS", - "keywords": [ - "apereo", - "cas", - "jasig" - ], - "support": { - "issues": "https://github.com/apereo/phpCAS/issues", - "source": "https://github.com/apereo/phpCAS/tree/1.6.1" - }, - "time": "2023-02-19T19:52:35+00:00" - }, { "name": "brick/math", "version": "0.12.1", @@ -139,16 +68,16 @@ }, { "name": "doctrine/annotations", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/doctrine/annotations.git", - "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f" + "reference": "901c2ee5d26eb64ff43c47976e114bf00843acf7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", - "reference": "e157ef3f3124bbf6fe7ce0ffd109e8a8ef284e7f", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/901c2ee5d26eb64ff43c47976e114bf00843acf7", + "reference": "901c2ee5d26eb64ff43c47976e114bf00843acf7", "shasum": "" }, "require": { @@ -160,10 +89,10 @@ "require-dev": { "doctrine/cache": "^2.0", "doctrine/coding-standard": "^10", - "phpstan/phpstan": "^1.8.0", + "phpstan/phpstan": "^1.10.28", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "symfony/cache": "^5.4 || ^6", - "vimeo/psalm": "^4.10" + "symfony/cache": "^5.4 || ^6.4 || ^7", + "vimeo/psalm": "^4.30 || ^5.14" }, "suggest": { "php": "PHP 8.0 or higher comes with attributes, a native replacement for annotations" @@ -209,9 +138,9 @@ ], "support": { "issues": "https://github.com/doctrine/annotations/issues", - "source": "https://github.com/doctrine/annotations/tree/2.0.1" + "source": "https://github.com/doctrine/annotations/tree/2.0.2" }, - "time": "2023-02-02T22:02:53+00:00" + "time": "2024-09-05T10:17:24+00:00" }, { "name": "doctrine/lexer", @@ -851,16 +780,16 @@ }, { "name": "microsoft/kiota-http-guzzle", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/microsoft/kiota-http-guzzle-php.git", - "reference": "fc853cf4db8772d677080b8909fc853438a3612a" + "reference": "7ff51aa658c3cf9d421501631e2bf45ced425b65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/microsoft/kiota-http-guzzle-php/zipball/fc853cf4db8772d677080b8909fc853438a3612a", - "reference": "fc853cf4db8772d677080b8909fc853438a3612a", + "url": "https://api.github.com/repos/microsoft/kiota-http-guzzle-php/zipball/7ff51aa658c3cf9d421501631e2bf45ced425b65", + "reference": "7ff51aa658c3cf9d421501631e2bf45ced425b65", "shasum": "" }, "require": { @@ -893,9 +822,9 @@ "description": "Kiota HTTP Request Adapter implementation", "support": { "issues": "https://github.com/microsoft/kiota-http-guzzle-php/issues", - "source": "https://github.com/microsoft/kiota-http-guzzle-php/tree/1.3.0" + "source": "https://github.com/microsoft/kiota-http-guzzle-php/tree/1.3.1" }, - "time": "2024-03-12T08:25:57+00:00" + "time": "2024-09-04T11:54:51+00:00" }, { "name": "microsoft/kiota-serialization-form", @@ -948,16 +877,16 @@ }, { "name": "microsoft/kiota-serialization-json", - "version": "1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/microsoft/kiota-serialization-json-php.git", - "reference": "1e7b71b2814fa90fde2b0b6e7db36ebb5ec01b13" + "reference": "85f7fdba1ad5b3adcb5bccdabfbada44e82af7f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/microsoft/kiota-serialization-json-php/zipball/1e7b71b2814fa90fde2b0b6e7db36ebb5ec01b13", - "reference": "1e7b71b2814fa90fde2b0b6e7db36ebb5ec01b13", + "url": "https://api.github.com/repos/microsoft/kiota-serialization-json-php/zipball/85f7fdba1ad5b3adcb5bccdabfbada44e82af7f6", + "reference": "85f7fdba1ad5b3adcb5bccdabfbada44e82af7f6", "shasum": "" }, "require": { @@ -991,9 +920,9 @@ "description": "Implementation of Kiota serialization abstractions using Json.", "support": { "issues": "https://github.com/microsoft/kiota-serialization-json-php/issues", - "source": "https://github.com/microsoft/kiota-serialization-json-php/tree/1.3.0" + "source": "https://github.com/microsoft/kiota-serialization-json-php/tree/v1.3.1" }, - "time": "2024-06-04T13:27:38+00:00" + "time": "2024-09-16T17:45:09+00:00" }, { "name": "microsoft/kiota-serialization-multipart", @@ -1092,16 +1021,16 @@ }, { "name": "microsoft/microsoft-graph", - "version": "v2.12.0", + "version": "v2.14.0", "source": { "type": "git", "url": "https://github.com/microsoftgraph/msgraph-sdk-php.git", - "reference": "1a5f146a936686b116166682e0dfeab74ef358e6" + "reference": "69182967d397b1a98e68f3888a816141aeabacc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/1a5f146a936686b116166682e0dfeab74ef358e6", - "reference": "1a5f146a936686b116166682e0dfeab74ef358e6", + "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/69182967d397b1a98e68f3888a816141aeabacc0", + "reference": "69182967d397b1a98e68f3888a816141aeabacc0", "shasum": "" }, "require": { @@ -1133,9 +1062,9 @@ "homepage": "https://developer.microsoft.com/en-us/graph", "support": { "issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues", - "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/v2.12.0" + "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/v2.14.0" }, - "time": "2024-06-04T13:56:43+00:00" + "time": "2024-09-19T07:19:49+00:00" }, { "name": "microsoft/microsoft-graph-core", @@ -1468,16 +1397,16 @@ }, { "name": "open-telemetry/sem-conv", - "version": "1.25.0", + "version": "1.27.1", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sem-conv.git", - "reference": "23f457ba390847647a17068e0095d9ffe9a4824c" + "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/23f457ba390847647a17068e0095d9ffe9a4824c", - "reference": "23f457ba390847647a17068e0095d9ffe9a4824c", + "url": "https://api.github.com/repos/opentelemetry-php/sem-conv/zipball/1dba705fea74bc0718d04be26090e3697e56f4e6", + "reference": "1dba705fea74bc0718d04be26090e3697e56f4e6", "shasum": "" }, "require": { @@ -1521,7 +1450,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-04-09T23:31:35+00:00" + "time": "2024-08-28T09:20:31+00:00" }, { "name": "paragonie/random_compat", @@ -1753,6 +1682,109 @@ }, "time": "2021-02-03T23:26:27+00:00" }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" + }, + { + "name": "psr/event-dispatcher", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/event-dispatcher.git", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0", + "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\EventDispatcher\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Standard interfaces for event handling.", + "keywords": [ + "events", + "psr", + "psr-14" + ], + "support": { + "issues": "https://github.com/php-fig/event-dispatcher/issues", + "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" + }, + "time": "2019-01-08T18:20:26+00:00" + }, { "name": "psr/http-client", "version": "1.0.3", @@ -1915,30 +1947,30 @@ }, { "name": "psr/log", - "version": "1.1.4", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", - "reference": "d49695b909c3b7628b6289db5479a1c204601f11", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=8.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "3.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "Psr/Log/" + "Psr\\Log\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1959,9 +1991,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/1.1.4" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2021-05-03T11:20:27+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "ralouphie/getallheaders", @@ -2270,35 +2302,60 @@ "time": "2024-04-18T10:51:20+00:00" }, { - "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "name": "symfony/cache", + "version": "v6.4.11", "source": { "type": "git", - "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "url": "https://github.com/symfony/cache.git", + "reference": "36daef8fce88fe0b9a4f8cf4c342ced5c05616dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/cache/zipball/36daef8fce88fe0b9a4f8cf4c342ced5c05616dc", + "reference": "36daef8fce88fe0b9a4f8cf4c342ced5c05616dc", "shasum": "" }, "require": { - "php": ">=8.1" + "php": ">=8.1", + "psr/cache": "^2.0|^3.0", + "psr/log": "^1.1|^2|^3", + "symfony/cache-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3", + "symfony/var-exporter": "^6.3.6|^7.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } + "conflict": { + "doctrine/dbal": "<2.13.1", + "symfony/dependency-injection": "<5.4", + "symfony/http-kernel": "<5.4", + "symfony/var-dumper": "<5.4" + }, + "provide": { + "psr/cache-implementation": "2.0|3.0", + "psr/simple-cache-implementation": "1.0|2.0|3.0", + "symfony/cache-implementation": "1.1|2.0|3.0" }, + "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/dbal": "^2.13.1|^3|^4", + "predis/predis": "^1.1|^2.0", + "psr/simple-cache": "^1.0|^2.0|^3.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", "autoload": { - "files": [ - "function.php" + "psr-4": { + "Symfony\\Component\\Cache\\": "" + }, + "classmap": [ + "Traits/ValueWrapper.php" + ], + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2315,10 +2372,14 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "A generic function and convention to trigger deprecation notices", + "description": "Provides extended PSR-6, PSR-16 (and tags) implementations", "homepage": "https://symfony.com", + "keywords": [ + "caching", + "psr6" + ], "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/cache/tree/v6.4.11" }, "funding": [ { @@ -2334,44 +2395,39 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-08-05T07:40:31+00:00" }, { - "name": "symfony/polyfill-mbstring", - "version": "v1.30.0", + "name": "symfony/cache-contracts", + "version": "v3.5.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" + "url": "https://github.com/symfony/cache-contracts.git", + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", - "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197", + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197", "shasum": "" }, "require": { - "php": ">=7.1" - }, - "provide": { - "ext-mbstring": "*" - }, - "suggest": { - "ext-mbstring": "For best performance" + "php": ">=8.1", + "psr/cache": "^3.0" }, "type": "library", "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" } }, "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" + "Symfony\\Contracts\\Cache\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -2388,17 +2444,18 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for the Mbstring extension", + "description": "Generic abstractions related to caching", "homepage": "https://symfony.com", "keywords": [ - "compatibility", - "mbstring", - "polyfill", - "portable", - "shim" + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0" }, "funding": [ { @@ -2414,41 +2471,46 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { - "name": "symfony/polyfill-php80", - "version": "v1.30.0", + "name": "symfony/config", + "version": "v6.4.8", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" + "url": "https://github.com/symfony/config.git", + "reference": "12e7e52515ce37191b193cf3365903c4f3951e35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", - "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", + "url": "https://api.github.com/repos/symfony/config/zipball/12e7e52515ce37191b193cf3365903c4f3951e35", + "reference": "12e7e52515ce37191b193cf3365903c4f3951e35", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/polyfill-ctype": "~1.8" }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } + "conflict": { + "symfony/finder": "<5.4", + "symfony/service-contracts": "<2.5" + }, + "require-dev": { + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^5.4|^6.0|^7.0" }, + "type": "library", "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { - "Symfony\\Polyfill\\Php80\\": "" + "Symfony\\Component\\Config\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2457,28 +2519,18 @@ ], "authors": [ { - "name": "Ion Bazan", - "email": "ion.bazan@gmail.com" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", + "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" + "source": "https://github.com/symfony/config/tree/v6.4.8" }, "funding": [ { @@ -2494,41 +2546,59 @@ "type": "tidelift" } ], - "time": "2024-05-31T15:07:36+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { - "name": "symfony/polyfill-php81", - "version": "v1.30.0", + "name": "symfony/console", + "version": "v6.4.11", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" + "url": "https://github.com/symfony/console.git", + "reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", - "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", + "url": "https://api.github.com/repos/symfony/console/zipball/42686880adaacdad1835ee8fc2a9ec5b7bd63998", + "reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/string": "^5.4|^6.0|^7.0" }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/dotenv": "<5.4", + "symfony/event-dispatcher": "<5.4", + "symfony/lock": "<5.4", + "symfony/process": "<5.4" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, + "type": "library", "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { - "Symfony\\Polyfill\\Php81\\": "" + "Symfony\\Component\\Console\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2537,24 +2607,24 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" + "cli", + "command-line", + "console", + "terminal" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" + "source": "https://github.com/symfony/console/tree/v6.4.11" }, "funding": [ { @@ -2570,41 +2640,52 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-08-15T22:48:29+00:00" }, { - "name": "symfony/polyfill-php82", - "version": "v1.30.0", + "name": "symfony/dependency-injection", + "version": "v6.4.11", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php82.git", - "reference": "77ff49780f56906788a88974867ed68bc49fae5b" + "url": "https://github.com/symfony/dependency-injection.git", + "reference": "e93c8368dc9915c2fe12018ff22fcbbdd32c9a9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/77ff49780f56906788a88974867ed68bc49fae5b", - "reference": "77ff49780f56906788a88974867ed68bc49fae5b", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e93c8368dc9915c2fe12018ff22fcbbdd32c9a9e", + "reference": "e93c8368dc9915c2fe12018ff22fcbbdd32c9a9e", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^6.2.10|^7.0" }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } + "conflict": { + "ext-psr": "<1.1|>=2", + "symfony/config": "<6.1", + "symfony/finder": "<5.4", + "symfony/proxy-manager-bridge": "<6.3", + "symfony/yaml": "<5.4" + }, + "provide": { + "psr/container-implementation": "1.1|2.0", + "symfony/service-implementation": "1.1|2.0|3.0" + }, + "require-dev": { + "symfony/config": "^6.1|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" }, + "type": "library", "autoload": { - "files": [ - "bootstrap.php" - ], "psr-4": { - "Symfony\\Polyfill\\Php82\\": "" + "Symfony\\Component\\DependencyInjection\\": "" }, - "classmap": [ - "Resources/stubs" + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -2613,24 +2694,1880 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions", + "description": "Allows you to standardize and centralize the way objects are constructed in your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-29T08:15:38+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/dotenv", + "version": "v6.4.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/dotenv.git", + "reference": "2ae0c84cc9be0dc1eeb86016970b63c764d8472e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/2ae0c84cc9be0dc1eeb86016970b63c764d8472e", + "reference": "2ae0c84cc9be0dc1eeb86016970b63c764d8472e", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "conflict": { + "symfony/console": "<5.4", + "symfony/process": "<5.4" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Dotenv\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Registers environment variables from a .env file", + "homepage": "https://symfony.com", + "keywords": [ + "dotenv", + "env", + "environment" + ], + "support": { + "source": "https://github.com/symfony/dotenv/tree/v6.4.10" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-07-09T18:29:35+00:00" + }, + { + "name": "symfony/error-handler", + "version": "v6.4.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/error-handler.git", + "reference": "231f1b2ee80f72daa1972f7340297d67439224f0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0", + "reference": "231f1b2ee80f72daa1972f7340297d67439224f0", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/log": "^1|^2|^3", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "conflict": { + "symfony/deprecation-contracts": "<2.5", + "symfony/http-kernel": "<6.4" + }, + "require-dev": { + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/serializer": "^5.4|^6.0|^7.0" + }, + "bin": [ + "Resources/bin/patch-type-declarations" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\ErrorHandler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to manage errors and ease debugging PHP code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/error-handler/tree/v6.4.10" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-07-26T12:30:32+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b", + "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/event-dispatcher-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/dependency-injection": "<5.4", + "symfony/service-contracts": "<2.5" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "2.0|3.0" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/stopwatch": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/event-dispatcher": "^1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/filesystem", + "version": "v6.4.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/filesystem.git", + "reference": "b51ef8059159330b74a4d52f68e671033c0fe463" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/b51ef8059159330b74a4d52f68e671033c0fe463", + "reference": "b51ef8059159330b74a4d52f68e671033c0fe463", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.8" + }, + "require-dev": { + "symfony/process": "^5.4|^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Filesystem\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides basic utilities for the filesystem", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/filesystem/tree/v6.4.9" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-06-28T09:49:33+00:00" + }, + { + "name": "symfony/finder", + "version": "v6.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453", + "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "require-dev": { + "symfony/filesystem": "^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-13T14:27:37+00:00" + }, + { + "name": "symfony/flex", + "version": "v2.4.6", + "source": { + "type": "git", + "url": "https://github.com/symfony/flex.git", + "reference": "4dc11919791f81d087a12db2ab4c7e044431ef6b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/flex/zipball/4dc11919791f81d087a12db2ab4c7e044431ef6b", + "reference": "4dc11919791f81d087a12db2ab4c7e044431ef6b", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.1", + "php": ">=8.0" + }, + "require-dev": { + "composer/composer": "^2.1", + "symfony/dotenv": "^5.4|^6.0", + "symfony/filesystem": "^5.4|^6.0", + "symfony/phpunit-bridge": "^5.4|^6.0", + "symfony/process": "^5.4|^6.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Symfony\\Flex\\Flex" + }, + "autoload": { + "psr-4": { + "Symfony\\Flex\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien.potencier@gmail.com" + } + ], + "description": "Composer plugin for Symfony", + "support": { + "issues": "https://github.com/symfony/flex/issues", + "source": "https://github.com/symfony/flex/tree/v2.4.6" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-27T10:22:22+00:00" + }, + { + "name": "symfony/framework-bundle", + "version": "v6.4.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/framework-bundle.git", + "reference": "6cbdb0cc3ddbb63499262cd3036882b08ee2690b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/6cbdb0cc3ddbb63499262cd3036882b08ee2690b", + "reference": "6cbdb0cc3ddbb63499262cd3036882b08ee2690b", + "shasum": "" + }, + "require": { + "composer-runtime-api": ">=2.1", + "ext-xml": "*", + "php": ">=8.1", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/config": "^6.1|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/error-handler": "^6.1|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/http-kernel": "^6.4", + "symfony/polyfill-mbstring": "~1.0", + "symfony/routing": "^6.4|^7.0" + }, + "conflict": { + "doctrine/annotations": "<1.13.1", + "doctrine/persistence": "<1.3", + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/asset": "<5.4", + "symfony/asset-mapper": "<6.4", + "symfony/clock": "<6.3", + "symfony/console": "<5.4|>=7.0", + "symfony/dom-crawler": "<6.4", + "symfony/dotenv": "<5.4", + "symfony/form": "<5.4", + "symfony/http-client": "<6.3", + "symfony/lock": "<5.4", + "symfony/mailer": "<5.4", + "symfony/messenger": "<6.3", + "symfony/mime": "<6.4", + "symfony/property-access": "<5.4", + "symfony/property-info": "<5.4", + "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4", + "symfony/security-core": "<5.4", + "symfony/security-csrf": "<5.4", + "symfony/serializer": "<6.4", + "symfony/stopwatch": "<5.4", + "symfony/translation": "<6.4", + "symfony/twig-bridge": "<5.4", + "symfony/twig-bundle": "<5.4", + "symfony/validator": "<6.4", + "symfony/web-profiler-bundle": "<6.4", + "symfony/workflow": "<6.4" + }, + "require-dev": { + "doctrine/annotations": "^1.13.1|^2", + "doctrine/persistence": "^1.3|^2|^3", + "dragonmantank/cron-expression": "^3.1", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "seld/jsonlint": "^1.10", + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/asset-mapper": "^6.4|^7.0", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/clock": "^6.2|^7.0", + "symfony/console": "^5.4.9|^6.0.9|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/dom-crawler": "^6.4|^7.0", + "symfony/dotenv": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/form": "^5.4|^6.0|^7.0", + "symfony/html-sanitizer": "^6.1|^7.0", + "symfony/http-client": "^6.3|^7.0", + "symfony/lock": "^5.4|^6.0|^7.0", + "symfony/mailer": "^5.4|^6.0|^7.0", + "symfony/messenger": "^6.3|^7.0", + "symfony/mime": "^6.4|^7.0", + "symfony/notifier": "^5.4|^6.0|^7.0", + "symfony/polyfill-intl-icu": "~1.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0", + "symfony/scheduler": "^6.4.4|^7.0.4", + "symfony/security-bundle": "^5.4|^6.0|^7.0", + "symfony/semaphore": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/string": "^5.4|^6.0|^7.0", + "symfony/translation": "^6.4|^7.0", + "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0", + "symfony/workflow": "^6.4|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", + "twig/twig": "^2.10|^3.0.4" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Symfony\\Bundle\\FrameworkBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.10" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-07-26T13:24:20+00:00" + }, + { + "name": "symfony/http-foundation", + "version": "v6.4.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-foundation.git", + "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/117f1f20a7ade7bcea28b861fb79160a21a1e37b", + "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php83": "^1.27" + }, + "conflict": { + "symfony/cache": "<6.3" + }, + "require-dev": { + "doctrine/dbal": "^2.13.1|^3|^4", + "predis/predis": "^1.1|^2.0", + "symfony/cache": "^6.3|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpFoundation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Defines an object-oriented layer for the HTTP specification", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-foundation/tree/v6.4.10" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-07-26T12:36:27+00:00" + }, + { + "name": "symfony/http-kernel", + "version": "v6.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-kernel.git", + "reference": "1ba6b89d781cb47448155cc70dd2e0f1b0584c79" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1ba6b89d781cb47448155cc70dd2e0f1b0584c79", + "reference": "1ba6b89d781cb47448155cc70dd2e0f1b0584c79", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/log": "^1|^2|^3", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/error-handler": "^6.4|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.4|^7.0", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "symfony/browser-kit": "<5.4", + "symfony/cache": "<5.4", + "symfony/config": "<6.1", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<6.4", + "symfony/doctrine-bridge": "<5.4", + "symfony/form": "<5.4", + "symfony/http-client": "<5.4", + "symfony/http-client-contracts": "<2.5", + "symfony/mailer": "<5.4", + "symfony/messenger": "<5.4", + "symfony/translation": "<5.4", + "symfony/translation-contracts": "<2.5", + "symfony/twig-bridge": "<5.4", + "symfony/validator": "<6.4", + "symfony/var-dumper": "<6.3", + "twig/twig": "<2.13" + }, + "provide": { + "psr/log-implementation": "1.0|2.0|3.0" + }, + "require-dev": { + "psr/cache": "^1.0|^2.0|^3.0", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/clock": "^6.2|^7.0", + "symfony/config": "^6.1|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/dom-crawler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/http-client-contracts": "^2.5|^3", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4.5|^6.0.5|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4.4|^7.0.4", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "symfony/translation-contracts": "^2.5|^3", + "symfony/uid": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/var-dumper": "^5.4|^6.4|^7.0", + "symfony/var-exporter": "^6.2|^7.0", + "twig/twig": "^2.13|^3.0.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpKernel\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a structured process for converting a Request into a Response", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-kernel/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-30T16:57:20+00:00" + }, + { + "name": "symfony/polyfill-intl-grapheme", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-grapheme.git", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Grapheme\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's grapheme_* functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "grapheme", + "intl", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "3833d7255cc303546435cb650316bff708a1c75c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "suggest": { + "ext-intl": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for intl's Normalizer class and related functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "intl", + "normalizer", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-php82", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php82.git", + "reference": "5d2ed36f7734637dacc025f179698031951b1692" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php82/zipball/5d2ed36f7734637dacc025f179698031951b1692", + "reference": "5d2ed36f7734637dacc025f179698031951b1692", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php82\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php82/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/polyfill-php83", + "version": "v1.31.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php83.git", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php83\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-09T11:45:10+00:00" + }, + { + "name": "symfony/routing", + "version": "v6.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/routing.git", + "reference": "8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/routing/zipball/8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a", + "reference": "8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "conflict": { + "doctrine/annotations": "<1.12", + "symfony/config": "<6.2", + "symfony/dependency-injection": "<5.4", + "symfony/yaml": "<5.4" + }, + "require-dev": { + "doctrine/annotations": "^1.12|^2", + "psr/log": "^1|^2|^3", + "symfony/config": "^6.2|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Routing\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Maps an HTTP request to a set of configuration variables", + "homepage": "https://symfony.com", + "keywords": [ + "router", + "routing", + "uri", + "url" + ], + "support": { + "source": "https://github.com/symfony/routing/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-29T08:15:38+00:00" + }, + { + "name": "symfony/runtime", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/runtime.git", + "reference": "b4bfa2fd4cad1fee62f80b3dfe4eb674cc3302a0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/runtime/zipball/b4bfa2fd4cad1fee62f80b3dfe4eb674cc3302a0", + "reference": "b4bfa2fd4cad1fee62f80b3dfe4eb674cc3302a0", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0|^2.0", + "php": ">=8.1" + }, + "conflict": { + "symfony/dotenv": "<5.4" + }, + "require-dev": { + "composer/composer": "^1.0.2|^2.0", + "symfony/console": "^5.4.9|^6.0.9|^7.0", + "symfony/dotenv": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Symfony\\Component\\Runtime\\Internal\\ComposerPlugin" + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Runtime\\": "", + "Symfony\\Runtime\\Symfony\\Component\\": "Internal/" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Enables decoupling PHP applications from global state", + "homepage": "https://symfony.com", + "keywords": [ + "runtime" + ], + "support": { + "source": "https://github.com/symfony/runtime/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, + { + "name": "symfony/service-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/service-contracts.git", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "conflict": { + "ext-psr": "<1.1|>=2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Service\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to writing services", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/string", + "version": "v6.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/string.git", + "reference": "5bc3eb632cf9c8dbfd6529d89be9950d1518883b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/string/zipball/5bc3eb632cf9c8dbfd6529d89be9950d1518883b", + "reference": "5bc3eb632cf9c8dbfd6529d89be9950d1518883b", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-normalizer": "~1.0", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/translation-contracts": "<2.5" + }, + "require-dev": { + "symfony/error-handler": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/intl": "^6.2|^7.0", + "symfony/translation-contracts": "^2.5|^3.0", + "symfony/var-exporter": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\String\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way", + "homepage": "https://symfony.com", + "keywords": [ + "grapheme", + "i18n", + "string", + "unicode", + "utf-8", + "utf8" + ], + "support": { + "source": "https://github.com/symfony/string/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-12T09:55:28+00:00" + }, + { + "name": "symfony/var-dumper", + "version": "v6.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "ee14c8254a480913268b1e3b1cba8045ed122694" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ee14c8254a480913268b1e3b1cba8045ed122694", + "reference": "ee14c8254a480913268b1e3b1cba8045ed122694", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/error-handler": "^6.3|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-30T16:03:21+00:00" + }, + { + "name": "symfony/var-exporter", + "version": "v6.4.9", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-exporter.git", + "reference": "f9a060622e0d93777b7f8687ec4860191e16802e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/f9a060622e0d93777b7f8687ec4860191e16802e", + "reference": "f9a060622e0d93777b7f8687ec4860191e16802e", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "require-dev": { + "symfony/property-access": "^6.4|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\VarExporter\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Allows exporting any serializable PHP data structure to plain PHP code", + "homepage": "https://symfony.com", + "keywords": [ + "clone", + "construct", + "export", + "hydrate", + "instantiate", + "lazy-loading", + "proxy", + "serialize" + ], + "support": { + "source": "https://github.com/symfony/var-exporter/tree/v6.4.9" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-06-24T15:53:56+00:00" + }, + { + "name": "symfony/yaml", + "version": "v6.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "be37e7f13195e05ab84ca5269365591edd240335" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/be37e7f13195e05ab84ca5269365591edd240335", + "reference": "be37e7f13195e05ab84ca5269365591edd240335", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8" + }, + "conflict": { + "symfony/console": "<5.4" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], "support": { - "source": "https://github.com/symfony/polyfill-php82/tree/v1.30.0" + "source": "https://github.com/symfony/yaml/tree/v6.4.11" }, "funding": [ { @@ -2646,16 +4583,20 @@ "type": "tidelift" } ], - "time": "2024-06-19T12:30:46+00:00" + "time": "2024-08-12T09:55:28+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", "stability-flags": [], - "prefer-stable": false, + "prefer-stable": true, "prefer-lowest": false, - "platform": [], + "platform": { + "php": ">=8.1", + "ext-ctype": "*", + "ext-iconv": "*" + }, "platform-dev": [], "plugin-api-version": "2.6.0" } diff --git a/config/bundles.php b/config/bundles.php new file mode 100644 index 00000000..49d3fb6f --- /dev/null +++ b/config/bundles.php @@ -0,0 +1,5 @@ + ['all' => true], +]; diff --git a/config/packages/cache.yaml b/config/packages/cache.yaml new file mode 100644 index 00000000..6899b720 --- /dev/null +++ b/config/packages/cache.yaml @@ -0,0 +1,19 @@ +framework: + cache: + # Unique name of your app: used to compute stable namespaces for cache keys. + #prefix_seed: your_vendor_name/app_name + + # The "app" cache stores to the filesystem by default. + # The data in this cache should persist between deploys. + # Other options include: + + # Redis + #app: cache.adapter.redis + #default_redis_provider: redis://localhost + + # APCu (not recommended with heavy random-write workloads as memory fragmentation can cause perf issues) + #app: cache.adapter.apcu + + # Namespaced pools use the above "app" backend by default + #pools: + #my.dedicated.cache: null diff --git a/config/packages/framework.yaml b/config/packages/framework.yaml new file mode 100644 index 00000000..28095da4 --- /dev/null +++ b/config/packages/framework.yaml @@ -0,0 +1,24 @@ +# see https://symfony.com/doc/current/reference/configuration/framework.html +framework: + secret: '%env(APP_SECRET)%' + annotations: false + http_method_override: false + handle_all_throwables: true + + # Enables session support. Note that the session will ONLY be started if you read or write from it. + # Remove or comment this section to explicitly disable session support. + session: + handler_id: null + cookie_secure: auto + cookie_samesite: lax + + #esi: true + #fragments: true + php_errors: + log: true + +when@test: + framework: + test: true + session: + storage_factory_id: session.storage.factory.mock_file diff --git a/config/packages/http_discovery.yaml b/config/packages/http_discovery.yaml new file mode 100644 index 00000000..2a789e73 --- /dev/null +++ b/config/packages/http_discovery.yaml @@ -0,0 +1,10 @@ +services: + Psr\Http\Message\RequestFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\ResponseFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\ServerRequestFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\StreamFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\UploadedFileFactoryInterface: '@http_discovery.psr17_factory' + Psr\Http\Message\UriFactoryInterface: '@http_discovery.psr17_factory' + + http_discovery.psr17_factory: + class: Http\Discovery\Psr17Factory diff --git a/config/packages/routing.yaml b/config/packages/routing.yaml new file mode 100644 index 00000000..4b766ce5 --- /dev/null +++ b/config/packages/routing.yaml @@ -0,0 +1,12 @@ +framework: + router: + utf8: true + + # Configure how to generate URLs in non-HTTP contexts, such as CLI commands. + # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands + #default_uri: http://localhost + +when@prod: + framework: + router: + strict_requirements: null diff --git a/config/preload.php b/config/preload.php new file mode 100644 index 00000000..5ebcdb21 --- /dev/null +++ b/config/preload.php @@ -0,0 +1,5 @@ + Date: Fri, 20 Sep 2024 14:49:49 -0400 Subject: [PATCH 002/173] Add default .htaccess with `composer require symfony/apache-pack`. --- composer.json | 7 +++-- composer.lock | 28 ++++++++++++++++++- public/.htaccess | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ symfony.lock | 12 +++++++++ 4 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 public/.htaccess diff --git a/composer.json b/composer.json index 65415188..099b23c0 100644 --- a/composer.json +++ b/composer.json @@ -8,8 +8,9 @@ "php": ">=8.1", "ext-ctype": "*", "ext-iconv": "*", - "onelogin/php-saml": "^4.2", "microsoft/microsoft-graph": "^2.12", + "onelogin/php-saml": "^4.2", + "symfony/apache-pack": "^1.0", "symfony/console": "6.4.*", "symfony/dotenv": "6.4.*", "symfony/flex": "^2", @@ -17,8 +18,6 @@ "symfony/runtime": "6.4.*", "symfony/yaml": "6.4.*" }, - "require-dev": { - }, "config": { "allow-plugins": { "php-http/discovery": true, @@ -63,7 +62,7 @@ }, "extra": { "symfony": { - "allow-contrib": false, + "allow-contrib": true, "require": "6.4.*" } } diff --git a/composer.lock b/composer.lock index ef7c151c..f0907640 100644 --- a/composer.lock +++ b/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": "61fab6c025a173671a288e10c9d8ba16", + "content-hash": "8325de776499155bdf6bc928f31e19d4", "packages": [ { "name": "brick/math", @@ -2301,6 +2301,32 @@ }, "time": "2024-04-18T10:51:20+00:00" }, + { + "name": "symfony/apache-pack", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/symfony/apache-pack.git", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/apache-pack/zipball/3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "reference": "3aa5818d73ad2551281fc58a75afd9ca82622e6c", + "shasum": "" + }, + "type": "symfony-pack", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A pack for Apache support in Symfony", + "support": { + "issues": "https://github.com/symfony/apache-pack/issues", + "source": "https://github.com/symfony/apache-pack/tree/master" + }, + "time": "2017-12-12T01:46:35+00:00" + }, { "name": "symfony/cache", "version": "v6.4.11", diff --git a/public/.htaccess b/public/.htaccess new file mode 100644 index 00000000..f7345dfb --- /dev/null +++ b/public/.htaccess @@ -0,0 +1,70 @@ +# Use the front controller as index file. It serves as a fallback solution when +# every other rewrite/redirect fails (e.g. in an aliased environment without +# mod_rewrite). Additionally, this reduces the matching process for the +# start page (path "/") because otherwise Apache will apply the rewriting rules +# to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). +DirectoryIndex index.php + +# By default, Apache does not evaluate symbolic links if you did not enable this +# feature in your server configuration. Uncomment the following line if you +# install assets as symlinks or if you experience problems related to symlinks +# when compiling LESS/Sass/CoffeScript assets. +# Options +SymLinksIfOwnerMatch + +# Disabling MultiViews prevents unwanted negotiation, e.g. "/index" should not resolve +# to the front controller "/index.php" but be rewritten to "/index.php/index". + + Options -MultiViews + + + + # This Option needs to be enabled for RewriteRule, otherwise it will show an error like + # 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden' + Options +SymLinksIfOwnerMatch + + RewriteEngine On + + # Determine the RewriteBase automatically and set it as environment variable. + # If you are using Apache aliases to do mass virtual hosting or installed the + # project in a subdirectory, the base path will be prepended to allow proper + # resolution of the index.php file and to redirect to the correct URI. It will + # work in environments without path prefix as well, providing a safe, one-size + # fits all solution. But as you do not need it in this case, you can comment + # the following 2 lines to eliminate the overhead. + RewriteCond %{REQUEST_URI}::$0 ^(/.+)/(.*)::\2$ + RewriteRule .* - [E=BASE:%1] + + # Sets the HTTP_AUTHORIZATION header removed by Apache + RewriteCond %{HTTP:Authorization} .+ + RewriteRule ^ - [E=HTTP_AUTHORIZATION:%0] + + # Redirect to URI without front controller to prevent duplicate content + # (with and without `/index.php`). Only do this redirect on the initial + # rewrite by Apache and not on subsequent cycles. Otherwise we would get an + # endless redirect loop (request -> rewrite to front controller -> + # redirect -> request -> ...). + # So in case you get a "too many redirects" error or you always get redirected + # to the start page because your Apache does not expose the REDIRECT_STATUS + # environment variable, you have 2 choices: + # - disable this feature by commenting the following 2 lines or + # - use Apache >= 2.3.9 and replace all L flags by END flags and remove the + # following RewriteCond (best solution) + RewriteCond %{ENV:REDIRECT_STATUS} ="" + RewriteRule ^index\.php(?:/(.*)|$) %{ENV:BASE}/$1 [R=301,L] + + # If the requested filename exists, simply serve it. + # We only want to let Apache serve files and not directories. + # Rewrite all other queries to the front controller. + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ %{ENV:BASE}/index.php [L] + + + + + # When mod_rewrite is not available, we instruct a temporary redirect of + # the start page to the front controller explicitly so that the website + # and the generated links can still be used. + RedirectMatch 307 ^/$ /index.php/ + # RedirectTemp cannot be used instead + + diff --git a/symfony.lock b/symfony.lock index be63bfb8..9390dfe7 100644 --- a/symfony.lock +++ b/symfony.lock @@ -20,6 +20,18 @@ "config/packages/http_discovery.yaml" ] }, + "symfony/apache-pack": { + "version": "1.0", + "recipe": { + "repo": "github.com/symfony/recipes-contrib", + "branch": "main", + "version": "1.0", + "ref": "0f18b4decdf5695d692c1d0dfd65516a07a6adf1" + }, + "files": [ + "public/.htaccess" + ] + }, "symfony/console": { "version": "6.4", "recipe": { From 80958b0e3a956f85b85eb4a08abe62c14c24045e Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 24 Sep 2024 15:52:10 -0400 Subject: [PATCH 003/173] #47: Move the Catalogs controller into the Symfony structure. --- .../Controller/Catalogs.php | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) rename application/controllers/CatalogsController.php => src/Controller/Catalogs.php (85%) diff --git a/application/controllers/CatalogsController.php b/src/Controller/Catalogs.php similarity index 85% rename from application/controllers/CatalogsController.php rename to src/Controller/Catalogs.php index 4d726bf6..4f70bfd4 100755 --- a/application/controllers/CatalogsController.php +++ b/src/Controller/Catalogs.php @@ -6,6 +6,12 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL) */ +namespace App\Controller; + +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; + /** * A controller for accessing catalogs. * @@ -14,27 +20,18 @@ * @copyright Copyright © 2009, Middlebury College * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL) */ -class CatalogsController extends AbstractCatalogController +class Catalogs extends AbstractController { - public function indexAction() - { - $this->_forward('list'); - } - /** - * Print out a list of all catalogs. - * - * @return void - * - * @since 4/21/09 - */ + #[Route('/catalogs/', name: 'List all catalogs')] public function listAction() { $lookupSession = $this->_helper->osid->getCourseManager()->getCourseCatalogLookupSession(); - $this->view->catalogs = $lookupSession->getCourseCatalogs(); - $this->view->title = 'Available Catalogs'; - $this->view->headTitle($this->view->title); + return $this->render('catalogs.html.twig', [ + 'title' => 'Available Catalogs', + 'catalogs' => $lookupSession->getCourseCatalogs(), + ]); } /** From c9c5d4c9844da3641c5e3734098c283604d1a6bf Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 24 Sep 2024 15:53:23 -0400 Subject: [PATCH 004/173] #47: Remove +SymLinksIfOwnerMatch directive that is breaking on toboggan. --- public/.htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/.htaccess b/public/.htaccess index f7345dfb..5351ee42 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -20,7 +20,7 @@ DirectoryIndex index.php # This Option needs to be enabled for RewriteRule, otherwise it will show an error like # 'Options FollowSymLinks or SymLinksIfOwnerMatch is off which implies that RewriteRule directive is forbidden' - Options +SymLinksIfOwnerMatch + # Options +SymLinksIfOwnerMatch RewriteEngine On From 1021e4547c4773aa8aa1296647a9c3643ad0a8dc Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 24 Sep 2024 15:55:22 -0400 Subject: [PATCH 005/173] #47: Wire up a new osid.runtime service to access the OSID API. --- .../resources/Catalog/Action/Helper/Osid.php | 91 --------------- config/services.yaml | 10 ++ src/Controller/Catalogs.php | 18 ++- src/Service/Osid/Runtime.php | 106 ++++++++++++++++++ 4 files changed, 133 insertions(+), 92 deletions(-) delete mode 100755 application/resources/Catalog/Action/Helper/Osid.php create mode 100644 src/Service/Osid/Runtime.php diff --git a/application/resources/Catalog/Action/Helper/Osid.php b/application/resources/Catalog/Action/Helper/Osid.php deleted file mode 100755 index c7f728a4..00000000 --- a/application/resources/Catalog/Action/Helper/Osid.php +++ /dev/null @@ -1,91 +0,0 @@ -getRuntimeManager(); - - $config = Zend_Registry::getInstance()->config; - if (!isset($config->osid->course_impl) || !strlen(trim($config->osid->course_impl))) { - $implClass = 'banner_course_CourseManager'; - } else { - $implClass = $config->osid->course_impl; - } - - self::$courseManager = $runtimeManager->getManager(osid_OSID::COURSE(), $implClass, '3.0.0'); - } - - return self::$courseManager; - } - - /** - * Answer the Runtime Manager. - * - * @return osid_OsidRuntimeManager - * - * @since 4/20/09 - */ - public function getRuntimeManager() - { - if (!isset(self::$runtimeManager)) { - self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager($this->getConfigPath()); - } - - return self::$runtimeManager; - } -} diff --git a/config/services.yaml b/config/services.yaml index 2d6a76f9..f74c9d3e 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -4,6 +4,7 @@ # Put parameters here that don't need to change on each machine where the app is deployed # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration parameters: + app.osid.runtime.courseimpl: 'banner_course_CourseManager' services: # default configuration for services in *this* file @@ -22,3 +23,12 @@ services: # add more service definitions when explicit configuration is needed # please note that last definitions always *replace* previous ones + + App\Service\Osid\Runtime: + arguments: + $configPath: '../configuration.plist' + $courseImpl: '%app.osid.runtime.courseimpl%' + + # Service aliases. + osid.runtime: + class: App\Service\Osid\Runtime diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index 4f70bfd4..e7c5f3ac 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -8,6 +8,7 @@ namespace App\Controller; +use App\Service\Osid\Runtime; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -23,10 +24,25 @@ class Catalogs extends AbstractController { + /** + * @var \App\Service\Osid\Runtime + */ + private $osidRuntime; + + /** + * Construct a new Catalogs controller. + * + * @param \App\Service\Osid\Runtime $osidRuntime + * The osid.runtime service. + */ + public function __construct(Runtime $osidRuntime) { + $this->osidRuntime = $osidRuntime; + } + #[Route('/catalogs/', name: 'List all catalogs')] public function listAction() { - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseCatalogLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); return $this->render('catalogs.html.twig', [ 'title' => 'Available Catalogs', diff --git a/src/Service/Osid/Runtime.php b/src/Service/Osid/Runtime.php new file mode 100644 index 00000000..583b7826 --- /dev/null +++ b/src/Service/Osid/Runtime.php @@ -0,0 +1,106 @@ +setConfigPath($configPath); + $this->courseImpl = $courseImpl; + } + + /** + * Answer the configuration path. + * + * @return string + * + * @since 6/11/09 + */ + public function getConfigPath() + { + if (!isset($this->configPath)) { + $this->configPath = BASE_PATH.'/configuration.plist'; + } + + return $this->configPath; + } + + /** + * Set the configuration path. + * + * @param string $path + * + * @since 6/11/09 + * + * @throws osid_IllegalStateException the config path has already been set + */ + public function setConfigPath($path) + { + if (isset($this->configPath) && $this->configPath != $path) { + throw new osid_IllegalStateException('the config path has already been set'); + } + + $this->configPath = $path; + } + + /** + * Answer the CourseManager. + * + * @return osid_course_CourseManager + * + * @since 4/20/09 + */ + public function getCourseManager() + { + if (!isset($this->courseManager)) { + if (class_exists($this->courseImpl)) { + $runtimeManager = $this->getRuntimeManager(); + $this->courseManager = $runtimeManager->getManager(osid_OSID::COURSE(), $this->courseImpl, '3.0.0'); + } + else { + throw new \InvalidArgumentException("Unknown CourseManger implementation class: " . $this->courseImpl); + } + + } + + return $this->courseManager; + } + + /** + * Answer the Runtime Manager. + * + * @return osid_OsidRuntimeManager + * + * @since 4/20/09 + */ + public function getRuntimeManager() + { + if (!isset($this->runtimeManager)) { + $this->runtimeManager = new phpkit_AutoloadOsidRuntimeManager($this->getConfigPath()); + } + + return $this->runtimeManager; + } +} From c3ef1d0429c5ccf05779c0ace6f8ab1be51c97fb Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 25 Sep 2024 11:03:28 -0400 Subject: [PATCH 006/173] #47: Use PSR-0 autoloading for osid-phpkit. --- composer.json | 4 + composer.lock | 146 +++++++++++++++++------------------ src/Service/Osid/Runtime.php | 6 +- 3 files changed, 80 insertions(+), 76 deletions(-) diff --git a/composer.json b/composer.json index 099b23c0..69741bf5 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,10 @@ "autoload": { "psr-4": { "App\\": "src/" + }, + "psr-0": { + "osid_": "library/osid-phpkit/", + "phpkit_": "library/osid-phpkit/" } }, "autoload-dev": { diff --git a/composer.lock b/composer.lock index f0907640..dceee8e9 100644 --- a/composer.lock +++ b/composer.lock @@ -2329,16 +2329,16 @@ }, { "name": "symfony/cache", - "version": "v6.4.11", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "36daef8fce88fe0b9a4f8cf4c342ced5c05616dc" + "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/36daef8fce88fe0b9a4f8cf4c342ced5c05616dc", - "reference": "36daef8fce88fe0b9a4f8cf4c342ced5c05616dc", + "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", + "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", "shasum": "" }, "require": { @@ -2405,7 +2405,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.11" + "source": "https://github.com/symfony/cache/tree/v6.4.12" }, "funding": [ { @@ -2421,7 +2421,7 @@ "type": "tidelift" } ], - "time": "2024-08-05T07:40:31+00:00" + "time": "2024-09-16T16:01:33+00:00" }, { "name": "symfony/cache-contracts", @@ -2576,16 +2576,16 @@ }, { "name": "symfony/console", - "version": "v6.4.11", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998" + "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/42686880adaacdad1835ee8fc2a9ec5b7bd63998", - "reference": "42686880adaacdad1835ee8fc2a9ec5b7bd63998", + "url": "https://api.github.com/repos/symfony/console/zipball/72d080eb9edf80e36c19be61f72c98ed8273b765", + "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765", "shasum": "" }, "require": { @@ -2650,7 +2650,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.11" + "source": "https://github.com/symfony/console/tree/v6.4.12" }, "funding": [ { @@ -2666,20 +2666,20 @@ "type": "tidelift" } ], - "time": "2024-08-15T22:48:29+00:00" + "time": "2024-09-20T08:15:52+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.11", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "e93c8368dc9915c2fe12018ff22fcbbdd32c9a9e" + "reference": "cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/e93c8368dc9915c2fe12018ff22fcbbdd32c9a9e", - "reference": "e93c8368dc9915c2fe12018ff22fcbbdd32c9a9e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e", + "reference": "cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e", "shasum": "" }, "require": { @@ -2731,7 +2731,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.11" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.12" }, "funding": [ { @@ -2747,7 +2747,7 @@ "type": "tidelift" } ], - "time": "2024-08-29T08:15:38+00:00" + "time": "2024-09-20T08:18:25+00:00" }, { "name": "symfony/deprecation-contracts", @@ -2818,16 +2818,16 @@ }, { "name": "symfony/dotenv", - "version": "v6.4.10", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "2ae0c84cc9be0dc1eeb86016970b63c764d8472e" + "reference": "815284236cab7d8e1280f53bf562c07a4dfe5954" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/2ae0c84cc9be0dc1eeb86016970b63c764d8472e", - "reference": "2ae0c84cc9be0dc1eeb86016970b63c764d8472e", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/815284236cab7d8e1280f53bf562c07a4dfe5954", + "reference": "815284236cab7d8e1280f53bf562c07a4dfe5954", "shasum": "" }, "require": { @@ -2872,7 +2872,7 @@ "environment" ], "support": { - "source": "https://github.com/symfony/dotenv/tree/v6.4.10" + "source": "https://github.com/symfony/dotenv/tree/v6.4.12" }, "funding": [ { @@ -2888,7 +2888,7 @@ "type": "tidelift" } ], - "time": "2024-07-09T18:29:35+00:00" + "time": "2024-09-16T16:01:33+00:00" }, { "name": "symfony/error-handler", @@ -3123,16 +3123,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.9", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "b51ef8059159330b74a4d52f68e671033c0fe463" + "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/b51ef8059159330b74a4d52f68e671033c0fe463", - "reference": "b51ef8059159330b74a4d52f68e671033c0fe463", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/f810e3cbdf7fdc35983968523d09f349fa9ada12", + "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12", "shasum": "" }, "require": { @@ -3169,7 +3169,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.9" + "source": "https://github.com/symfony/filesystem/tree/v6.4.12" }, "funding": [ { @@ -3185,7 +3185,7 @@ "type": "tidelift" } ], - "time": "2024-06-28T09:49:33+00:00" + "time": "2024-09-16T16:01:33+00:00" }, { "name": "symfony/finder", @@ -3318,16 +3318,16 @@ }, { "name": "symfony/framework-bundle", - "version": "v6.4.10", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "6cbdb0cc3ddbb63499262cd3036882b08ee2690b" + "reference": "6a9665bd1fae37b198429775c6132f193339434f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/6cbdb0cc3ddbb63499262cd3036882b08ee2690b", - "reference": "6cbdb0cc3ddbb63499262cd3036882b08ee2690b", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/6a9665bd1fae37b198429775c6132f193339434f", + "reference": "6a9665bd1fae37b198429775c6132f193339434f", "shasum": "" }, "require": { @@ -3336,7 +3336,7 @@ "php": ">=8.1", "symfony/cache": "^5.4|^6.0|^7.0", "symfony/config": "^6.1|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4.12|^7.0", "symfony/deprecation-contracts": "^2.5|^3", "symfony/error-handler": "^6.1|^7.0", "symfony/event-dispatcher": "^5.4|^6.0|^7.0", @@ -3446,7 +3446,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.4.10" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.12" }, "funding": [ { @@ -3462,20 +3462,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T13:24:20+00:00" + "time": "2024-09-20T13:34:56+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.4.10", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b" + "reference": "133ac043875f59c26c55e79cf074562127cce4d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/117f1f20a7ade7bcea28b861fb79160a21a1e37b", - "reference": "117f1f20a7ade7bcea28b861fb79160a21a1e37b", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/133ac043875f59c26c55e79cf074562127cce4d2", + "reference": "133ac043875f59c26c55e79cf074562127cce4d2", "shasum": "" }, "require": { @@ -3523,7 +3523,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.10" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.12" }, "funding": [ { @@ -3539,20 +3539,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:36:27+00:00" + "time": "2024-09-20T08:18:25+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.11", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "1ba6b89d781cb47448155cc70dd2e0f1b0584c79" + "reference": "96df83d51b5f78804f70c093b97310794fd6257b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/1ba6b89d781cb47448155cc70dd2e0f1b0584c79", - "reference": "1ba6b89d781cb47448155cc70dd2e0f1b0584c79", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96df83d51b5f78804f70c093b97310794fd6257b", + "reference": "96df83d51b5f78804f70c093b97310794fd6257b", "shasum": "" }, "require": { @@ -3637,7 +3637,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.11" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.12" }, "funding": [ { @@ -3653,7 +3653,7 @@ "type": "tidelift" } ], - "time": "2024-08-30T16:57:20+00:00" + "time": "2024-09-21T06:02:57+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -4048,16 +4048,16 @@ }, { "name": "symfony/routing", - "version": "v6.4.11", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a" + "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a", - "reference": "8ee0c24c1bf61c263a26f1b9b6d19e83b1121f2a", + "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f", + "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f", "shasum": "" }, "require": { @@ -4111,7 +4111,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.11" + "source": "https://github.com/symfony/routing/tree/v6.4.12" }, "funding": [ { @@ -4127,20 +4127,20 @@ "type": "tidelift" } ], - "time": "2024-08-29T08:15:38+00:00" + "time": "2024-09-20T08:32:26+00:00" }, { "name": "symfony/runtime", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/runtime.git", - "reference": "b4bfa2fd4cad1fee62f80b3dfe4eb674cc3302a0" + "reference": "bfe32a1adf41da4dd7f6b939a039779d7af5497f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/runtime/zipball/b4bfa2fd4cad1fee62f80b3dfe4eb674cc3302a0", - "reference": "b4bfa2fd4cad1fee62f80b3dfe4eb674cc3302a0", + "url": "https://api.github.com/repos/symfony/runtime/zipball/bfe32a1adf41da4dd7f6b939a039779d7af5497f", + "reference": "bfe32a1adf41da4dd7f6b939a039779d7af5497f", "shasum": "" }, "require": { @@ -4190,7 +4190,7 @@ "runtime" ], "support": { - "source": "https://github.com/symfony/runtime/tree/v6.4.8" + "source": "https://github.com/symfony/runtime/tree/v6.4.12" }, "funding": [ { @@ -4206,7 +4206,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-19T13:29:10+00:00" }, { "name": "symfony/service-contracts", @@ -4293,16 +4293,16 @@ }, { "name": "symfony/string", - "version": "v6.4.11", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "5bc3eb632cf9c8dbfd6529d89be9950d1518883b" + "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/5bc3eb632cf9c8dbfd6529d89be9950d1518883b", - "reference": "5bc3eb632cf9c8dbfd6529d89be9950d1518883b", + "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b", + "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b", "shasum": "" }, "require": { @@ -4359,7 +4359,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.11" + "source": "https://github.com/symfony/string/tree/v6.4.12" }, "funding": [ { @@ -4375,7 +4375,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T09:55:28+00:00" + "time": "2024-09-20T08:15:52+00:00" }, { "name": "symfony/var-dumper", @@ -4541,16 +4541,16 @@ }, { "name": "symfony/yaml", - "version": "v6.4.11", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "be37e7f13195e05ab84ca5269365591edd240335" + "reference": "762ee56b2649659380e0ef4d592d807bc17b7971" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/be37e7f13195e05ab84ca5269365591edd240335", - "reference": "be37e7f13195e05ab84ca5269365591edd240335", + "url": "https://api.github.com/repos/symfony/yaml/zipball/762ee56b2649659380e0ef4d592d807bc17b7971", + "reference": "762ee56b2649659380e0ef4d592d807bc17b7971", "shasum": "" }, "require": { @@ -4593,7 +4593,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.11" + "source": "https://github.com/symfony/yaml/tree/v6.4.12" }, "funding": [ { @@ -4609,7 +4609,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T09:55:28+00:00" + "time": "2024-09-17T12:47:12+00:00" } ], "packages-dev": [], diff --git a/src/Service/Osid/Runtime.php b/src/Service/Osid/Runtime.php index 583b7826..bd7f9fa0 100644 --- a/src/Service/Osid/Runtime.php +++ b/src/Service/Osid/Runtime.php @@ -59,7 +59,7 @@ public function getConfigPath() public function setConfigPath($path) { if (isset($this->configPath) && $this->configPath != $path) { - throw new osid_IllegalStateException('the config path has already been set'); + throw new \osid_IllegalStateException('the config path has already been set'); } $this->configPath = $path; @@ -77,7 +77,7 @@ public function getCourseManager() if (!isset($this->courseManager)) { if (class_exists($this->courseImpl)) { $runtimeManager = $this->getRuntimeManager(); - $this->courseManager = $runtimeManager->getManager(osid_OSID::COURSE(), $this->courseImpl, '3.0.0'); + $this->courseManager = $runtimeManager->getManager(\osid_OSID::COURSE(), $this->courseImpl, '3.0.0'); } else { throw new \InvalidArgumentException("Unknown CourseManger implementation class: " . $this->courseImpl); @@ -98,7 +98,7 @@ public function getCourseManager() public function getRuntimeManager() { if (!isset($this->runtimeManager)) { - $this->runtimeManager = new phpkit_AutoloadOsidRuntimeManager($this->getConfigPath()); + $this->runtimeManager = new \phpkit_AutoloadOsidRuntimeManager($this->getConfigPath()); } return $this->runtimeManager; From 7dc2c46cfb4bbeb3b9d3eb793e429204092dfb64 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 25 Sep 2024 11:42:44 -0400 Subject: [PATCH 007/173] #47: Use PSR-0 autoloading for existing code in application/library/ For now we can skip any reorganization, addition of namespaces, and other refactoring of the main data model while getting controllers and views ported over to Symfony. --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 69741bf5..5e3c3eeb 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,8 @@ }, "psr-0": { "osid_": "library/osid-phpkit/", - "phpkit_": "library/osid-phpkit/" + "phpkit_": "library/osid-phpkit/", + "": "application/library/" } }, "autoload-dev": { From 397f6ecc62cc310ab16b2c3cbe4447b9505a15bb Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 25 Sep 2024 11:44:14 -0400 Subject: [PATCH 008/173] #47: Add symfony/twig-bundle for rendering suppport. --- composer.json | 1 + composer.lock | 352 +++++++++++++++++++++++++++++++++++++- config/bundles.php | 1 + config/packages/twig.yaml | 6 + symfony.lock | 13 ++ templates/base.html.twig | 16 ++ 6 files changed, 388 insertions(+), 1 deletion(-) create mode 100644 config/packages/twig.yaml create mode 100644 templates/base.html.twig diff --git a/composer.json b/composer.json index 5e3c3eeb..b49cb3a4 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ "symfony/flex": "^2", "symfony/framework-bundle": "6.4.*", "symfony/runtime": "6.4.*", + "symfony/twig-bundle": "6.4.*", "symfony/yaml": "6.4.*" }, "config": { diff --git a/composer.lock b/composer.lock index dceee8e9..053673a8 100644 --- a/composer.lock +++ b/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": "8325de776499155bdf6bc928f31e19d4", + "content-hash": "8e58fec512db5cf782477222ccddae8e", "packages": [ { "name": "brick/math", @@ -4377,6 +4377,277 @@ ], "time": "2024-09-20T08:15:52+00:00" }, + { + "name": "symfony/translation-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation-contracts.git", + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to translation", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/twig-bridge", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/twig-bridge.git", + "reference": "09c0df13f822a1b80c5972ca1aa9eeb1288e1194" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/09c0df13f822a1b80c5972ca1aa9eeb1288e1194", + "reference": "09c0df13f822a1b80c5972ca1aa9eeb1288e1194", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/translation-contracts": "^2.5|^3", + "twig/twig": "^2.13|^3.0.4" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/console": "<5.4", + "symfony/form": "<6.3", + "symfony/http-foundation": "<5.4", + "symfony/http-kernel": "<6.4", + "symfony/mime": "<6.2", + "symfony/serializer": "<6.4", + "symfony/translation": "<5.4", + "symfony/workflow": "<5.4" + }, + "require-dev": { + "egulias/email-validator": "^2.1.10|^3|^4", + "league/html-to-markdown": "^5.0", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/asset-mapper": "^6.3|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/form": "^6.4|^7.0", + "symfony/html-sanitizer": "^6.1|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", + "symfony/polyfill-intl-icu": "~1.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/security-acl": "^2.8|^3.0", + "symfony/security-core": "^5.4|^6.0|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/security-http": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4.3|^7.0.3", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^6.1|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0", + "symfony/workflow": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", + "twig/cssinliner-extra": "^2.12|^3", + "twig/inky-extra": "^2.12|^3", + "twig/markdown-extra": "^2.12|^3" + }, + "type": "symfony-bridge", + "autoload": { + "psr-4": { + "Symfony\\Bridge\\Twig\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides integration for Twig with various Symfony components", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-15T06:35:36+00:00" + }, + { + "name": "symfony/twig-bundle", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/twig-bundle.git", + "reference": "4e63369647e3924e110b37337c6a58aac3086ad4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/4e63369647e3924e110b37337c6a58aac3086ad4", + "reference": "4e63369647e3924e110b37337c6a58aac3086ad4", + "shasum": "" + }, + "require": { + "composer-runtime-api": ">=2.1", + "php": ">=8.1", + "symfony/config": "^6.1|^7.0", + "symfony/dependency-injection": "^6.1|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^6.2", + "symfony/twig-bridge": "^6.4", + "twig/twig": "^2.13|^3.0.4" + }, + "conflict": { + "symfony/framework-bundle": "<5.4", + "symfony/translation": "<5.4" + }, + "require-dev": { + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/form": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Symfony\\Bundle\\TwigBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a tight integration of Twig into the Symfony full-stack framework", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/twig-bundle/tree/v6.4.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-08T12:30:05+00:00" + }, { "name": "symfony/var-dumper", "version": "v6.4.11", @@ -4610,6 +4881,85 @@ } ], "time": "2024-09-17T12:47:12+00:00" + }, + { + "name": "twig/twig", + "version": "v3.14.0", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "shasum": "" + }, + "require": { + "php": ">=8.0.2", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php81": "^1.29" + }, + "require-dev": { + "psr/container": "^1.0|^2.0", + "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "src/Resources/core.php", + "src/Resources/debug.php", + "src/Resources/escaper.php", + "src/Resources/string_loader.php" + ], + "psr-4": { + "Twig\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Twig Team", + "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "https://twig.symfony.com", + "keywords": [ + "templating" + ], + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v3.14.0" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2024-09-09T17:55:12+00:00" } ], "packages-dev": [], diff --git a/config/bundles.php b/config/bundles.php index 49d3fb6f..bdd37acd 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -2,4 +2,5 @@ return [ Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], + Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], ]; diff --git a/config/packages/twig.yaml b/config/packages/twig.yaml new file mode 100644 index 00000000..3f795d92 --- /dev/null +++ b/config/packages/twig.yaml @@ -0,0 +1,6 @@ +twig: + file_name_pattern: '*.twig' + +when@test: + twig: + strict_variables: true diff --git a/symfony.lock b/symfony.lock index 9390dfe7..e2f9854a 100644 --- a/symfony.lock +++ b/symfony.lock @@ -87,5 +87,18 @@ "config/packages/routing.yaml", "config/routes.yaml" ] + }, + "symfony/twig-bundle": { + "version": "6.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "6.4", + "ref": "cab5fd2a13a45c266d45a7d9337e28dee6272877" + }, + "files": [ + "config/packages/twig.yaml", + "templates/base.html.twig" + ] } } diff --git a/templates/base.html.twig b/templates/base.html.twig new file mode 100644 index 00000000..1069c147 --- /dev/null +++ b/templates/base.html.twig @@ -0,0 +1,16 @@ + + + + + {% block title %}Welcome!{% endblock %} + + {% block stylesheets %} + {% endblock %} + + {% block javascripts %} + {% endblock %} + + + {% block body %}{% endblock %} + + From 2f817fd3818c3a5ca9b2d49983a1d7dea4c4918a Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 25 Sep 2024 16:19:15 -0400 Subject: [PATCH 009/173] #47: Build out catalog listing template and action. --- .../Action/Helper/AbstractOsidIdentifier.php | 36 -------------- application/views/scripts/catalogs/list.phtml | 10 ---- config/services.yaml | 13 +++++ src/Controller/Catalogs.php | 23 ++++++++- .../Osid/AbstractOsidIdentifierMap.php | 48 +++++++++++++++++++ .../OsidId.php => src/Service/Osid/IdMap.php | 17 +++---- .../Service/Osid/TypeMap.php | 16 +++---- templates/catalogs.html.twig | 4 ++ 8 files changed, 103 insertions(+), 64 deletions(-) delete mode 100755 application/resources/Catalog/Action/Helper/AbstractOsidIdentifier.php delete mode 100755 application/views/scripts/catalogs/list.phtml create mode 100755 src/Service/Osid/AbstractOsidIdentifierMap.php rename application/resources/Catalog/Action/Helper/OsidId.php => src/Service/Osid/IdMap.php (70%) rename application/resources/Catalog/Action/Helper/OsidType.php => src/Service/Osid/TypeMap.php (69%) create mode 100755 templates/catalogs.html.twig diff --git a/application/resources/Catalog/Action/Helper/AbstractOsidIdentifier.php b/application/resources/Catalog/Action/Helper/AbstractOsidIdentifier.php deleted file mode 100755 index 5e25f935..00000000 --- a/application/resources/Catalog/Action/Helper/AbstractOsidIdentifier.php +++ /dev/null @@ -1,36 +0,0 @@ -config; - $authority = (string) $config->catalog->shorten_ids_for_authority; - if (strlen($authority)) { - self::$idAuthorityToShorten = $authority; - } else { - self::$idAuthorityToShorten = false; - } - } - - return self::$idAuthorityToShorten; - } -} diff --git a/application/views/scripts/catalogs/list.phtml b/application/views/scripts/catalogs/list.phtml deleted file mode 100755 index e65604fb..00000000 --- a/application/views/scripts/catalogs/list.phtml +++ /dev/null @@ -1,10 +0,0 @@ - 'catalogs', - 'action' => 'view'); - -while ($this->catalogs->hasNext()) { - $catalog = $this->catalogs->getNextCourseCatalog(); - $params['catalog'] = $this->getStringFromOsidId($catalog->getId()); - print "\n\t

".$catalog->getDisplayName()."

"; - print "\n\t
".$catalog->getDescription()."
"; -} diff --git a/config/services.yaml b/config/services.yaml index f74c9d3e..70e52634 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -5,6 +5,7 @@ # https://symfony.com/doc/current/best_practices.html#use-parameters-for-application-configuration parameters: app.osid.runtime.courseimpl: 'banner_course_CourseManager' + app.osid.id.authority_to_shorten: 'middlebury.edu' services: # default configuration for services in *this* file @@ -29,6 +30,18 @@ services: $configPath: '../configuration.plist' $courseImpl: '%app.osid.runtime.courseimpl%' + App\Service\Osid\IdMap: + arguments: + $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' + + App\Service\Osid\TypeMap: + arguments: + $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' + # Service aliases. osid.runtime: class: App\Service\Osid\Runtime + osid.id_map: + class: App\Service\Osid\IdMap + osid.type_map: + class: App\Service\Osid\TypeMap diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index e7c5f3ac..ebf61a5e 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -9,6 +9,7 @@ namespace App\Controller; use App\Service\Osid\Runtime; +use App\Service\Osid\IdMap; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -29,14 +30,22 @@ class Catalogs extends AbstractController */ private $osidRuntime; + /** + * @var \App\Service\Osid\IdMap + */ + private $osidIdMap; + /** * Construct a new Catalogs controller. * * @param \App\Service\Osid\Runtime $osidRuntime * The osid.runtime service. + * @param \App\Service\Osid\Identifier $osidIdentifier + * The osid.identifier service. */ - public function __construct(Runtime $osidRuntime) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap) { $this->osidRuntime = $osidRuntime; + $this->osidIdMap = $osidIdMap; } #[Route('/catalogs/', name: 'List all catalogs')] @@ -44,9 +53,19 @@ public function listAction() { $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); + $catalogs = $lookupSession->getCourseCatalogs(); + $catalogData = []; + while ($catalogs->hasNext()) { + $catalog = $catalogs->getNextCourseCatalog(); + $catalogData[] = [ + "id" => $this->osidIdMap->toString($catalog->getId()), + "display_name" => $catalog->getDisplayName(), + "description" => $catalog->getDescription(), + ]; + } return $this->render('catalogs.html.twig', [ 'title' => 'Available Catalogs', - 'catalogs' => $lookupSession->getCourseCatalogs(), + 'catalogs' => $catalogData, ]); } diff --git a/src/Service/Osid/AbstractOsidIdentifierMap.php b/src/Service/Osid/AbstractOsidIdentifierMap.php new file mode 100755 index 00000000..6c273191 --- /dev/null +++ b/src/Service/Osid/AbstractOsidIdentifierMap.php @@ -0,0 +1,48 @@ +idAuthorityToShorten = $idAuthorityToShorten; + } + + /** + * Answer the id-authority for whom ids should be shortened. + * + * @return mixed string or false if none should be shortened + * + * @since 6/16/09 + */ + protected function getIdAuthorityToShorten() + { + if (isset($this->idAuthorityToShorten)) { + return $this->idAuthorityToShorten; + } + else { + return FALSE; + } + } + +} diff --git a/application/resources/Catalog/Action/Helper/OsidId.php b/src/Service/Osid/IdMap.php similarity index 70% rename from application/resources/Catalog/Action/Helper/OsidId.php rename to src/Service/Osid/IdMap.php index 17f225f0..c22f7007 100755 --- a/application/resources/Catalog/Action/Helper/OsidId.php +++ b/src/Service/Osid/IdMap.php @@ -1,15 +1,16 @@ getIdAuthorityToShorten()) { - return new phpkit_id_Id($this->getIdAuthorityToShorten(), 'urn', $idString); + return new \phpkit_id_Id($this->getIdAuthorityToShorten(), 'urn', $idString); } else { throw $e; } @@ -39,14 +40,14 @@ public function fromString($idString) * * @since 4/21/09 */ - public function toString(osid_id_Id $id) + public function toString(\osid_id_Id $id) { if ($this->getIdAuthorityToShorten() && 'urn' == strtolower($id->getIdentifierNamespace()) && strtolower($id->getAuthority()) == $this->getIdAuthorityToShorten()) { return $id->getIdentifier(); } else { - return phpkit_id_URNInetId::getInetURNString($id); + return \phpkit_id_URNInetId::getInetURNString($id); } } } diff --git a/application/resources/Catalog/Action/Helper/OsidType.php b/src/Service/Osid/TypeMap.php similarity index 69% rename from application/resources/Catalog/Action/Helper/OsidType.php rename to src/Service/Osid/TypeMap.php index 26120029..584defac 100755 --- a/application/resources/Catalog/Action/Helper/OsidType.php +++ b/src/Service/Osid/TypeMap.php @@ -1,14 +1,14 @@ getIdAuthorityToShorten()) { - return new phpkit_type_Type('urn', $this->getIdAuthorityToShorten(), $idString); + return new \phpkit_type_Type('urn', $this->getIdAuthorityToShorten(), $idString); } else { throw $e; } @@ -39,14 +39,14 @@ public function fromString($idString) * * @since 4/21/09 */ - public function toString(osid_type_Type $type) + public function toString(\osid_type_Type $type) { if ($this->getIdAuthorityToShorten() && 'urn' == strtolower($type->getIdentifierNamespace()) && strtolower($type->getAuthority()) == $this->getIdAuthorityToShorten()) { return $type->getIdentifier(); } else { - return phpkit_type_URNInetType::getInetURNString($type); + return \phpkit_type_URNInetType::getInetURNString($type); } } } diff --git a/templates/catalogs.html.twig b/templates/catalogs.html.twig new file mode 100755 index 00000000..e34022c4 --- /dev/null +++ b/templates/catalogs.html.twig @@ -0,0 +1,4 @@ +{% for catalog in catalogs %} +

{{ catalog.display_name }}

+
{{ catalog.description }}
+{% endfor %} From 7d015dbca2517a233e7f7fa23c8d5168c3ea3a4a Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 26 Sep 2024 14:06:00 -0400 Subject: [PATCH 010/173] Add Lando config to set up local dev environment. --- .lando.yml | 39 +++++++++++++++++++++++++++++++++++++++ README.md | 34 +++++++++++++++++++++++++++++----- 2 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 .lando.yml diff --git a/.lando.yml b/.lando.yml new file mode 100644 index 00000000..24aa9b52 --- /dev/null +++ b/.lando.yml @@ -0,0 +1,39 @@ +name: coursecatalog +recipe: symfony +config: + webroot: public + php: 8.1 +services: + appserver: + build_as_root: + - apt update + - mkdir /opt/oracle + # Fetch binaries directly from Oracle: + # https://www.oracle.com/database/technologies/instant-client/downloads.html + - curl https://download.oracle.com/otn_software/linux/instantclient/191000/instantclient-basic-linux.arm64-19.10.0.0.0dbru-2.zip > /opt/oracle/instantclient-basic.zip + - curl https://download.oracle.com/otn_software/linux/instantclient/191000/instantclient-sdk-linux.arm64-19.10.0.0.0dbru.zip > /opt/oracle/instantclient-sdk.zip + # Unzip + - unzip /opt/oracle/instantclient-basic.zip -d /opt/oracle + - unzip /opt/oracle/instantclient-sdk.zip -d /opt/oracle + # Add sqlplus command line Oracle client for debugging. + - curl https://download.oracle.com/otn_software/linux/instantclient/191000/instantclient-sqlplus-linux.arm64-19.10.0.0.0dbru.zip > /opt/oracle/instantclient-sqlplus.zip + - unzip /opt/oracle/instantclient-sqlplus.zip -d /opt/oracle + # Delete all of our downloads. + - rm /opt/oracle/*.zip + # Make OS aware of newly installed libraries + - echo /opt/oracle/instantclient_19_10 > /etc/ld.so.conf.d/oracle-instantclient.conf + - ldconfig -v + # Set the interpreter for the Oracle command-line tools. + # See: https://askubuntu.com/questions/1397724/no-such-file-or-directory-when-running-sqlplus-command + # This is not needed for the Oci8 PHP extension itself, but is needed to + # get sqlplus command-line Oracle client working for debugging. + - apt -y install patchelf + - patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 /opt/oracle/instantclient_19_10/adrci + - patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 /opt/oracle/instantclient_19_10/genezi + - patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 /opt/oracle/instantclient_19_10/sqlplus + - patchelf --set-interpreter /lib/ld-linux-aarch64.so.1 /opt/oracle/instantclient_19_10/uidrvci + # Install libaio1 -- when missing was preventing the extension from loading. + - apt install libaio1 + # Install and enable OCI8 + - echo "instantclient,/opt/oracle/instantclient_19_10" | pecl install oci8-3.2.1 + - docker-php-ext-enable oci8 diff --git a/README.md b/README.md index 92005a27..1235ac72 100644 --- a/README.md +++ b/README.md @@ -39,16 +39,40 @@ These instructions assume that you have a POSIX machine running Apache with PHP cd coursecatalog git-submodule update --init --recursive ``` -3. Make a symbolic link to the `coursecatalog/docroot/` directory in a web-accessible directory or add a virtualhost rooted in the `coursecatalog/docroot/` directory. -4. Create a MySQL database for the catalogs data and a cache of Banner data. -5. Make copies of the example config files at `configuration.plist`, `frontend_config.ini`, and `update_config.ini` and edit values to match your environment. -6. Create the database tables defined in `application/library/banner/course/sql/table_creation.sql` -7. Run the script at `bin/update-from-banner.php` to dump Banner data into the the MySQL database: +3. Install additional dependencies with Composer: + ``` + composer install + ``` +4. Make a symbolic link to the `coursecatalog/docroot/` directory in a web-accessible directory or add a virtualhost rooted in the `coursecatalog/docroot/` directory. +5. Create a MySQL database for the catalogs data and a cache of Banner data. +6. Make copies of the example config files at `configuration.plist`, `frontend_config.ini`, and `update_config.ini` and edit values to match your environment. +7. Create the database tables defined in `application/library/banner/course/sql/table_creation.sql` +8. Run the script at `bin/update-from-banner.php` to dump Banner data into the the MySQL database: ``` php bin/update-from-banner.php php bin/build_indices.php ``` +## Development environment setup + +### Lando +Install Docker and Lando to provide a local containerized environment + +In the code directory, start the local containers with `lando start` + +### Copying the production database +Dump the production database to a non version-controlled file path like `var/catalog_prod.sql`. + +Strip out any `DEFINER` statements that will break the import: +``` +sed -i '' 's/DEFINER=[^*]*\*/\*/g' var/catalog_prod.sql +``` + +Import the database into the local container: +``` +lando db-import var/catalog_prod.sql +``` + Unit Tests ---------- From 3a902308dbb608f99a9256ec3fe95fa68785895a Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 26 Sep 2024 17:10:49 -0400 Subject: [PATCH 011/173] #47: Add PHPUnit as a dev dependency. --- .env.test | 6 + .gitignore | 10 + application/test/banner/configuration.plist | 6 +- bin/phpunit | 23 + composer.json | 6 + composer.lock | 2097 ++++++++++++++++++- phpunit.xml.dist | 38 + symfony.lock | 29 + tests/bootstrap.php | 13 + 9 files changed, 2222 insertions(+), 6 deletions(-) create mode 100644 .env.test create mode 100755 bin/phpunit create mode 100644 phpunit.xml.dist create mode 100644 tests/bootstrap.php diff --git a/.env.test b/.env.test new file mode 100644 index 00000000..9e7162f0 --- /dev/null +++ b/.env.test @@ -0,0 +1,6 @@ +# define your env variables for the test env here +KERNEL_CLASS='App\Kernel' +APP_SECRET='$ecretf0rt3st' +SYMFONY_DEPRECATIONS_HELPER=999999 +PANTHER_APP_ENV=panther +PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots diff --git a/.gitignore b/.gitignore index 92027b3a..5b53f395 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,13 @@ vendor/ /var/ /vendor/ ###< symfony/framework-bundle ### + +###> symfony/phpunit-bridge ### +.phpunit.result.cache +/phpunit.xml +###< symfony/phpunit-bridge ### + +###> phpunit/phpunit ### +/phpunit.xml +.phpunit.result.cache +###< phpunit/phpunit ### diff --git a/application/test/banner/configuration.plist b/application/test/banner/configuration.plist index 81e4df0b..1feea851 100755 --- a/application/test/banner/configuration.plist +++ b/application/test/banner/configuration.plist @@ -7,11 +7,11 @@ urn:inet:middlebury.edu:config:banner_course/pdo_count_queries urn:inet:middlebury.edu:config:banner_course/pdo_dsn - mysql:dbname=afranco_catalog_test;host=localhost + mysql:dbname=symfony_test;host=database urn:inet:middlebury.edu:config:banner_course/pdo_password - testpassword + symfony urn:inet:middlebury.edu:config:banner_course/pdo_username - testuser + symfony urn:inet:middlebury.edu:config:apc_course/impl_class_name banner_course_CourseManager diff --git a/bin/phpunit b/bin/phpunit new file mode 100755 index 00000000..692baccb --- /dev/null +++ b/bin/phpunit @@ -0,0 +1,23 @@ +#!/usr/bin/env php += 80000) { + require dirname(__DIR__).'/vendor/phpunit/phpunit/phpunit'; + } else { + define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__).'/vendor/autoload.php'); + require PHPUNIT_COMPOSER_INSTALL; + PHPUnit\TextUI\Command::main(); + } +} else { + if (!is_file(dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php')) { + echo "Unable to find the `simple-phpunit.php` script in `vendor/symfony/phpunit-bridge/bin/`.\n"; + exit(1); + } + + require dirname(__DIR__).'/vendor/symfony/phpunit-bridge/bin/simple-phpunit.php'; +} diff --git a/composer.json b/composer.json index b49cb3a4..8835e682 100644 --- a/composer.json +++ b/composer.json @@ -71,5 +71,11 @@ "allow-contrib": true, "require": "6.4.*" } + }, + "require-dev": { + "phpunit/phpunit": "^9.5", + "symfony/browser-kit": "6.4.*", + "symfony/css-selector": "6.4.*", + "symfony/phpunit-bridge": "^7.1" } } diff --git a/composer.lock b/composer.lock index 053673a8..fd9f847d 100644 --- a/composer.lock +++ b/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": "8e58fec512db5cf782477222ccddae8e", + "content-hash": "9bd5f77b184c4d6a6ff281752fa68768", "packages": [ { "name": "brick/math", @@ -4962,7 +4962,2098 @@ "time": "2024-09-09T17:55:12+00:00" } ], - "packages-dev": [], + "packages-dev": [ + { + "name": "doctrine/instantiator", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^11", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-12-30T00:23:10+00:00" + }, + { + "name": "masterminds/html5", + "version": "2.9.0", + "source": { + "type": "git", + "url": "https://github.com/Masterminds/html5-php.git", + "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Masterminds\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Butcher", + "email": "technosophos@gmail.com" + }, + { + "name": "Matt Farina", + "email": "matt@mattfarina.com" + }, + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + } + ], + "description": "An HTML5 parser and serializer.", + "homepage": "http://masterminds.github.io/html5-php", + "keywords": [ + "HTML5", + "dom", + "html", + "parser", + "querypath", + "serializer", + "xml" + ], + "support": { + "issues": "https://github.com/Masterminds/html5-php/issues", + "source": "https://github.com/Masterminds/html5-php/tree/2.9.0" + }, + "time": "2024-03-31T07:05:07+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.12.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3 <3.2.2" + }, + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + }, + "type": "library", + "autoload": { + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2024-06-12T14:39:25+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v5.2.0", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", + "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": ">=7.4" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0" + }, + "time": "2024-09-15T16:40:33+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "54750ef60c58e43759730615a392c31c80e23176" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" + }, + { + "name": "phar-io/version", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "9.2.32", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^4.19.1 || ^5.1.0", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.6" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "9.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-08-22T04:23:01+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "3.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-12-02T12:48:52+00:00" + }, + { + "name": "phpunit/php-invoker", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "5.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:16:10+00:00" + }, + { + "name": "phpunit/phpunit", + "version": "9.6.21", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.5.0 || ^2", + "ext-dom": "*", + "ext-json": "*", + "ext-libxml": "*", + "ext-mbstring": "*", + "ext-xml": "*", + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.32", + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", + "sebastian/version": "^3.0.2" + }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "9.6-dev" + } + }, + "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" + }, + "funding": [ + { + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" + } + ], + "time": "2024-09-19T10:50:18+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:27:43+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" + }, + { + "name": "sebastian/code-unit-reverse-lookup", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Looks up which function or method a line of code belongs to", + "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:30:19+00:00" + }, + { + "name": "sebastian/comparator", + "version": "4.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fa0f136dd2334583309d32b62544682ee972b51a", + "reference": "fa0f136dd2334583309d32b62544682ee972b51a", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "https://github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2022-09-14T12:41:17+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a", + "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:19:30+00:00" + }, + { + "name": "sebastian/diff", + "version": "4.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff", + "udiff", + "unidiff", + "unified diff" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:30:58+00:00" + }, + { + "name": "sebastian/environment", + "version": "5.1.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-posix": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:03:51+00:00" + }, + { + "name": "sebastian/exporter", + "version": "4.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "https://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:33:00+00:00" + }, + { + "name": "sebastian/global-state", + "version": "5.0.7", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "ext-dom": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-02T06:35:11+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.18 || ^5.0", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-12-22T06:20:34+00:00" + }, + { + "name": "sebastian/object-enumerator", + "version": "4.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-enumerator.git", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", + "shasum": "" + }, + "require": { + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Traverses array structures and object graphs to enumerate all referenced objects", + "homepage": "https://github.com/sebastianbergmann/object-enumerator/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:12:34+00:00" + }, + { + "name": "sebastian/object-reflector", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:14:26+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "4.0.5", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "reference": "e75bd0f07204fec2a0af9b0f3cfe97d05f92efc1", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "https://github.com/sebastianbergmann/recursion-context", + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:07:39+00:00" + }, + { + "name": "sebastian/resource-operations", + "version": "3.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/resource-operations.git", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides a list of PHP built-in functions that operate on resources", + "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "support": { + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-03-14T16:00:52+00:00" + }, + { + "name": "sebastian/type", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.2-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/3.2.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2023-02-03T06:13:03+00:00" + }, + { + "name": "sebastian/version", + "version": "3.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "c6c1022351a901512170118436c764e473f6de8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" + }, + { + "name": "symfony/browser-kit", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/browser-kit.git", + "reference": "62ab90b92066ef6cce5e79365625b4b1432464c8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/62ab90b92066ef6cce5e79365625b4b1432464c8", + "reference": "62ab90b92066ef6cce5e79365625b4b1432464c8", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/dom-crawler": "^5.4|^6.0|^7.0" + }, + "require-dev": { + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\BrowserKit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/browser-kit/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, + { + "name": "symfony/css-selector", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08", + "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Converts CSS selectors to XPath expressions", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/css-selector/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, + { + "name": "symfony/dom-crawler", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9d307ecbcb917001692be333cdc58f474fdb37f0", + "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0", + "shasum": "" + }, + "require": { + "masterminds/html5": "^2.6", + "php": ">=8.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "symfony/css-selector": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Eases DOM navigation for HTML and XML documents", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-15T06:35:36+00:00" + }, + { + "name": "symfony/phpunit-bridge", + "version": "v7.1.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/phpunit-bridge.git", + "reference": "e876eb90e32a8fc4c4911d458e09f88d65877d1c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e876eb90e32a8fc4c4911d458e09f88d65877d1c", + "reference": "e876eb90e32a8fc4c4911d458e09f88d65877d1c", + "shasum": "" + }, + "require": { + "php": ">=7.2.5" + }, + "conflict": { + "phpunit/phpunit": "<7.5|9.1.2" + }, + "require-dev": { + "symfony/deprecation-contracts": "^2.5|^3.0", + "symfony/error-handler": "^5.4|^6.4|^7.0", + "symfony/polyfill-php81": "^1.27" + }, + "bin": [ + "bin/simple-phpunit" + ], + "type": "symfony-bridge", + "extra": { + "thanks": { + "name": "phpunit/phpunit", + "url": "https://github.com/sebastianbergmann/phpunit" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Bridge\\PhpUnit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/", + "/bin/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides utilities for PHPUnit, especially user deprecation notices management", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/phpunit-bridge/tree/v7.1.4" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-13T14:28:19+00:00" + }, + { + "name": "theseer/tokenizer", + "version": "1.2.3", + "source": { + "type": "git", + "url": "https://github.com/theseer/tokenizer.git", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:36:25+00:00" + } + ], "aliases": [], "minimum-stability": "stable", "stability-flags": [], @@ -4974,5 +7065,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.2.0" } diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 00000000..c76a655a --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + tests + + + + + + src + + + + + + + + + + diff --git a/symfony.lock b/symfony.lock index e2f9854a..5d78d83e 100644 --- a/symfony.lock +++ b/symfony.lock @@ -20,6 +20,20 @@ "config/packages/http_discovery.yaml" ] }, + "phpunit/phpunit": { + "version": "9.6", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "9.6", + "ref": "7364a21d87e658eb363c5020c072ecfdc12e2326" + }, + "files": [ + ".env.test", + "phpunit.xml.dist", + "tests/bootstrap.php" + ] + }, "symfony/apache-pack": { "version": "1.0", "recipe": { @@ -75,6 +89,21 @@ "src/Kernel.php" ] }, + "symfony/phpunit-bridge": { + "version": "7.1", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "6.3", + "ref": "a411a0480041243d97382cac7984f7dce7813c08" + }, + "files": [ + ".env.test", + "bin/phpunit", + "phpunit.xml.dist", + "tests/bootstrap.php" + ] + }, "symfony/routing": { "version": "6.4", "recipe": { diff --git a/tests/bootstrap.php b/tests/bootstrap.php new file mode 100644 index 00000000..47a58557 --- /dev/null +++ b/tests/bootstrap.php @@ -0,0 +1,13 @@ +bootEnv(dirname(__DIR__).'/.env'); +} + +if ($_SERVER['APP_DEBUG']) { + umask(0000); +} From 3357430848df163e211dac7f576d9d0dc429b963 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 26 Sep 2024 17:11:14 -0400 Subject: [PATCH 012/173] #47: Change the database to mariadb to mirror prod. --- .lando.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.lando.yml b/.lando.yml index 24aa9b52..e2a9f83b 100644 --- a/.lando.yml +++ b/.lando.yml @@ -3,6 +3,7 @@ recipe: symfony config: webroot: public php: 8.1 + database: mariadb services: appserver: build_as_root: From 8336afc97a2f1ae9df25b0464652099734fca10f Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 27 Sep 2024 14:41:34 -0400 Subject: [PATCH 013/173] #47: Convert id-subcomponent separator from '/' to '.'. The use of '/' as a separator in subcomponents turned out to be a bad idea because these slashes need to be escaped as %2F, but these escaped slashes can interfere with some webserver configuration. For example Apache redirects require the NE "No Escape" option to preserve %2F slashes without double-escaping: # Redirect all traffic to https # # We're using mod_rewrite here rather than mod_alias's `Redirect` # because mod_alias doesn't allow the "NE" == "noescape" parameter # that allows URLs includinging encoded slashes (%2F) to be returned # without double-escaping. RewriteRule .* https://<%= node["app_domain"] %>$0 [L,R=301,NE] Similarly, Symfony refuses to allow slashes in parameters passed as tokens in routes. To address this problematic choice, use '.' as a separator of sub-components in identifiers. Periods don't require special escaping in URLs or database queries, though they do in regular expressions. --- application/controllers/ArchiveController.php | 10 +- application/controllers/CoursesController.php | 12 +- application/controllers/ExportController.php | 6 +- application/controllers/JsonController.php | 30 ++--- .../controllers/OfferingsController.php | 16 +-- .../controllers/ResourcesController.php | 2 +- application/controllers/TopicsController.php | 12 +- .../library/AbstractCatalogController.php | 14 +- .../library/apc/course/CourseManager.php | 4 +- .../library/banner/AbstractSession.php | 20 +-- .../library/banner/course/AbstractSession.php | 18 +-- application/library/banner/course/Course.php | 6 +- .../banner/course/Course/AbstractList.php | 8 +- .../banner/course/Course/AbstractSession.php | 4 +- .../banner/course/Course/Catalog/Session.php | 6 +- .../banner/course/Course/Lookup/Session.php | 14 +- .../banner/course/Course/Search/Query.php | 8 +- .../banner/course/Course/Search/Session.php | 2 +- .../course/CourseCatalog/Lookup/Session.php | 2 +- .../library/banner/course/CourseManager.php | 22 ++-- .../library/banner/course/CourseOffering.php | 26 ++-- .../course/CourseOffering/AbstractSession.php | 10 +- .../course/CourseOffering/Catalog/Session.php | 6 +- .../course/CourseOffering/GenusTypeList.php | 2 +- .../course/CourseOffering/Lookup/Session.php | 2 +- .../course/CourseOffering/Search/Query.php | 16 +-- .../course/CourseOffering/Search/Session.php | 16 +-- .../banner/course/Term/Catalog/Session.php | 10 +- .../banner/course/Term/ForCourseList.php | 2 +- .../banner/course/Term/Lookup/AllList.php | 2 +- .../banner/course/Term/Lookup/Session.php | 12 +- .../banner/course/Topic/AbstractList.php | 4 +- .../banner/course/Topic/Lookup/Session.php | 108 ++++++++-------- .../banner/course/Topic/Search/Query.php | 14 +- .../course/Topic/Search/Query/Block.php | 2 +- .../course/Topic/Search/Query/Department.php | 2 +- .../course/Topic/Search/Query/Division.php | 2 +- .../Topic/Search/Query/InstructionMethod.php | 2 +- .../course/Topic/Search/Query/Level.php | 2 +- .../course/Topic/Search/Query/Requirement.php | 2 +- .../course/Topic/Search/Query/Subject.php | 2 +- .../banner/course/Topic/Search/Session.php | 2 +- .../banner/resource/Bin/Lookup/Session.php | 2 +- .../banner/resource/Resource/Building.php | 2 +- .../Resource/Lookup/CombinedSession.php | 66 +++++----- .../Resource/Lookup/PerCatalogSession.php | 68 +++++----- .../banner/resource/Resource/Person.php | 2 +- .../library/banner/resource/Resource/Room.php | 2 +- .../banner/resource/ResourceManager.php | 14 +- .../sql/convert_id_separators_to_period.sql | 7 + .../test/Catalog/Action/Helper/OsidIdTest.php | 4 +- .../Catalog/Action/Helper/OsidTermsTest.php | 8 +- .../Catalog/Action/Helper/OsidTopicTest.php | 4 +- .../Catalog/Action/Helper/OsidTypeTest.php | 4 +- application/test/Catalog/frontend_config.ini | 122 +++++++++--------- application/test/apc/configuration.plist | 12 +- .../test/apc/course/CourseManagerTest.php | 2 +- application/test/banner/configuration.plist | 12 +- .../course/Course/Catalog/SessionTest.php | 6 +- .../Course/Lookup/CombinedSessionTest.php | 18 +-- .../course/Course/Lookup/SessionTest.php | 16 +-- .../banner/course/Course/Search/OrderTest.php | 16 +-- .../banner/course/Course/Search/QueryTest.php | 36 +++--- .../course/Course/Search/SearchTest.php | 18 +-- .../course/Course/Search/SessionTest.php | 16 +-- .../CourseCatalog/Lookup/SessionTest.php | 4 +- .../test/banner/course/CourseCatalogTest.php | 10 +- .../test/banner/course/CourseManagerTest.php | 2 +- .../CourseOffering/Catalog/SessionTest.php | 6 +- .../Lookup/CombinedSessionTest.php | 38 +++--- .../CourseOffering/Lookup/SessionTest.php | 38 +++--- .../CourseOffering/Search/OrderTest.php | 10 +- .../CourseOffering/Search/QueryTest.php | 52 ++++---- .../CourseOffering/Search/SearchTest.php | 10 +- .../CourseOffering/Search/SessionTest.php | 30 ++--- .../test/banner/course/CourseOfferingTest.php | 68 +++++----- application/test/banner/course/CourseTest.php | 18 +-- .../course/PartOfTermCourseOfferingTest.php | 32 ++--- .../course/Term/Catalog/SessionTest.php | 6 +- .../Term/Lookup/CombinedSessionTest.php | 8 +- .../banner/course/Term/Lookup/SessionTest.php | 8 +- application/test/banner/course/TermTest.php | 4 +- .../Topic/Lookup/CombinedSessionTest.php | 50 +++---- .../course/Topic/Lookup/SessionTest.php | 54 ++++---- .../banner/course/Topic/Search/OrderTest.php | 14 +- .../banner/course/Topic/Search/QueryTest.php | 18 +-- .../banner/course/Topic/Search/SearchTest.php | 18 +-- .../course/Topic/Search/SessionTest.php | 14 +- .../resource/Bin/Lookup/SessionTest.php | 4 +- .../Resource/Lookup/PerCatalogSessionTest.php | 30 ++--- .../resource/Resource/Lookup/SessionTest.php | 26 ++-- .../banner/resource/Resource/PersonTest.php | 8 +- .../banner/resource/ResourceManagerTest.php | 2 +- .../views/scripts/offerings/search.phtml | 12 +- .../views/scripts/offerings/searchxml.phtml | 10 +- 95 files changed, 765 insertions(+), 758 deletions(-) create mode 100644 application/sql/convert_id_separators_to_period.sql diff --git a/application/controllers/ArchiveController.php b/application/controllers/ArchiveController.php index ddd0a8be..8fb1fbb0 100644 --- a/application/controllers/ArchiveController.php +++ b/application/controllers/ArchiveController.php @@ -831,9 +831,9 @@ protected function getCourseData(osid_course_Course $course) // Look for different Section Descriptions $offeringQuery = $this->offeringSearchSession->getCourseOfferingQuery(); $offeringQuery->matchCourseId($course->getId(), true); - $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LCT'), true); - $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/SEM'), true); - $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/IND'), true); + $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LCT'), true); + $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.SEM'), true); + $offeringQuery->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.IND'), true); foreach ($this->selectedTerms as $termId) { $offeringQuery->matchTermId($termId, true); } @@ -856,7 +856,7 @@ protected function getCourseData(osid_course_Course $course) $instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $identifiersType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:banner_identifiers'); $namesType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:person_names'); - $requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); $enrollmentNumbersType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:enrollment_numbers'); while ($offerings->hasNext()) { $offering = $offerings->getNextCourseOffering(); @@ -1028,7 +1028,7 @@ protected function getCourseData(osid_course_Course $course) // Apply all course-level topics. $allTopics = $this->_helper->topics->topicListAsArray($course->getTopics()); $reqs = []; - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); $topicTypeString = $this->_helper->osidType->toString($topicType); $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { diff --git a/application/controllers/CoursesController.php b/application/controllers/CoursesController.php index 385863a9..2e604c41 100755 --- a/application/controllers/CoursesController.php +++ b/application/controllers/CoursesController.php @@ -137,7 +137,7 @@ public function viewAction() public function viewxmlAction() { $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); + $this->getResponse()->setHeader('Content-Type', 'text.xml'); $this->viewAction(); } @@ -455,8 +455,8 @@ public function instructorxmlAction() throw new InvalidArgumentException('An instructor must be specified.'); } - $instructorId = $this->_helper->osidId->fromString('resource/person/'.$instructor); - $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'resources', null, ['catalog' => $this->_getParam('catalog'), 'resource' => 'resouce/person/'.$instructor])); + $instructorId = $this->_helper->osidId->fromString('resource.person.'.$instructor); + $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'resources', null, ['catalog' => $this->_getParam('catalog'), 'resource' => 'resouce.person.'.$instructor])); $resourceLookup = $this->_helper->osid->getCourseManager()->getResourceManager()->getResourceLookupSession(); try { @@ -610,7 +610,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse } $allTopics = $this->_helper->topics->topicListAsArray($course->getTopics()); - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); + $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); $topicTypeString = $this->_helper->osidType->toString($topicType); $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -620,7 +620,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse echo ' '; } - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); $topicTypeString = $this->_helper->osidType->toString($topicType); $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -630,7 +630,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse echo ' '; } - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); + $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); $topicTypeString = $this->_helper->osidType->toString($topicType); $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { diff --git a/application/controllers/ExportController.php b/application/controllers/ExportController.php index 91d7349c..d27ec627 100644 --- a/application/controllers/ExportController.php +++ b/application/controllers/ExportController.php @@ -450,8 +450,8 @@ public function generatecourselistAction() if ($request->getParam('catalogId')) { $catalogId = $this->_helper->osidId->fromString($request->getParam('catalogId')); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); $topicSearchSession = $this->_helper->osid->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); $topicQuery = $topicSearchSession->getTopicQuery(); @@ -533,7 +533,7 @@ public function validtermAction() $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); try { - $termString = 'term/'.$request->getParam('term'); + $termString = 'term.'.$request->getParam('term'); $termId = $this->_helper->osidId->fromString($termString); } catch (osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); diff --git a/application/controllers/JsonController.php b/application/controllers/JsonController.php index c3efec99..fe035c7c 100644 --- a/application/controllers/JsonController.php +++ b/application/controllers/JsonController.php @@ -37,7 +37,7 @@ public function init() public function termsAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString('catalog/'.$this->_getParam('catalog')); + $catalogId = $this->_helper->osidId->fromString('catalog.'.$this->_getParam('catalog')); $lookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $currentTermId = $this->_helper->osidTerms->getNextOrLatestTermId($catalogId); } else { @@ -52,7 +52,7 @@ public function termsAction() if ($currentTermId) { $term = $lookupSession->getTerm($currentTermId); $result['terms'][] = [ - 'code' => preg_replace('/^term\//', '', $term->getId()->getIdentifier()), + 'code' => preg_replace('/^term\./', '', $term->getId()->getIdentifier()), 'description' => $term->getDisplayName(), ]; } @@ -63,7 +63,7 @@ public function termsAction() continue; } $result['terms'][] = [ - 'code' => preg_replace('/^term\//', '', $term->getId()->getIdentifier()), + 'code' => preg_replace('/^term\./', '', $term->getId()->getIdentifier()), 'description' => $term->getDisplayName(), ]; } @@ -83,7 +83,7 @@ public function termsAction() public function areasAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString('catalog/'.$this->_getParam('catalog')); + $catalogId = $this->_helper->osidId->fromString('catalog.'.$this->_getParam('catalog')); $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $topicSearchSession = $this->_helper->osid->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); } else { @@ -97,10 +97,10 @@ public function areasAction() if (empty($code)) { throw new InvalidArgumentException('Missing the "code" parameter.'); } - $termId = $this->_helper->osidId->fromString('term/'.$code); + $termId = $this->_helper->osidId->fromString('term.'.$code); $term = $termLookupSession->getTerm($termId); - $genera = 'topic/subject'; + $genera = 'topic.subject'; $generaType = $this->_helper->osidType->fromString('genera:'.$genera); $termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); @@ -121,7 +121,7 @@ public function areasAction() while ($topics->hasNext()) { $topic = $topics->getNextTopic(); $result['areas'][] = [ - 'area' => preg_replace('/^'.str_replace('/', '\/', $genera).'\//', '', $topic->getId()->getIdentifier()), + 'area' => preg_replace('/^'.str_replace('.', '\.', $genera).'\./', '', $topic->getId()->getIdentifier()), 'name' => $topic->getDisplayName(), ]; } @@ -141,7 +141,7 @@ public function areasAction() public function catalogAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString('catalog/'.$this->_getParam('catalog')); + $catalogId = $this->_helper->osidId->fromString('catalog.'.$this->_getParam('catalog')); $searchSession = $this->_helper->osid->getCourseManager()->getCourseSearchSessionForCatalog($catalogId); $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $topicLookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); @@ -158,18 +158,18 @@ public function catalogAction() $offeringLookupSession->useFederatedCourseCatalogView(); // Validate our arguments. - $genera = 'topic/subject'; + $genera = 'topic.subject'; $area = $this->_getParam('area'); if (empty($area)) { throw new InvalidArgumentException('Missing the "area" parameter.'); } - $topicId = $this->_helper->osidId->fromString($genera.'/'.$area); + $topicId = $this->_helper->osidId->fromString($genera.'.'.$area); $topic = $topicLookupSession->getTopic($topicId); $code = $this->_getParam('code'); if (empty($code)) { throw new InvalidArgumentException('Missing the "code" parameter.'); } - $termId = $this->_helper->osidId->fromString('term/'.$this->_getParam('code')); + $termId = $this->_helper->osidId->fromString('term.'.$this->_getParam('code')); $term = $termLookupSession->getTerm($termId); // Build the query. @@ -200,7 +200,7 @@ public function catalogAction() public function searchAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString('catalog/'.$this->_getParam('catalog')); + $catalogId = $this->_helper->osidId->fromString('catalog.'.$this->_getParam('catalog')); $searchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $topicLookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); @@ -229,15 +229,15 @@ public function searchAction() if (empty($code)) { throw new InvalidArgumentException('Missing the "code" parameter.'); } - $termId = $this->_helper->osidId->fromString('term/'.$this->_getParam('code')); + $termId = $this->_helper->osidId->fromString('term.'.$this->_getParam('code')); $term = $termLookupSession->getTerm($termId); $query->matchTermId($termId, true); - $genera = 'topic/subject'; + $genera = 'topic.subject'; $area = $this->_getParam('area'); if (!empty($area)) { - $topicId = $this->_helper->osidId->fromString($genera.'/'.$area); + $topicId = $this->_helper->osidId->fromString($genera.'.'.$area); $topic = $topicLookupSession->getTopic($topicId); $query->matchTopicId($topicId, true); } diff --git a/application/controllers/OfferingsController.php b/application/controllers/OfferingsController.php index 5e91c9f4..16815c9e 100755 --- a/application/controllers/OfferingsController.php +++ b/application/controllers/OfferingsController.php @@ -35,17 +35,17 @@ public function init() parent::init(); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); - $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); + $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus'); + $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus'); } /** diff --git a/application/controllers/ResourcesController.php b/application/controllers/ResourcesController.php index 6bb8f5f7..77af7c19 100755 --- a/application/controllers/ResourcesController.php +++ b/application/controllers/ResourcesController.php @@ -127,7 +127,7 @@ public function viewAction() */ public function listcampusestxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus')); } /** diff --git a/application/controllers/TopicsController.php b/application/controllers/TopicsController.php index 57bdbd5a..453bb5fa 100755 --- a/application/controllers/TopicsController.php +++ b/application/controllers/TopicsController.php @@ -241,7 +241,7 @@ public function viewxmlAction() */ public function listsubjectstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); } /** @@ -253,7 +253,7 @@ public function listsubjectstxtAction() */ public function listrequirementstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); } /** @@ -265,7 +265,7 @@ public function listrequirementstxtAction() */ public function listlevelstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); } /** @@ -277,7 +277,7 @@ public function listlevelstxtAction() */ public function listblockstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); } /** @@ -289,7 +289,7 @@ public function listblockstxtAction() */ public function listinstructionmethodstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); } /** @@ -301,7 +301,7 @@ public function listinstructionmethodstxtAction() */ public function listdepartmentstxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department')); + $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); } /** diff --git a/application/library/AbstractCatalogController.php b/application/library/AbstractCatalogController.php index 6ea1bb2b..ea3cdcd2 100755 --- a/application/library/AbstractCatalogController.php +++ b/application/library/AbstractCatalogController.php @@ -96,19 +96,19 @@ protected function loadTopics(osid_course_TopicList $topicList) { $topics = $this->_helper->topics->topicListAsArray($topicList); - $this->view->subjectTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject')); + $this->view->subjectTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); - $this->view->departmentTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department')); + $this->view->departmentTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); - $this->view->divisionTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division')); + $this->view->divisionTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division')); - $this->view->requirementTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement')); + $this->view->requirementTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); - $this->view->levelTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level')); + $this->view->levelTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); - $this->view->blockTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block')); + $this->view->blockTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); - $this->view->instructionMethodTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method')); + $this->view->instructionMethodTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); } private $startTime; diff --git a/application/library/apc/course/CourseManager.php b/application/library/apc/course/CourseManager.php index 91ab29df..109fc2f8 100755 --- a/application/library/apc/course/CourseManager.php +++ b/application/library/apc/course/CourseManager.php @@ -28,7 +28,7 @@ public function __construct() { parent::__construct(); - $this->setId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:id:implementations/apc_course')); + $this->setId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:id:implementations.apc_course')); $this->setDisplayName('APC Caching Course Manager'); $this->setDescription('This is a CourseManager implementation that provides read-only, unauthenticated, access to course information stored in an underlying course manager.'); } @@ -74,7 +74,7 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $implClassName = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:apc_course/impl_class_name'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:apc_course.impl_class_name'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode(), $e); diff --git a/application/library/banner/AbstractSession.php b/application/library/banner/AbstractSession.php index b70cd6c0..c800b4d0 100755 --- a/application/library/banner/AbstractSession.php +++ b/application/library/banner/AbstractSession.php @@ -145,11 +145,11 @@ protected function usesIsolatedView() public function getDatabaseIdString(osid_id_Id $id, $prefix = null) { if ('urn' != $id->getIdentifierNamespace()) { - throw new osid_NotFoundException('I only know about Ids in the urn namespace.'); + throw new osid_NotFoundException('I only know about Ids in the urn namespace, got: '.$id->getIdentifierNamespace()); } if ($id->getAuthority() != $this->manager->getIdAuthority()) { - throw new osid_NotFoundException('I only know about Ids under the '.$this->manager->getIdAuthority().' authority.'); + throw new osid_NotFoundException('I only know about Ids under the '.$this->manager->getIdAuthority().' authority, got: '.$id->getAuthority()); } if (null === $prefix) { @@ -159,7 +159,7 @@ public function getDatabaseIdString(osid_id_Id $id, $prefix = null) } if (!str_starts_with($id->getIdentifier(), $prefix)) { - throw new osid_NotFoundException('I only know about Ids with the '.$prefix.' prefix.'); + throw new osid_NotFoundException('I only know about Ids with the '.$prefix.' prefix, got: '.$id->getIdentifier()); } return substr($id->getIdentifier(), strlen($prefix)); @@ -195,7 +195,7 @@ public function getOsidIdFromString($databaseId, $prefix = null) */ public function getTermCodeFromTermId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'term/'); + $string = $this->getDatabaseIdString($id, 'term.'); if (!preg_match('#^([0-9]{6})$#', $string)) { throw new osid_NotFoundException("String '$string' cannot be broken into a term-code"); } @@ -214,8 +214,8 @@ public function getTermCodeFromTermId(osid_id_Id $id) */ public function getTermCodeFromOfferingId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'section/'); - if (!preg_match('#^([0-9]{6})/([0-9]{1,5})$#', $string, $matches)) { + $string = $this->getDatabaseIdString($id, 'section.'); + if (!preg_match('#^([0-9]{6})\.([0-9]{1,5})$#', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be broken into a term-code and CRN."); } @@ -233,8 +233,8 @@ public function getTermCodeFromOfferingId(osid_id_Id $id) */ public function getCrnFromOfferingId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'section/'); - if (!preg_match('#^([0-9]{6})/([0-9]{1,5})$#', $string, $matches)) { + $string = $this->getDatabaseIdString($id, 'section.'); + if (!preg_match('#^([0-9]{6})\.([0-9]{1,5})$#', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be broken into a term-code and CRN."); } @@ -250,7 +250,7 @@ public function getCrnFromOfferingId(osid_id_Id $id) */ public function getSubjectFromCourseId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'course/'); + $string = $this->getDatabaseIdString($id, 'course.'); if (!preg_match('#^([A-Z]{2,4})([A-Z0-9]{3,5})$#i', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be broken into a subject-code and Number."); } @@ -267,7 +267,7 @@ public function getSubjectFromCourseId(osid_id_Id $id) */ public function getNumberFromCourseId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'course/'); + $string = $this->getDatabaseIdString($id, 'course.'); if (!preg_match('#^([A-Z]{2,4})([A-Z0-9]{3,5})$#i', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be broken into a subject-code and Number."); } diff --git a/application/library/banner/course/AbstractSession.php b/application/library/banner/course/AbstractSession.php index df804b2d..f5de7375 100755 --- a/application/library/banner/course/AbstractSession.php +++ b/application/library/banner/course/AbstractSession.php @@ -26,7 +26,7 @@ abstract class banner_course_AbstractSession extends banner_AbstractSession impl */ public function getCatalogDatabaseId(osid_id_Id $id) { - return $this->getDatabaseIdString($id, 'catalog/'); + return $this->getDatabaseIdString($id, 'catalog.'); } /** @@ -159,7 +159,7 @@ public function getOfferingIdFromTermCodeAndCrn($termCode, $crn) throw new osid_OperationFailedException('Both termCode and CRN must be specified.'); } - return $this->getOsidIdFromString($termCode.'/'.$crn, 'section/'); + return $this->getOsidIdFromString($termCode.'.'.$crn, 'section.'); } /** @@ -177,7 +177,7 @@ public function getCourseIdFromSubjectAndNumber($subjectCode, $number) throw new osid_OperationFailedException('Both subjectCode and number must be specified.'); } - return $this->getOsidIdFromString($subjectCode.$number, 'course/'); + return $this->getOsidIdFromString($subjectCode.$number, 'course.'); } /** @@ -189,8 +189,8 @@ public function getCourseIdFromSubjectAndNumber($subjectCode, $number) */ public function getTermCodeFromTermId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'term/'); - if (!preg_match('#^([0-9]{6})(?:/(.{1,3}))?$#', $string, $matches)) { + $string = $this->getDatabaseIdString($id, 'term.'); + if (!preg_match('#^([0-9]{6})(?:\.(.{1,3}))?$#', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be converted into a valid term code."); } @@ -206,8 +206,8 @@ public function getTermCodeFromTermId(osid_id_Id $id) */ public function getPartOfTermCodeFromTermId(osid_id_Id $id) { - $string = $this->getDatabaseIdString($id, 'term/'); - if (!preg_match('#^([0-9]{6})(?:/(.{1,3}))$#', $string, $matches)) { + $string = $this->getDatabaseIdString($id, 'term.'); + if (!preg_match('#^([0-9]{6})(?:\.(.{1,3}))$#', $string, $matches)) { throw new osid_NotFoundException("String '$string' cannot be converted into a valid part-of-term code."); } @@ -229,8 +229,8 @@ public function getScheduleCodeFromGenusType(osid_type_Type $genusType) throw new osid_NotFoundException("I only know about the '".$this->getIdAuthority()."' authority"); } - if (!preg_match('/^genera:offering\/([a-z]+)$/i', $genusType->getIdentifier(), $matches)) { - throw new osid_NotFoundException("I only know about identifiers beginning with 'genera:offering/'"); + if (!preg_match('/^genera:offering\.([a-z]+)$/i', $genusType->getIdentifier(), $matches)) { + throw new osid_NotFoundException("I only know about identifiers beginning with 'genera:offering.'"); } return $matches[1]; diff --git a/application/library/banner/course/Course.php b/application/library/banner/course/Course.php index 717d6d4b..4d905f64 100755 --- a/application/library/banner/course/Course.php +++ b/application/library/banner/course/Course.php @@ -799,7 +799,7 @@ public function getLinkSetIdsForTerm(osid_id_Id $termId) } $linkSetIds = array_unique($linkSetIds); foreach ($linkSetIds as $key => $val) { - $linkSetIds[$key] = $this->session->getOsidIdFromString($val, 'link_set/'); + $linkSetIds[$key] = $this->session->getOsidIdFromString($val, 'link_set.'); } return new phpkit_id_ArrayIdList($linkSetIds); @@ -830,7 +830,7 @@ public function getLinkTypeIdsForTermAndSet(osid_id_Id $termId, osid_id_Id $link $setId = substr($linkIdString, 1, 1); // The type id is the first charactor. $typeId = substr($linkIdString, 0, 1); - if ($linkSetId->isEqual($this->session->getOsidIdFromString($setId, 'link_set/'))) { + if ($linkSetId->isEqual($this->session->getOsidIdFromString($setId, 'link_set.'))) { $linkTypeIds[] = $typeId; } } @@ -843,7 +843,7 @@ public function getLinkTypeIdsForTermAndSet(osid_id_Id $termId, osid_id_Id $link } foreach ($linkTypeIds as $key => $val) { - $linkTypeIds[$key] = $this->session->getOsidIdFromString($val, 'link_type/'); + $linkTypeIds[$key] = $this->session->getOsidIdFromString($val, 'link_type.'); } return new phpkit_id_ArrayIdList($linkTypeIds); diff --git a/application/library/banner/course/Course/AbstractList.php b/application/library/banner/course/Course/AbstractList.php index 7f2da7cf..da4e2054 100755 --- a/application/library/banner/course/Course/AbstractList.php +++ b/application/library/banner/course/Course/AbstractList.php @@ -254,15 +254,15 @@ protected function includeInactive() final protected function getObjectFromRow(array $row) { return new banner_course_Course( - $this->session->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'].$row['SCBCRSE_CRSE_NUMB'], 'course/'), + $this->session->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'].$row['SCBCRSE_CRSE_NUMB'], 'course.'), $row['SCBCRSE_SUBJ_CODE'].' '.$row['SCBCRSE_CRSE_NUMB'], (null === $row['SCBDESC_TEXT_NARRATIVE']) ? '' : $row['SCBDESC_TEXT_NARRATIVE'], // Description $row['SCBCRSE_TITLE'], $row['SCBCRSE_CREDIT_HR_HIGH'], [ - $this->session->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'], 'topic/subject/'), - $this->session->getOsidIdFromString($row['SCBCRSE_DEPT_CODE'], 'topic/department/'), - $this->session->getOsidIdFromString($row['SCBCRSE_DIVS_CODE'], 'topic/division/'), + $this->session->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'], 'topic.subject.'), + $this->session->getOsidIdFromString($row['SCBCRSE_DEPT_CODE'], 'topic.department.'), + $this->session->getOsidIdFromString($row['SCBCRSE_DIVS_CODE'], 'topic.division.'), ], $row['has_alternates'], $this->session); diff --git a/application/library/banner/course/Course/AbstractSession.php b/application/library/banner/course/Course/AbstractSession.php index ed5b6f30..0cac8fb1 100755 --- a/application/library/banner/course/Course/AbstractSession.php +++ b/application/library/banner/course/Course/AbstractSession.php @@ -49,7 +49,7 @@ public function getRequirementTopicIdsForCourse(osid_id_Id $courseId) self::$requirementTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$requirementTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SCRATTR_ATTR_CODE'], 'topic/requirement/'); + $topicIds[] = $this->getOsidIdFromString($row['SCRATTR_ATTR_CODE'], 'topic.requirement.'); } self::$requirementTopics_stmt->closeCursor(); @@ -89,7 +89,7 @@ public function getLevelTopicIdsForCourse(osid_id_Id $courseId) self::$levelTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$levelTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SCRLEVL_LEVL_CODE'], 'topic/level/'); + $topicIds[] = $this->getOsidIdFromString($row['SCRLEVL_LEVL_CODE'], 'topic.level.'); } self::$levelTopics_stmt->closeCursor(); diff --git a/application/library/banner/course/Course/Catalog/Session.php b/application/library/banner/course/Course/Catalog/Session.php index b27843ad..fafd9234 100755 --- a/application/library/banner/course/Course/Catalog/Session.php +++ b/application/library/banner/course/Course/Catalog/Session.php @@ -34,7 +34,7 @@ class banner_course_Course_Catalog_Session extends banner_course_Course_Abstract */ public function __construct(banner_course_CourseManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** @@ -242,7 +242,7 @@ public function getCatalogIdsByCourse(osid_id_Id $courseId) $ids = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { - $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog/'); + $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog.'); } $statement->closeCursor(); @@ -279,7 +279,7 @@ public function getCatalogsByCourse(osid_id_Id $courseId) $catalogs = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { $catalogs[] = new banner_course_CourseCatalog( - $this->getOsidIdFromString($row['catalog_id'], 'catalog/'), + $this->getOsidIdFromString($row['catalog_id'], 'catalog.'), $row['catalog_title']); } $statement->closeCursor(); diff --git a/application/library/banner/course/Course/Lookup/Session.php b/application/library/banner/course/Course/Lookup/Session.php index ceeff4a1..e4180adb 100755 --- a/application/library/banner/course/Course/Lookup/Session.php +++ b/application/library/banner/course/Course/Lookup/Session.php @@ -52,7 +52,7 @@ class banner_course_Course_Lookup_Session extends banner_course_Course_AbstractS */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'course/'); + parent::__construct($manager, 'course.'); $this->catalogId = $catalogId; } @@ -228,7 +228,7 @@ public function getCourse(osid_id_Id $courseId) self::$getCourse_stmts[$catalogWhere] = $this->manager->getDB()->prepare($query); } - $courseIdString = $this->getDatabaseIdString($courseId, 'course/'); + $courseIdString = $this->getDatabaseIdString($courseId, 'course.'); $parameters = array_merge( [ @@ -241,19 +241,19 @@ public function getCourse(osid_id_Id $courseId) self::$getCourse_stmts[$catalogWhere]->closeCursor(); if (!$row || !($row['SCBCRSE_SUBJ_CODE'] && $row['SCBCRSE_CRSE_NUMB'])) { - throw new osid_NotFoundException("Could not find a course matching the id-component '$courseIdString' for the catalog '".$this->getDatabaseIdString($this->getCourseCatalogId(), 'catalog/')."'."); + throw new osid_NotFoundException("Could not find a course matching the id-component '$courseIdString' for the catalog '".$this->getDatabaseIdString($this->getCourseCatalogId(), 'catalog.')."'."); } return new banner_course_Course( - $this->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'].$row['SCBCRSE_CRSE_NUMB'], 'course/'), + $this->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'].$row['SCBCRSE_CRSE_NUMB'], 'course.'), $row['SCBCRSE_SUBJ_CODE'].' '.$row['SCBCRSE_CRSE_NUMB'], (null === $row['SCBDESC_TEXT_NARRATIVE']) ? '' : $row['SCBDESC_TEXT_NARRATIVE'], // Description $row['SCBCRSE_TITLE'], $row['SCBCRSE_CREDIT_HR_HIGH'], [ - $this->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'], 'topic/subject/'), - $this->getOsidIdFromString($row['SCBCRSE_DEPT_CODE'], 'topic/department/'), - $this->getOsidIdFromString($row['SCBCRSE_DIVS_CODE'], 'topic/division/'), + $this->getOsidIdFromString($row['SCBCRSE_SUBJ_CODE'], 'topic.subject.'), + $this->getOsidIdFromString($row['SCBCRSE_DEPT_CODE'], 'topic.department.'), + $this->getOsidIdFromString($row['SCBCRSE_DIVS_CODE'], 'topic.division.'), ], $row['has_alternates'], $this); diff --git a/application/library/banner/course/Course/Search/Query.php b/application/library/banner/course/Course/Search/Query.php index bb0a662a..dbf36aa3 100755 --- a/application/library/banner/course/Course/Search/Query.php +++ b/application/library/banner/course/Course/Search/Query.php @@ -575,7 +575,7 @@ public function matchCourseCatalogId(osid_id_Id $courseCatalogId, $match) course_catalog_college WHERE catalog_id = ?)', - [$this->session->getDatabaseIdString($courseCatalogId, 'catalog/')], + [$this->session->getDatabaseIdString($courseCatalogId, 'catalog.')], $match); } @@ -752,7 +752,7 @@ public function getTopicQuery() */ public function matchInstructorId(osid_id_Id $instructorId, $match) { - $this->addClause('instructor_id', 'WEB_ID = ?', [$this->session->getDatabaseIdString($instructorId, 'resource/person/')], $match); + $this->addClause('instructor_id', 'WEB_ID = ?', [$this->session->getDatabaseIdString($instructorId, 'resource.person.')], $match); $this->addTableJoin('LEFT JOIN SSBSECT ON (SCBCRSE_SUBJ_CODE = SSBSECT_SUBJ_CODE AND SCBCRSE_CRSE_NUMB = SSBSECT_CRSE_NUMB)'); $this->addTableJoin('LEFT JOIN SYVINST ON (SYVINST_TERM_CODE = SSBSECT_TERM_CODE AND SYVINST_CRN = SSBSECT_CRN)'); @@ -810,7 +810,7 @@ public function getInstructorQuery() */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term_id', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term_id', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); $this->addTableJoin('LEFT JOIN SSBSECT ON (SCBCRSE_SUBJ_CODE = SSBSECT_SUBJ_CODE AND SCBCRSE_CRSE_NUMB = SSBSECT_CRSE_NUMB)'); $this->addClause('active_sections', 'SSBSECT_SSTS_CODE = ? AND (course_catalog.prnt_ind_to_exclude IS NULL OR SSBSECT_PRNT_IND != course_catalog.prnt_ind_to_exclude)', ['A'], true); @@ -867,7 +867,7 @@ public function getTermQuery() */ public function matchLocationId(osid_id_Id $instructorId, $match) { - $this->addClause('location_id', 'SSBSECT_CAMP_CODE = ?', [$this->session->getDatabaseIdString($instructorId, 'resource/place/campus/')], $match); + $this->addClause('location_id', 'SSBSECT_CAMP_CODE = ?', [$this->session->getDatabaseIdString($instructorId, 'resource.place.campus.')], $match); $this->addTableJoin('LEFT JOIN SSBSECT ON (SCBCRSE_SUBJ_CODE = SSBSECT_SUBJ_CODE AND SCBCRSE_CRSE_NUMB = SSBSECT_CRSE_NUMB)'); $this->addClause('active_sections', 'SSBSECT_SSTS_CODE = ? AND (course_catalog.prnt_ind_to_exclude IS NULL OR SSBSECT_PRNT_IND != course_catalog.prnt_ind_to_exclude)', ['A'], true); diff --git a/application/library/banner/course/Course/Search/Session.php b/application/library/banner/course/Course/Search/Session.php index ffe6435d..0fbbb474 100755 --- a/application/library/banner/course/Course/Search/Session.php +++ b/application/library/banner/course/Course/Search/Session.php @@ -45,7 +45,7 @@ class banner_course_Course_Search_Session extends banner_course_Course_AbstractS */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } diff --git a/application/library/banner/course/CourseCatalog/Lookup/Session.php b/application/library/banner/course/CourseCatalog/Lookup/Session.php index 6ef0d69d..b0b09f6e 100755 --- a/application/library/banner/course/CourseCatalog/Lookup/Session.php +++ b/application/library/banner/course/CourseCatalog/Lookup/Session.php @@ -48,7 +48,7 @@ class banner_course_CourseCatalog_Lookup_Session extends banner_course_AbstractS */ public function __construct(banner_course_CourseManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** diff --git a/application/library/banner/course/CourseManager.php b/application/library/banner/course/CourseManager.php index 7507cac2..d504a41f 100755 --- a/application/library/banner/course/CourseManager.php +++ b/application/library/banner/course/CourseManager.php @@ -35,7 +35,7 @@ public function __construct() { parent::__construct(); - $this->setId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:id:implementations/banner_course')); + $this->setId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:id:implementations.banner_course')); $this->setDisplayName('Banner Course Manager'); $this->setDescription('This is a CourseManager implementation that provides read-only, unauthenticated, access to course information stored in Banner database tables.'); } @@ -76,7 +76,7 @@ public function getIdAuthority() */ public function getCombinedCatalogId() { - return new phpkit_id_Id($this->getIdAuthority(), 'urn', 'catalog/all'); + return new phpkit_id_Id($this->getIdAuthority(), 'urn', 'catalog.all'); } /********************************************************* @@ -118,17 +118,17 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $dsn = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_dsn'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_dsn'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); $username = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_username'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_username'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); $password = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_password'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_password'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode(), $e); @@ -137,7 +137,7 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $debug = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_count_queries'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_count_queries'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/Boolean')); } catch (osid_ConfigurationErrorException $e) { $debug = false; @@ -147,7 +147,7 @@ public function initialize(osid_OsidRuntimeManager $runtime) $driverOptions = []; $options = phpkit_configuration_ConfigUtil::getMultiValuedValueOfAnyType( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_driver_options')); + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_driver_options')); foreach ($options as $key => $value) { $option = constant($key); if (null === $option) { @@ -172,10 +172,10 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $this->idAuthority = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/id_authority'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.id_authority'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); if (!strlen($this->idAuthority)) { - throw new osid_ConfigurationErrorException('urn:inet:middlebury.edu:config:banner_course/id_authority must be specified.'); + throw new osid_ConfigurationErrorException('urn:inet:middlebury.edu:config:banner_course.id_authority must be specified.'); } } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode(), $e); @@ -213,7 +213,7 @@ public function shutdown() public function getCourseLookupSession() { return new banner_course_Course_Lookup_CombinedSession($this, - new phpkit_id_URNInetId('urn:inet:'.$this->idAuthority.':catalog/all')); + new phpkit_id_URNInetId('urn:inet:'.$this->idAuthority.':catalog.all')); } /** @@ -268,7 +268,7 @@ public function getCourseLookupSessionForCatalog(osid_id_Id $courseCatalogId) public function getCourseSearchSession() { return new banner_course_Course_Search_Session($this, - new phpkit_id_URNInetId('urn:inet:'.$this->idAuthority.':catalog/all')); + new phpkit_id_URNInetId('urn:inet:'.$this->idAuthority.':catalog.all')); } /** diff --git a/application/library/banner/course/CourseOffering.php b/application/library/banner/course/CourseOffering.php index 1d714f31..dc6ce2b8 100755 --- a/application/library/banner/course/CourseOffering.php +++ b/application/library/banner/course/CourseOffering.php @@ -117,7 +117,7 @@ public function __construct(array $row, banner_course_CourseOffering_SessionInte $this->setGenusType(new phpkit_type_Type( 'urn', // namespace $this->session->getIdAuthority(), // id authority - 'genera:offering/'.$row['STVSCHD_CODE'], // identifier + 'genera:offering.'.$row['STVSCHD_CODE'], // identifier 'Course Offerings', // domain trim($row['STVSCHD_DESC']), // display name trim($row['STVSCHD_CODE']) // display label @@ -350,10 +350,10 @@ public function getTermId() { $termCode = $this->row['SSBSECT_TERM_CODE']; if (!empty($this->row['SSBSECT_PTRM_CODE']) && 1 != $this->row['SSBSECT_PTRM_CODE']) { - $termCode .= '/'.$this->row['SSBSECT_PTRM_CODE']; + $termCode .= '.'.$this->row['SSBSECT_PTRM_CODE']; } - return $this->getOsidIdFromString($termCode, 'term/'); + return $this->getOsidIdFromString($termCode, 'term.'); } /** @@ -387,16 +387,16 @@ public function getTopicIds() if (!isset($this->topicIds)) { $this->topicIds = []; if ($this->row['SCBCRSE_DEPT_CODE']) { - $this->topicIds[] = $this->getOsidIdFromString($this->row['SCBCRSE_DEPT_CODE'], 'topic/department/'); + $this->topicIds[] = $this->getOsidIdFromString($this->row['SCBCRSE_DEPT_CODE'], 'topic.department.'); } if ($this->row['SSBSECT_SUBJ_CODE']) { - $this->topicIds[] = $this->getOsidIdFromString($this->row['SSBSECT_SUBJ_CODE'], 'topic/subject/'); + $this->topicIds[] = $this->getOsidIdFromString($this->row['SSBSECT_SUBJ_CODE'], 'topic.subject.'); } if ($this->row['SCBCRSE_DIVS_CODE']) { - $this->topicIds[] = $this->getOsidIdFromString($this->row['SCBCRSE_DIVS_CODE'], 'topic/division/'); + $this->topicIds[] = $this->getOsidIdFromString($this->row['SCBCRSE_DIVS_CODE'], 'topic.division.'); } if ($this->row['GTVINSM_CODE']) { - $this->topicIds[] = $this->getOsidIdFromString($this->row['GTVINSM_CODE'], 'topic/instruction_method/'); + $this->topicIds[] = $this->getOsidIdFromString($this->row['GTVINSM_CODE'], 'topic.instruction_method.'); } $this->topicIds = array_merge( @@ -484,8 +484,8 @@ public function hasLocation() public function getLocationId() { return $this->getOsidIdFromString( - $this->row['SSRMEET_BLDG_CODE'].'/'.$this->row['SSRMEET_ROOM_CODE'], - 'resource/place/room/'); + $this->row['SSRMEET_BLDG_CODE'].'.'.$this->row['SSRMEET_ROOM_CODE'], + 'resource.place.room.'); } /** @@ -633,8 +633,8 @@ public function getCalendarId() throw new osid_IllegalStateException('This version of the OSID does not support Learning Objectives'); return $this->getOsidIdFromString( - $this->row['SSBSECT_TERM_CODE'].'/'.$this->row['SSBSECT_CRN'], - 'CourseSchedule/'); + $this->row['SSBSECT_TERM_CODE'].'.'.$this->row['SSBSECT_CRN'], + 'CourseSchedule.'); } /** @@ -879,7 +879,7 @@ public function getLinkSetId() $linkId = substr($this->row['SSBSECT_LINK_IDENT'], 1, 1); } - return $this->getOsidIdFromString($linkId, 'link_set/'); + return $this->getOsidIdFromString($linkId, 'link_set.'); } /** @@ -907,7 +907,7 @@ public function getLinkTypeId() $linkId = substr($this->row['SSBSECT_LINK_IDENT'], 0, 1); } - return $this->getOsidIdFromString($linkId, 'link_type/'); + return $this->getOsidIdFromString($linkId, 'link_type.'); } /********************************************************* diff --git a/application/library/banner/course/CourseOffering/AbstractSession.php b/application/library/banner/course/CourseOffering/AbstractSession.php index 94422035..2cb3e26f 100755 --- a/application/library/banner/course/CourseOffering/AbstractSession.php +++ b/application/library/banner/course/CourseOffering/AbstractSession.php @@ -28,7 +28,7 @@ public function getInstructorIdsForOffering(osid_id_Id $offeringId) { $ids = []; foreach ($this->getInstructorDataForOffering($offeringId) as $row) { - $ids[] = $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'); + $ids[] = $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'); } return new phpkit_id_ArrayIdList($ids); @@ -46,7 +46,7 @@ public function getInstructorsForOffering(osid_id_Id $offeringId) $people = []; foreach ($this->getInstructorDataForOffering($offeringId) as $row) { $people[] = new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -190,7 +190,7 @@ public function getRequirementTopicIdsForCourseOffering(osid_id_Id $courseOfferi self::$requirementTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$requirementTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SSRATTR_ATTR_CODE'], 'topic/requirement/'); + $topicIds[] = $this->getOsidIdFromString($row['SSRATTR_ATTR_CODE'], 'topic.requirement.'); } self::$requirementTopics_stmt->closeCursor(); @@ -231,7 +231,7 @@ public function getLevelTopicIdsForCourseOffering(osid_id_Id $courseOfferingId) self::$levelTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$levelTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SCRLEVL_LEVL_CODE'], 'topic/level/'); + $topicIds[] = $this->getOsidIdFromString($row['SCRLEVL_LEVL_CODE'], 'topic.level.'); } self::$levelTopics_stmt->closeCursor(); @@ -271,7 +271,7 @@ public function getBlockTopicIdsForCourseOffering(osid_id_Id $courseOfferingId) self::$blockTopics_stmt->execute($parameters); $topicIds = []; while ($row = self::$blockTopics_stmt->fetch(PDO::FETCH_ASSOC)) { - $topicIds[] = $this->getOsidIdFromString($row['SSRBLCK_BLCK_CODE'], 'topic/block/'); + $topicIds[] = $this->getOsidIdFromString($row['SSRBLCK_BLCK_CODE'], 'topic.block.'); } self::$blockTopics_stmt->closeCursor(); diff --git a/application/library/banner/course/CourseOffering/Catalog/Session.php b/application/library/banner/course/CourseOffering/Catalog/Session.php index 362a5d85..11762f30 100755 --- a/application/library/banner/course/CourseOffering/Catalog/Session.php +++ b/application/library/banner/course/CourseOffering/Catalog/Session.php @@ -35,7 +35,7 @@ class banner_course_CourseOffering_Catalog_Session extends banner_course_CourseO */ public function __construct(banner_course_CourseManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** @@ -244,7 +244,7 @@ public function getCatalogIdsByCourseOffering(osid_id_Id $courseOfferingId) $ids = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { - $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog/'); + $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog.'); } $statement->closeCursor(); @@ -281,7 +281,7 @@ public function getCatalogsByCourseOffering(osid_id_Id $courseOfferingId) $catalogs = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { $catalogs[] = new banner_course_CourseCatalog( - $this->getOsidIdFromString($row['catalog_id'], 'catalog/'), + $this->getOsidIdFromString($row['catalog_id'], 'catalog.'), $row['catalog_title']); } $statement->closeCursor(); diff --git a/application/library/banner/course/CourseOffering/GenusTypeList.php b/application/library/banner/course/CourseOffering/GenusTypeList.php index 05644c3d..04121ae1 100755 --- a/application/library/banner/course/CourseOffering/GenusTypeList.php +++ b/application/library/banner/course/CourseOffering/GenusTypeList.php @@ -121,7 +121,7 @@ protected function getObjectFromRow(array $row) return new phpkit_type_Type( 'urn', // namespace $this->session->getIdAuthority(), // id authority - 'genera:offering/'.$row['STVSCHD_CODE'], // identifier + 'genera:offering.'.$row['STVSCHD_CODE'], // identifier 'Course Offerings', // domain $row['STVSCHD_DESC'], // display name $row['STVSCHD_CODE'] // display label diff --git a/application/library/banner/course/CourseOffering/Lookup/Session.php b/application/library/banner/course/CourseOffering/Lookup/Session.php index 10e34c1b..af38f847 100755 --- a/application/library/banner/course/CourseOffering/Lookup/Session.php +++ b/application/library/banner/course/CourseOffering/Lookup/Session.php @@ -47,7 +47,7 @@ class banner_course_CourseOffering_Lookup_Session extends banner_course_CourseOf */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } diff --git a/application/library/banner/course/CourseOffering/Search/Query.php b/application/library/banner/course/CourseOffering/Search/Query.php index e6a6e20f..103b6ba7 100755 --- a/application/library/banner/course/CourseOffering/Search/Query.php +++ b/application/library/banner/course/CourseOffering/Search/Query.php @@ -256,7 +256,7 @@ private function getGenusTypeCode(osid_type_Type $genusType) return null; } - if (!preg_match('/^genera:offering\/([a-z]+)$/i', $genusType->getIdentifier(), $matches)) { + if (!preg_match('/^genera:offering\.([a-z]+)$/i', $genusType->getIdentifier(), $matches)) { return null; } @@ -895,8 +895,8 @@ public function matchLocationId(osid_id_Id $resourceId, $match) { // Try room locations try { - $locationString = $this->session->getDatabaseIdString($resourceId, 'resource/place/room/'); - $locationParts = explode('/', $locationString); + $locationString = $this->session->getDatabaseIdString($resourceId, 'resource.place.room.'); + $locationParts = explode('.', $locationString); $this->addClause( 'location', '(SSRMEET_BLDG_CODE = ? AND SSRMEET_ROOM_CODE = ?)', @@ -906,7 +906,7 @@ public function matchLocationId(osid_id_Id $resourceId, $match) // Try building locations catch (osid_NotFoundException $e) { try { - $building = $this->session->getDatabaseIdString($resourceId, 'resource/place/building/'); + $building = $this->session->getDatabaseIdString($resourceId, 'resource.place.building.'); $this->addClause( 'location', 'SSRMEET_BLDG_CODE = ?', @@ -915,7 +915,7 @@ public function matchLocationId(osid_id_Id $resourceId, $match) } // Try campus locations catch (osid_NotFoundException $e) { - $campus = $this->session->getDatabaseIdString($resourceId, 'resource/place/campus/'); + $campus = $this->session->getDatabaseIdString($resourceId, 'resource.place.campus.'); $this->addClause( 'location', 'SSBSECT_CAMP_CODE = ?', @@ -1178,8 +1178,8 @@ public function matchCourseCatalogId(osid_id_Id $courseCatalogId, $match) catalog_id = ? ))', [ - $this->session->getDatabaseIdString($courseCatalogId, 'catalog/'), - $this->session->getDatabaseIdString($courseCatalogId, 'catalog/'), + $this->session->getDatabaseIdString($courseCatalogId, 'catalog.'), + $this->session->getDatabaseIdString($courseCatalogId, 'catalog.'), ], $match); } @@ -1273,7 +1273,7 @@ public function matchAnyURL($match) */ public function matchInstructorId(osid_id_Id $instructorId, $match) { - $this->addClause('instructor_id', 'WEB_ID = ?', [$this->session->getDatabaseIdString($instructorId, 'resource/person/')], $match); + $this->addClause('instructor_id', 'WEB_ID = ?', [$this->session->getDatabaseIdString($instructorId, 'resource.person.')], $match); $this->addTableJoin('LEFT JOIN SYVINST ON (SYVINST_TERM_CODE = SSBSECT_TERM_CODE AND SYVINST_CRN = SSBSECT_CRN)'); } diff --git a/application/library/banner/course/CourseOffering/Search/Session.php b/application/library/banner/course/CourseOffering/Search/Session.php index 3c645e4f..9073d072 100755 --- a/application/library/banner/course/CourseOffering/Search/Session.php +++ b/application/library/banner/course/CourseOffering/Search/Session.php @@ -47,7 +47,7 @@ class banner_course_CourseOffering_Search_Session extends banner_course_CourseOf */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } @@ -269,12 +269,12 @@ public function buildIndex($displayStatus = false) $offerings = $lookupSession->getCourseOfferings(); // Known topic types - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); - $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); + $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'); // Known record types $this->instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); @@ -296,7 +296,7 @@ public function buildIndex($displayStatus = false) if (!$insertStmt->execute([':term_code' => $termCode, ':crn' => $crn, ':text' => $text])) { $info = $insertStmt->errorInfo(); - throw new osid_OperationFailedException('FullText update failed with code '.$info[0].'/'.$info[1].' - '.$info[2]); + throw new osid_OperationFailedException('FullText update failed with code '.$info[0].'.'.$info[1].' - '.$info[2]); } } catch (Exception $e) { echo "\nError of type:\n\t".$e::class."\nwith message:\n\t".$e->getMessage()."\n"; diff --git a/application/library/banner/course/Term/Catalog/Session.php b/application/library/banner/course/Term/Catalog/Session.php index b9aba1fa..c1e7c2d5 100755 --- a/application/library/banner/course/Term/Catalog/Session.php +++ b/application/library/banner/course/Term/Catalog/Session.php @@ -34,7 +34,7 @@ class banner_course_Term_Catalog_Session extends banner_course_AbstractSession i */ public function __construct(banner_course_CourseManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** @@ -232,14 +232,14 @@ public function getTermsByCatalogs(osid_id_IdList $courseCatalogIdList) public function getCatalogIdsByTerm(osid_id_Id $termId) { $parameters = [ - ':section_term_code' => $this->getDatabaseIdString($termId, 'term/'), + ':section_term_code' => $this->getDatabaseIdString($termId, 'term.'), ]; $statement = $this->getGetCatalogsStatement(); $statement->execute($parameters); $ids = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { - $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog/'); + $ids[] = $this->getOsidIdFromString($row['catalog_id'], 'catalog.'); } $statement->closeCursor(); @@ -267,7 +267,7 @@ public function getCatalogIdsByTerm(osid_id_Id $termId) public function getCatalogsByTerm(osid_id_Id $termId) { $parameters = [ - ':section_term_code' => $this->getDatabaseIdString($termId, 'term/'), + ':section_term_code' => $this->getDatabaseIdString($termId, 'term.'), ]; $statement = $this->getGetCatalogsStatement(); $statement->execute($parameters); @@ -275,7 +275,7 @@ public function getCatalogsByTerm(osid_id_Id $termId) $catalogs = []; while ($row = $statement->fetch(PDO::FETCH_ASSOC)) { $catalogs[] = new banner_course_CourseCatalog( - $this->getOsidIdFromString($row['catalog_id'], 'catalog/'), + $this->getOsidIdFromString($row['catalog_id'], 'catalog.'), $row['catalog_title']); } $statement->closeCursor(); diff --git a/application/library/banner/course/Term/ForCourseList.php b/application/library/banner/course/Term/ForCourseList.php index 1c17f68d..6e1dfc3f 100755 --- a/application/library/banner/course/Term/ForCourseList.php +++ b/application/library/banner/course/Term/ForCourseList.php @@ -114,7 +114,7 @@ private function getAllInputParameters() protected function getObjectFromRow(array $row) { return new banner_course_Term( - $this->session->getOsidIdFromString($row['STVTERM_CODE'], 'term/'), + $this->session->getOsidIdFromString($row['STVTERM_CODE'], 'term.'), $row['STVTERM_DESC'], $row['STVTERM_START_DATE'], $row['STVTERM_END_DATE']); diff --git a/application/library/banner/course/Term/Lookup/AllList.php b/application/library/banner/course/Term/Lookup/AllList.php index b74ee291..a49758a5 100755 --- a/application/library/banner/course/Term/Lookup/AllList.php +++ b/application/library/banner/course/Term/Lookup/AllList.php @@ -95,7 +95,7 @@ private function getAllInputParameters() protected function getObjectFromRow(array $row) { return new banner_course_Term( - $this->session->getOsidIdFromString($row['STVTERM_CODE'], 'term/'), + $this->session->getOsidIdFromString($row['STVTERM_CODE'], 'term.'), $row['STVTERM_DESC'], $row['STVTERM_START_DATE'], $row['STVTERM_END_DATE']); diff --git a/application/library/banner/course/Term/Lookup/Session.php b/application/library/banner/course/Term/Lookup/Session.php index ec9bcd18..116ac0b0 100755 --- a/application/library/banner/course/Term/Lookup/Session.php +++ b/application/library/banner/course/Term/Lookup/Session.php @@ -48,7 +48,7 @@ class banner_course_Term_Lookup_Session extends banner_course_AbstractSession im */ public function __construct(banner_course_CourseManagerInterface $manager, ?osid_id_Id $catalogId = null) { - parent::__construct($manager, 'term/'); + parent::__construct($manager, 'term.'); if (null === $catalogId) { $this->catalogId = $manager->getCombinedCatalogId(); @@ -187,8 +187,8 @@ public function useIsolatedCourseCatalogView() */ public function getTerm(osid_id_Id $termId) { - $idString = $this->getDatabaseIdString($termId, 'term/'); - if (!preg_match('/^([0-9]{6})(?:\/([a-z0-9]{1,3}))?$/i', $idString, $matches)) { + $idString = $this->getDatabaseIdString($termId, 'term.'); + if (!preg_match('/^([0-9]{6})(?:\.([a-z0-9]{1,3}))?$/i', $idString, $matches)) { throw new osid_NotFoundException('Term id component \''.$idString.'\' could not be converted to a term code.'); } @@ -255,7 +255,7 @@ protected function getBaseTerm($idString) } return new banner_course_Term( - $this->getOsidIdFromString($row['STVTERM_CODE'], 'term/'), + $this->getOsidIdFromString($row['STVTERM_CODE'], 'term.'), $row['STVTERM_DESC'], $row['STVTERM_START_DATE'], $row['STVTERM_END_DATE']); @@ -341,7 +341,7 @@ protected function getPartOfTerm($termCode, $pTermCode) } return new banner_course_Term( - $this->getOsidIdFromString($row['STVTERM_CODE'].'/'.$row['SOBPTRM_PTRM_CODE'], 'term/'), + $this->getOsidIdFromString($row['STVTERM_CODE'].'.'.$row['SOBPTRM_PTRM_CODE'], 'term.'), $desc, $startDate, $endDate); @@ -374,7 +374,7 @@ private function getCatalogParameters() { $params = []; if (null !== $this->catalogId && !$this->catalogId->isEqual($this->getCombinedCatalogId())) { - $params[':catalog_id'] = $this->getDatabaseIdString($this->catalogId, 'catalog/'); + $params[':catalog_id'] = $this->getDatabaseIdString($this->catalogId, 'catalog.'); } return $params; diff --git a/application/library/banner/course/Topic/AbstractList.php b/application/library/banner/course/Topic/AbstractList.php index bbd3bb52..fc10c13d 100755 --- a/application/library/banner/course/Topic/AbstractList.php +++ b/application/library/banner/course/Topic/AbstractList.php @@ -566,10 +566,10 @@ abstract protected function includeSubjects(); final protected function getObjectFromRow(array $row) { return new banner_course_Topic( - $this->session->getOsidIdFromString($row['type'].'/'.$row['id'], 'topic/'), + $this->session->getOsidIdFromString($row['type'].'.'.$row['id'], 'topic.'), trim($row['display_name']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/'.$row['type']) + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.'.$row['type']) ); } diff --git a/application/library/banner/course/Topic/Lookup/Session.php b/application/library/banner/course/Topic/Lookup/Session.php index 8c9c5e3c..07e79b77 100755 --- a/application/library/banner/course/Topic/Lookup/Session.php +++ b/application/library/banner/course/Topic/Lookup/Session.php @@ -46,7 +46,7 @@ class banner_course_Topic_Lookup_Session extends banner_course_AbstractSession i */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } @@ -215,8 +215,8 @@ public function getTopic(osid_id_Id $topicId) */ public function getTopicType(osid_id_Id $topicId) { - $string = $this->getDatabaseIdString($topicId, 'topic/'); - if (!preg_match('#(subject|department|division|requirement|level|block|instruction_method)/.+#', $string, $matches)) { + $string = $this->getDatabaseIdString($topicId, 'topic.'); + if (!preg_match('#(subject|department|division|requirement|level|block|instruction_method)..+#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a topic type.'); } @@ -232,8 +232,8 @@ public function getTopicType(osid_id_Id $topicId) */ public function getTopicValue(osid_id_Id $topicId) { - $string = $this->getDatabaseIdString($topicId, 'topic/'); - if (!preg_match('#(subject|department|division|requirement|level|block|instruction_method)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($topicId, 'topic.'); + if (!preg_match('#(subject|department|division|requirement|level|block|instruction_method).(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a topic type.'); } @@ -278,7 +278,7 @@ private function getSubjectTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':subject_code' => $this->getDatabaseIdString($topicId, 'topic/subject/'), + ':subject_code' => $this->getDatabaseIdString($topicId, 'topic.subject.'), ], $this->getCatalogParameters()); self::$getSubjectTopic_stmts[$catalogWhere]->execute($parameters); @@ -286,14 +286,14 @@ private function getSubjectTopic(osid_id_Id $topicId) self::$getSubjectTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVSUBJ_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the subject code '.$this->getDatabaseIdString($topicId, 'topic/subject/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the subject code '.$this->getDatabaseIdString($topicId, 'topic.subject.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVSUBJ_CODE'], 'topic/subject/'), + $this->getOsidIdFromString($row['STVSUBJ_CODE'], 'topic.subject.'), trim($row['STVSUBJ_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject') ); } @@ -339,10 +339,10 @@ private function getSubjectTopics() $topics = []; while ($row = self::$getSubjectTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVSUBJ_CODE'], 'topic/subject/'), + $this->getOsidIdFromString($row['STVSUBJ_CODE'], 'topic.subject.'), trim($row['STVSUBJ_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject') ); } self::$getSubjectTopics_stmts[$catalogWhere]->closeCursor(); @@ -388,7 +388,7 @@ private function getDepartmentTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':department_code' => $this->getDatabaseIdString($topicId, 'topic/department/'), + ':department_code' => $this->getDatabaseIdString($topicId, 'topic.department.'), ], $this->getCatalogParameters()); self::$getDepartmentTopic_stmts[$catalogWhere]->execute($parameters); @@ -396,14 +396,14 @@ private function getDepartmentTopic(osid_id_Id $topicId) self::$getDepartmentTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVDEPT_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the department code '.$this->getDatabaseIdString($topicId, 'topic/department/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the department code '.$this->getDatabaseIdString($topicId, 'topic.department.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVDEPT_CODE'], 'topic/department/'), + $this->getOsidIdFromString($row['STVDEPT_CODE'], 'topic.department.'), trim($row['STVDEPT_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department') ); } @@ -448,10 +448,10 @@ private function getDepartmentTopics() $topics = []; while ($row = self::$getDepartmentTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVDEPT_CODE'], 'topic/department/'), + $this->getOsidIdFromString($row['STVDEPT_CODE'], 'topic.department.'), trim($row['STVDEPT_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department') ); } self::$getDepartmentTopics_stmts[$catalogWhere]->closeCursor(); @@ -497,7 +497,7 @@ private function getDivisionTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':division_code' => $this->getDatabaseIdString($topicId, 'topic/division/'), + ':division_code' => $this->getDatabaseIdString($topicId, 'topic.division.'), ], $this->getCatalogParameters()); self::$getDivisionTopic_stmts[$catalogWhere]->execute($parameters); @@ -505,14 +505,14 @@ private function getDivisionTopic(osid_id_Id $topicId) self::$getDivisionTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVDIVS_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the division code '.$this->getDatabaseIdString($topicId, 'topic/division/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the division code '.$this->getDatabaseIdString($topicId, 'topic.division.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVDIVS_CODE'], 'topic/division/'), + $this->getOsidIdFromString($row['STVDIVS_CODE'], 'topic.division.'), trim($row['STVDIVS_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division') ); } @@ -557,10 +557,10 @@ private function getDivisionTopics() $topics = []; while ($row = self::$getDivisionTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVDIVS_CODE'], 'topic/division/'), + $this->getOsidIdFromString($row['STVDIVS_CODE'], 'topic.division.'), trim($row['STVDIVS_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division') ); } self::$getDivisionTopics_stmts[$catalogWhere]->closeCursor(); @@ -626,7 +626,7 @@ private function getRequirementTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':requirement_code' => $this->getDatabaseIdString($topicId, 'topic/requirement/'), + ':requirement_code' => $this->getDatabaseIdString($topicId, 'topic.requirement.'), ], $this->getCatalogParameters()); self::$getRequirementTopic_stmts[$catalogWhere]->execute($parameters); @@ -640,15 +640,15 @@ private function getRequirementTopic(osid_id_Id $topicId) self::$getCourseRequirementTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVATTR_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the requirement code '.$this->getDatabaseIdString($topicId, 'topic/requirement/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the requirement code '.$this->getDatabaseIdString($topicId, 'topic.requirement.').'.'); } } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVATTR_CODE'], 'topic/requirement/'), + $this->getOsidIdFromString($row['STVATTR_CODE'], 'topic.requirement.'), trim($row['STVATTR_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement') ); } @@ -687,10 +687,10 @@ private function getRequirementTopics() $topics = []; while ($row = self::$getRequirementTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVATTR_CODE'], 'topic/requirement/'), + $this->getOsidIdFromString($row['STVATTR_CODE'], 'topic.requirement.'), trim($row['STVATTR_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement') ); } self::$getRequirementTopics_stmts[$catalogWhere]->closeCursor(); @@ -737,7 +737,7 @@ private function getLevelTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':level_code' => $this->getDatabaseIdString($topicId, 'topic/level/'), + ':level_code' => $this->getDatabaseIdString($topicId, 'topic.level.'), ], $this->getCatalogParameters()); self::$getLevelTopic_stmts[$catalogWhere]->execute($parameters); @@ -745,14 +745,14 @@ private function getLevelTopic(osid_id_Id $topicId) self::$getLevelTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVLEVL_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the level code '.$this->getDatabaseIdString($topicId, 'topic/level/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the level code '.$this->getDatabaseIdString($topicId, 'topic.level.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVLEVL_CODE'], 'topic/level/'), + $this->getOsidIdFromString($row['STVLEVL_CODE'], 'topic.level.'), trim($row['STVLEVL_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level') ); } @@ -798,10 +798,10 @@ private function getLevelTopics() $topics = []; while ($row = self::$getLevelTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVLEVL_CODE'], 'topic/level/'), + $this->getOsidIdFromString($row['STVLEVL_CODE'], 'topic.level.'), trim($row['STVLEVL_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level') ); } self::$getLevelTopics_stmts[$catalogWhere]->closeCursor(); @@ -841,7 +841,7 @@ private function getBlockTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':block_code' => $this->getDatabaseIdString($topicId, 'topic/block/'), + ':block_code' => $this->getDatabaseIdString($topicId, 'topic.block.'), ], $this->getCatalogParameters()); self::$getBlockTopic_stmts[$catalogWhere]->execute($parameters); @@ -849,14 +849,14 @@ private function getBlockTopic(osid_id_Id $topicId) self::$getBlockTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['STVBLCK_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the block code '.$this->getDatabaseIdString($topicId, 'topic/block/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the block code '.$this->getDatabaseIdString($topicId, 'topic.block.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['STVBLCK_CODE'], 'topic/block/'), + $this->getOsidIdFromString($row['STVBLCK_CODE'], 'topic.block.'), trim($row['STVBLCK_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block') ); } @@ -895,10 +895,10 @@ private function getBlockTopics() $topics = []; while ($row = self::$getBlockTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['STVBLCK_CODE'], 'topic/block/'), + $this->getOsidIdFromString($row['STVBLCK_CODE'], 'topic.block.'), trim($row['STVBLCK_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block') ); } self::$getBlockTopics_stmts[$catalogWhere]->closeCursor(); @@ -938,7 +938,7 @@ private function getInstructionMethodTopic(osid_id_Id $topicId) $parameters = array_merge( [ - ':insm_code' => $this->getDatabaseIdString($topicId, 'topic/instruction_method/'), + ':insm_code' => $this->getDatabaseIdString($topicId, 'topic.instruction_method.'), ], $this->getCatalogParameters()); self::$getInstructionMethodTopic_stmts[$catalogWhere]->execute($parameters); @@ -946,14 +946,14 @@ private function getInstructionMethodTopic(osid_id_Id $topicId) self::$getInstructionMethodTopic_stmts[$catalogWhere]->closeCursor(); if (!$row['GTVINSM_CODE']) { - throw new osid_NotFoundException('Could not find a topic matching the instruction_method code '.$this->getDatabaseIdString($topicId, 'topic/instruction_method/').'.'); + throw new osid_NotFoundException('Could not find a topic matching the instruction_method code '.$this->getDatabaseIdString($topicId, 'topic.instruction_method.').'.'); } return new banner_course_Topic( - $this->getOsidIdFromString($row['GTVINSM_CODE'], 'topic/instruction_method/'), + $this->getOsidIdFromString($row['GTVINSM_CODE'], 'topic.instruction_method.'), trim($row['GTVINSM_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method') ); } @@ -992,10 +992,10 @@ private function getInstructionMethodTopics() $topics = []; while ($row = self::$getInstructionMethodTopics_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC)) { $topics[] = new banner_course_Topic( - $this->getOsidIdFromString($row['GTVINSM_CODE'], 'topic/instruction_method/'), + $this->getOsidIdFromString($row['GTVINSM_CODE'], 'topic.instruction_method.'), trim($row['GTVINSM_DESC']), '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method') ); } self::$getInstructionMethodTopics_stmts[$catalogWhere]->closeCursor(); @@ -1111,19 +1111,19 @@ public function getTopicsByGenusType(osid_type_Type $topicGenusType) return new phpkit_EmptyList('osid_course_TopicList'); } switch ($topicGenusType->getIdentifier()) { - case 'genera:topic/subject': + case 'genera:topic.subject': return $this->getSubjectTopics(); - case 'genera:topic/department': + case 'genera:topic.department': return $this->getDepartmentTopics(); - case 'genera:topic/division': + case 'genera:topic.division': return $this->getDivisionTopics(); - case 'genera:topic/requirement': + case 'genera:topic.requirement': return $this->getRequirementTopics(); - case 'genera:topic/level': + case 'genera:topic.level': return $this->getLevelTopics(); - case 'genera:topic/block': + case 'genera:topic.block': return $this->getBlockTopics(); - case 'genera:topic/instruction_method': + case 'genera:topic.instruction_method': return $this->getInstructionMethodTopics(); default: return new phpkit_EmptyList('osid_course_TopicList'); diff --git a/application/library/banner/course/Topic/Search/Query.php b/application/library/banner/course/Topic/Search/Query.php index b17c2f77..3ccff3c3 100755 --- a/application/library/banner/course/Topic/Search/Query.php +++ b/application/library/banner/course/Topic/Search/Query.php @@ -39,13 +39,13 @@ public function __construct(banner_course_SessionInterface $session) $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); - $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/instruction_method'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); + $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'); $this->toInclude = []; } diff --git a/application/library/banner/course/Topic/Search/Query/Block.php b/application/library/banner/course/Topic/Search/Query/Block.php index 10c04d1b..0038fc65 100755 --- a/application/library/banner/course/Topic/Search/Query/Block.php +++ b/application/library/banner/course/Topic/Search/Query/Block.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Department.php b/application/library/banner/course/Topic/Search/Query/Department.php index 452c344a..e98ff86b 100755 --- a/application/library/banner/course/Topic/Search/Query/Department.php +++ b/application/library/banner/course/Topic/Search/Query/Department.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Division.php b/application/library/banner/course/Topic/Search/Query/Division.php index 390e735b..95f29e51 100755 --- a/application/library/banner/course/Topic/Search/Query/Division.php +++ b/application/library/banner/course/Topic/Search/Query/Division.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/InstructionMethod.php b/application/library/banner/course/Topic/Search/Query/InstructionMethod.php index 154b90d1..6d816c30 100644 --- a/application/library/banner/course/Topic/Search/Query/InstructionMethod.php +++ b/application/library/banner/course/Topic/Search/Query/InstructionMethod.php @@ -375,6 +375,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Level.php b/application/library/banner/course/Topic/Search/Query/Level.php index 058bada9..8642814e 100755 --- a/application/library/banner/course/Topic/Search/Query/Level.php +++ b/application/library/banner/course/Topic/Search/Query/Level.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Requirement.php b/application/library/banner/course/Topic/Search/Query/Requirement.php index 2572290e..f9bf8237 100755 --- a/application/library/banner/course/Topic/Search/Query/Requirement.php +++ b/application/library/banner/course/Topic/Search/Query/Requirement.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Query/Subject.php b/application/library/banner/course/Topic/Search/Query/Subject.php index d180982f..06f74654 100755 --- a/application/library/banner/course/Topic/Search/Query/Subject.php +++ b/application/library/banner/course/Topic/Search/Query/Subject.php @@ -379,6 +379,6 @@ public function getTopicQueryRecord(osid_type_Type $topicRecordType) */ public function matchTermId(osid_id_Id $termId, $match) { - $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term/')], $match); + $this->addClause('term', 'SSBSECT_TERM_CODE = ?', [$this->session->getDatabaseIdString($termId, 'term.')], $match); } } diff --git a/application/library/banner/course/Topic/Search/Session.php b/application/library/banner/course/Topic/Search/Session.php index 4c0bc9f5..36c4fecf 100755 --- a/application/library/banner/course/Topic/Search/Session.php +++ b/application/library/banner/course/Topic/Search/Session.php @@ -45,7 +45,7 @@ class banner_course_Topic_Search_Session extends banner_course_AbstractSession i */ public function __construct(banner_course_CourseManagerInterface $manager, osid_id_Id $catalogId) { - parent::__construct($manager, 'section/'); + parent::__construct($manager, 'section.'); $this->catalogId = $catalogId; } diff --git a/application/library/banner/resource/Bin/Lookup/Session.php b/application/library/banner/resource/Bin/Lookup/Session.php index de76dc68..8d972c8e 100755 --- a/application/library/banner/resource/Bin/Lookup/Session.php +++ b/application/library/banner/resource/Bin/Lookup/Session.php @@ -40,7 +40,7 @@ class banner_resource_Bin_Lookup_Session extends banner_AbstractSession implemen */ public function __construct(banner_ManagerInterface $manager) { - parent::__construct($manager, 'catalog/'); + parent::__construct($manager, 'catalog.'); } /** diff --git a/application/library/banner/resource/Resource/Building.php b/application/library/banner/resource/Resource/Building.php index 3c467717..59d4ccd9 100644 --- a/application/library/banner/resource/Resource/Building.php +++ b/application/library/banner/resource/Resource/Building.php @@ -39,7 +39,7 @@ public function __construct(osid_id_Id $id, $displayName, $code) $this->setId($id); $this->setDisplayName($displayName); $this->setDescription($code); - $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/building')); + $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.building')); $this->buildingDisplayName = $displayName; $this->buildingCode = $code; diff --git a/application/library/banner/resource/Resource/Lookup/CombinedSession.php b/application/library/banner/resource/Resource/Lookup/CombinedSession.php index 08445eba..9e4b368d 100755 --- a/application/library/banner/resource/Resource/Lookup/CombinedSession.php +++ b/application/library/banner/resource/Resource/Lookup/CombinedSession.php @@ -45,7 +45,7 @@ class banner_resource_Resource_Lookup_CombinedSession extends banner_AbstractSes */ public function __construct(banner_ManagerInterface $manager) { - parent::__construct($manager, 'resource/'); + parent::__construct($manager, 'resource.'); } /** @@ -181,11 +181,11 @@ public function getResource(osid_id_Id $resourceId) switch ($type) { case 'person': return $this->getPersonResource($resourceId); - case 'place/room': + case 'place.room': return $this->getRoomResource($resourceId); - case 'place/building': + case 'place.building': return $this->getBuildingResource($resourceId); - case 'place/campus': + case 'place.campus': return $this->getCampusResource($resourceId); default: throw new osid_NotFoundException('No resource found with category '.$type); @@ -201,8 +201,8 @@ public function getResource(osid_id_Id $resourceId) */ public function getResourceType(osid_id_Id $resourceId) { - $string = $this->getDatabaseIdString($resourceId, 'resource/'); - if (!preg_match('#(person|place/room|place/building|place/campus)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($resourceId, 'resource.'); + if (!preg_match('#(person|place\.room|place\.building|place\.campus)\.(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a resource type.'); } @@ -218,8 +218,8 @@ public function getResourceType(osid_id_Id $resourceId) */ public function getResourceValue(osid_id_Id $resourceId) { - $string = $this->getDatabaseIdString($resourceId, 'resource/'); - if (!preg_match('#(person|place/room|place/building|place/campus)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($resourceId, 'resource.'); + if (!preg_match('#(person|place\.room|place\.building|place\.campus)\.(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a resource type.'); } @@ -252,18 +252,18 @@ private function getPersonResource(osid_id_Id $resourceId) } $parameters = [ - ':webid' => $this->getDatabaseIdString($resourceId, 'resource/person/'), + ':webid' => $this->getDatabaseIdString($resourceId, 'resource.person.'), ]; self::$getPersonResource_stmt->execute($parameters); $row = self::$getPersonResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getPersonResource_stmt->closeCursor(); if (!$row['WEB_ID']) { - throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource/person/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource.person.').'.'); } return new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -298,7 +298,7 @@ private function getPersonResources() $resources = []; while ($row = self::$getPersonResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -333,18 +333,18 @@ private function getBuildingResource(osid_id_Id $resourceId) } $parameters = [ - ':code' => $this->getDatabaseIdString($resourceId, 'resource/place/building/'), + ':code' => $this->getDatabaseIdString($resourceId, 'resource.place.building.'), ]; self::$getBuildingResource_stmt->execute($parameters); $row = self::$getBuildingResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getBuildingResource_stmt->closeCursor(); if (!$row['STVBLDG_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource/place/building/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource.place.building.').'.'); } return new banner_resource_Resource_Building( - $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource/place/building/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource.place.building.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'] ); @@ -377,7 +377,7 @@ private function getBuildingResources() $resources = []; while ($row = self::$getBuildingResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Building( - $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource/place/building/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource.place.building.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'] ); @@ -416,8 +416,8 @@ private function getRoomResource(osid_id_Id $resourceId) self::$getRoomResource_stmt = $this->manager->getDB()->prepare($query); } - $roomString = $this->getDatabaseIdString($resourceId, 'resource/place/room/'); - if (!preg_match('#^([a-z0-9_-]+)/(.+)$#i', $roomString, $matches)) { + $roomString = $this->getDatabaseIdString($resourceId, 'resource.place.room.'); + if (!preg_match('#^([a-z0-9_-]+)\.(.+)$#i', $roomString, $matches)) { throw new osid_NotFoundException("Room string '$roomString' doesn't match."); } @@ -430,11 +430,11 @@ private function getRoomResource(osid_id_Id $resourceId) self::$getRoomResource_stmt->closeCursor(); if (!$row['STVBLDG_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource/place/room/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource.place.room.').'.'); } return new banner_resource_Resource_Room( - $this->getOsidIdFromString($row['STVBLDG_CODE'].'/'.$row['SSRMEET_ROOM_CODE'], 'resource/place/room/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'].'.'.$row['SSRMEET_ROOM_CODE'], 'resource.place.room.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'], $row['SSRMEET_ROOM_CODE'] @@ -474,7 +474,7 @@ private function getRoomResources() $resources = []; while ($row = self::$getRoomResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Room( - $this->getOsidIdFromString($row['STVBLDG_CODE'].'/'.$row['SSRMEET_ROOM_CODE'], 'resource/place/room/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'].'.'.$row['SSRMEET_ROOM_CODE'], 'resource.place.room.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'], $row['SSRMEET_ROOM_CODE'] @@ -510,21 +510,21 @@ private function getCampusResource(osid_id_Id $resourceId) } $parameters = [ - ':code' => $this->getDatabaseIdString($resourceId, 'resource/place/campus/'), + ':code' => $this->getDatabaseIdString($resourceId, 'resource.place.campus.'), ]; self::$getCampusResource_stmt->execute($parameters); $row = self::$getCampusResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getCampusResource_stmt->closeCursor(); if (!$row['STVCAMP_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource/place/campus/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource.place.campus.').'.'); } return new banner_resource_Resource_Place( - $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource/place/campus/'), + $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource.place.campus.'), $row['STVCAMP_DESC'], '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus') ); } @@ -555,10 +555,10 @@ private function getCampusResources() $resources = []; while ($row = self::$getCampusResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Place( - $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource/place/campus/'), + $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource.place.campus.'), $row['STVCAMP_DESC'], '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus') ); } self::$getCampusResources_stmt->closeCursor(); @@ -641,15 +641,15 @@ public function getResourcesByGenusType(osid_type_Type $resourceGenusType) return new phpkit_EmptyList('osid_resource_ResourceList'); } switch ($resourceGenusType->getIdentifier()) { - case 'genera:resource/person': + case 'genera:resource.person': return $this->getPersonResources(); - case 'genera:resource/place/campus': + case 'genera:resource.place.campus': return $this->getCampusResources(); - case 'genera:resource/place/building': + case 'genera:resource.place.building': return $this->getBuildingResources(); - case 'genera:resource/place/room': + case 'genera:resource.place.room': return $this->getRoomResources(); - // case 'genera:resource/place': + // case 'genera:resource.place': // return $this->getPlaceResources(); default: return new phpkit_EmptyList('osid_resource_ResourceList'); @@ -685,7 +685,7 @@ public function getResourcesByParentGenusType(osid_type_Type $resourceGenusType) return new phpkit_EmptyList('osid_resource_ResourceList'); } - if ('genera:resource/place' == $resourceGenusType->getIdentifier()) { + if ('genera:resource.place' == $resourceGenusType->getIdentifier()) { $resourceList = new phpkit_CombinedList('osid_resource_ResourceList'); $resourceList->addList($this->getCampusResources()); $resourceList->addList($this->getBuildingResources()); diff --git a/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php b/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php index 88de7ce4..48d6de3d 100755 --- a/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php +++ b/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php @@ -45,7 +45,7 @@ class banner_resource_Resource_Lookup_PerCatalogSession extends banner_AbstractS */ public function __construct(banner_ManagerInterface $manager, osid_id_Id $binId) { - parent::__construct($manager, 'resource/'); + parent::__construct($manager, 'resource.'); $this->binId = $binId; } @@ -80,7 +80,7 @@ private function getCatalogParameters() { $params = []; if (null !== $this->binId && !$this->binId->isEqual($this->manager->getCombinedBinId())) { - $params[':catalog_id'] = $this->getDatabaseIdString($this->binId, 'catalog/'); + $params[':catalog_id'] = $this->getDatabaseIdString($this->binId, 'catalog.'); } return $params; @@ -225,11 +225,11 @@ public function getResource(osid_id_Id $resourceId) switch ($type) { case 'person': return $this->getPersonResource($resourceId); - case 'place/room': + case 'place.room': return $this->getRoomResource($resourceId); - case 'place/building': + case 'place.building': return $this->getBuildingResource($resourceId); - case 'place/campus': + case 'place.campus': return $this->getCampusResource($resourceId); default: throw new osid_NotFoundException('No resource found with category '.$type); @@ -245,8 +245,8 @@ public function getResource(osid_id_Id $resourceId) */ public function getResourceType(osid_id_Id $resourceId) { - $string = $this->getDatabaseIdString($resourceId, 'resource/'); - if (!preg_match('#(person|place/room|place/building|place/campus)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($resourceId, 'resource.'); + if (!preg_match('#(person|place\.room|place\.building|place\.campus)\.(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a resource type.'); } @@ -262,8 +262,8 @@ public function getResourceType(osid_id_Id $resourceId) */ public function getResourceValue(osid_id_Id $resourceId) { - $string = $this->getDatabaseIdString($resourceId, 'resource/'); - if (!preg_match('#(person|place/room|place/building|place/campus)/(.+)#', $string, $matches)) { + $string = $this->getDatabaseIdString($resourceId, 'resource.'); + if (!preg_match('#(person|place\.room|place\.building|place\.campus)\.(.+)#', $string, $matches)) { throw new osid_NotFoundException('Could not turn "'.$string.'" into a resource type.'); } @@ -311,7 +311,7 @@ private function getPersonResource(osid_id_Id $resourceId) $parameters = array_merge( [ - ':webid' => $this->getDatabaseIdString($resourceId, 'resource/person/'), + ':webid' => $this->getDatabaseIdString($resourceId, 'resource.person.'), ], $this->getCatalogParameters()); self::$getPersonResource_stmt->execute($parameters); @@ -319,11 +319,11 @@ private function getPersonResource(osid_id_Id $resourceId) self::$getPersonResource_stmt->closeCursor(); if (!$row['WEB_ID']) { - throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource/person/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource.person.').'.'); } return new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -373,7 +373,7 @@ private function getPersonResources() $resources = []; while ($row = self::$getPersonResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Person( - $this->getOsidIdFromString($row['WEB_ID'], 'resource/person/'), + $this->getOsidIdFromString($row['WEB_ID'], 'resource.person.'), $row['SYVINST_LAST_NAME'], $row['SYVINST_FIRST_NAME'] ); @@ -425,7 +425,7 @@ private function getBuildingResource(osid_id_Id $resourceId) $parameters = array_merge( [ - ':code' => $this->getDatabaseIdString($resourceId, 'resource/place/building/'), + ':code' => $this->getDatabaseIdString($resourceId, 'resource.place.building.'), ], $this->getCatalogParameters()); self::$getBuildingResource_stmt->execute($parameters); @@ -433,11 +433,11 @@ private function getBuildingResource(osid_id_Id $resourceId) self::$getBuildingResource_stmt->closeCursor(); if (!$row['STVBLDG_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource/place/building/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource.place.building.').'.'); } return new banner_resource_Resource_Building( - $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource/place/building/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource.place.building.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'] ); @@ -486,7 +486,7 @@ private function getBuildingResources() $resources = []; while ($row = self::$getBuildingResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Building( - $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource/place/building/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'], 'resource.place.building.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'] ); @@ -537,8 +537,8 @@ private function getRoomResource(osid_id_Id $resourceId) self::$getRoomResource_stmt = $this->manager->getDB()->prepare($query); } - $roomString = $this->getDatabaseIdString($resourceId, 'resource/place/room/'); - if (!preg_match('#^([a-z0-9_-]+)/(.+)$#i', $roomString, $matches)) { + $roomString = $this->getDatabaseIdString($resourceId, 'resource.place.room.'); + if (!preg_match('#^([a-z0-9_-]+)\.(.+)$#i', $roomString, $matches)) { throw new osid_NotFoundException("Room string '$roomString' doesn't match."); } @@ -553,11 +553,11 @@ private function getRoomResource(osid_id_Id $resourceId) self::$getRoomResource_stmt->closeCursor(); if (!$row['STVBLDG_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource/place/room/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource.place.room.').'.'); } return new banner_resource_Resource_Room( - $this->getOsidIdFromString($row['STVBLDG_CODE'].'/'.$row['SSRMEET_ROOM_CODE'], 'resource/place/room/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'].'.'.$row['SSRMEET_ROOM_CODE'], 'resource.place.room.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'], $row['SSRMEET_ROOM_CODE'] @@ -610,7 +610,7 @@ private function getRoomResources() $resources = []; while ($row = self::$getRoomResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Room( - $this->getOsidIdFromString($row['STVBLDG_CODE'].'/'.$row['SSRMEET_ROOM_CODE'], 'resource/place/room/'), + $this->getOsidIdFromString($row['STVBLDG_CODE'].'.'.$row['SSRMEET_ROOM_CODE'], 'resource.place.room.'), $row['STVBLDG_DESC'], $row['STVBLDG_CODE'], $row['SSRMEET_ROOM_CODE'] @@ -649,7 +649,7 @@ private function getCampusResource(osid_id_Id $resourceId) $parameters = array_merge( [ - ':code' => $this->getDatabaseIdString($resourceId, 'resource/place/campus/'), + ':code' => $this->getDatabaseIdString($resourceId, 'resource.place.campus.'), ], $this->getCatalogParameters()); self::$getCampusResource_stmt->execute($parameters); @@ -657,14 +657,14 @@ private function getCampusResource(osid_id_Id $resourceId) self::$getCampusResource_stmt->closeCursor(); if (!$row['STVCAMP_CODE']) { - throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource/place/campus/').'.'); + throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource.place.campus.').'.'); } return new banner_resource_Resource_Place( - $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource/place/campus/'), + $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource.place.campus.'), $row['STVCAMP_DESC'], '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus') ); } @@ -697,10 +697,10 @@ private function getCampusResources() $resources = []; while ($row = self::$getCampusResources_stmt->fetch(PDO::FETCH_ASSOC)) { $resources[] = new banner_resource_Resource_Place( - $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource/place/campus/'), + $this->getOsidIdFromString($row['STVCAMP_CODE'], 'resource.place.campus.'), $row['STVCAMP_DESC'], '', - new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus') + new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus') ); } self::$getCampusResources_stmt->closeCursor(); @@ -783,15 +783,15 @@ public function getResourcesByGenusType(osid_type_Type $resourceGenusType) return new phpkit_EmptyList('osid_resource_ResourceList'); } switch ($resourceGenusType->getIdentifier()) { - case 'genera:resource/person': + case 'genera:resource.person': return $this->getPersonResources(); - case 'genera:resource/place/campus': + case 'genera:resource.place.campus': return $this->getCampusResources(); - case 'genera:resource/place/building': + case 'genera:resource.place.building': return $this->getBuildingResources(); - case 'genera:resource/place/room': + case 'genera:resource.place.room': return $this->getRoomResources(); - // case 'genera:resource/place': + // case 'genera:resource.place': // return $this->getPlaceResources(); default: return new phpkit_EmptyList('osid_resource_ResourceList'); @@ -827,7 +827,7 @@ public function getResourcesByParentGenusType(osid_type_Type $resourceGenusType) return new phpkit_EmptyList('osid_resource_ResourceList'); } - if ('genera:resource/place' == $resourceGenusType->getIdentifier()) { + if ('genera:resource.place' == $resourceGenusType->getIdentifier()) { $resourceList = new phpkit_CombinedList('osid_resource_ResourceList'); $resourceList->addList($this->getCampusResources()); $resourceList->addList($this->getBuildingResources()); diff --git a/application/library/banner/resource/Resource/Person.php b/application/library/banner/resource/Resource/Person.php index 017b5615..25770527 100755 --- a/application/library/banner/resource/Resource/Person.php +++ b/application/library/banner/resource/Resource/Person.php @@ -77,7 +77,7 @@ public function __construct(osid_id_Id $id, $surname, $givenName, $middleNames = $this->addRecordType($this->namesType); - $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/person')); + $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.person')); } /** diff --git a/application/library/banner/resource/Resource/Room.php b/application/library/banner/resource/Resource/Room.php index cd372449..0f7c259c 100644 --- a/application/library/banner/resource/Resource/Room.php +++ b/application/library/banner/resource/Resource/Room.php @@ -32,7 +32,7 @@ class banner_resource_Resource_Room extends banner_resource_Resource_Building public function __construct(osid_id_Id $id, $buildingDisplayName, $buildingCode, $room) { parent::__construct($id, $buildingDisplayName, $buildingCode); - $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/room')); + $this->setGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.room')); $this->setDisplayName($buildingDisplayName.' '.$room); $this->setDescription($buildingCode.' '.$room); $this->room = $room; diff --git a/application/library/banner/resource/ResourceManager.php b/application/library/banner/resource/ResourceManager.php index 9ea7fa4e..3baf4f53 100755 --- a/application/library/banner/resource/ResourceManager.php +++ b/application/library/banner/resource/ResourceManager.php @@ -78,7 +78,7 @@ public function getIdAuthority() */ public function getCombinedBinId() { - return new phpkit_id_Id($this->getIdAuthority(), 'urn', 'resource/all'); + return new phpkit_id_Id($this->getIdAuthority(), 'urn', 'resource.all'); } /********************************************************* @@ -120,17 +120,17 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $dsn = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_dsn'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_dsn'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); $username = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_username'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_username'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); $password = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_password'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_password'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode()); @@ -139,7 +139,7 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $debug = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/pdo_count_queries'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.pdo_count_queries'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/Boolean')); } catch (osid_ConfigurationErrorException $e) { $debug = false; @@ -158,10 +158,10 @@ public function initialize(osid_OsidRuntimeManager $runtime) try { $this->idAuthority = phpkit_configuration_ConfigUtil::getSingleValuedValue( $runtime->getConfiguration(), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course/id_authority'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:config:banner_course.id_authority'), new phpkit_type_Type('urn', 'middlebury.edu', 'Primitives/String')); if (!strlen($this->idAuthority)) { - throw new osid_ConfigurationErrorException('urn:inet:middlebury.edu:config:banner_course/id_authority must be specified.'); + throw new osid_ConfigurationErrorException('urn:inet:middlebury.edu:config:banner_course.id_authority must be specified.'); } } catch (osid_NotFoundException $e) { throw new osid_ConfigurationErrorException($e->getMessage(), $e->getCode()); diff --git a/application/sql/convert_id_separators_to_period.sql b/application/sql/convert_id_separators_to_period.sql new file mode 100644 index 00000000..e1a66e67 --- /dev/null +++ b/application/sql/convert_id_separators_to_period.sql @@ -0,0 +1,7 @@ +UPDATE user_catalog SET catalog_id_keyword = REPLACE(catalog_id_keyword, '/', '.'); +UPDATE user_savedcourses SET course_id_keyword = REPLACE(course_id_keyword, '/', '.'); +UPDATE user_schedules SET term_id_keyword = REPLACE(term_id_keyword, '/', '.'); +UPDATE user_schedule_offerings SET offering_id_keyword = REPLACE(offering_id_keyword, '/', '.'); +UPDATE archive_configurations SET catalog_id = REPLACE(catalog_id, '/', '.'); +UPDATE archive_configuration_revisions SET json_data=REPLACE(json_data, 'topic\\/subject\\/', 'topic.subject.'); +UPDATE archive_configuration_revisions SET json_data=REPLACE(json_data, 'topic\\/department\\/', 'topic.department.'); diff --git a/application/test/Catalog/Action/Helper/OsidIdTest.php b/application/test/Catalog/Action/Helper/OsidIdTest.php index 6bb7cff0..0a3240f9 100755 --- a/application/test/Catalog/Action/Helper/OsidIdTest.php +++ b/application/test/Catalog/Action/Helper/OsidIdTest.php @@ -32,7 +32,7 @@ protected function tearDown(): void public function testGetOsidIdFromString() { - $id = new phpkit_id_Id('example.edu', 'urn', '123456789/abcd'); + $id = new phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); $idString = $this->osidIdHelper->toString($id); $newId = $this->osidIdHelper->fromString($idString); @@ -42,7 +42,7 @@ public function testGetOsidIdFromString() public function testGetStringFromOsidId() { - $id = new phpkit_id_Id('example.edu', 'urn', '123456789/abcd'); + $id = new phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); $idString = $this->osidIdHelper->toString($id); $this->assertIsString($idString); diff --git a/application/test/Catalog/Action/Helper/OsidTermsTest.php b/application/test/Catalog/Action/Helper/OsidTermsTest.php index ed01aa98..0f6fafea 100755 --- a/application/test/Catalog/Action/Helper/OsidTermsTest.php +++ b/application/test/Catalog/Action/Helper/OsidTermsTest.php @@ -25,10 +25,10 @@ protected function setUp(): void $this->osidHelper->setConfigPath($this->getTestConfigPath()); Zend_Controller_Action_HelperBroker::addHelper($this->osidTermsHelper); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->spring2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200920'); - $this->fall2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200990'); - $this->fall2008TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->spring2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200920'); + $this->fall2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200990'); + $this->fall2008TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); $this->termLookup = $this->osidHelper->getCourseManager()->getTermLookupSessionForCatalog($this->mcugId); } diff --git a/application/test/Catalog/Action/Helper/OsidTopicTest.php b/application/test/Catalog/Action/Helper/OsidTopicTest.php index 8b13a9ed..961783c8 100755 --- a/application/test/Catalog/Action/Helper/OsidTopicTest.php +++ b/application/test/Catalog/Action/Helper/OsidTopicTest.php @@ -24,7 +24,7 @@ protected function setUp(): void $this->osidTopicHelper = new Catalog_Action_Helper_Topics(); Zend_Controller_Action_HelperBroker::addHelper($this->osidTopicHelper); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->topicLookup = $this->osidHelper->getCourseManager()->getTopicLookupSessionForCatalog($this->mcugId); } @@ -53,7 +53,7 @@ public function testFilterTopicsByType() $numTopics = $topics->available(); $topicArray = $this->osidTopicHelper->topicListAsArray($topics); - $subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); + $subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); $filteredTopics = $this->osidTopicHelper->filterTopicsByType($topicArray, $subjectType); $this->assertIsArray($filteredTopics); diff --git a/application/test/Catalog/Action/Helper/OsidTypeTest.php b/application/test/Catalog/Action/Helper/OsidTypeTest.php index 5cf3bd0b..a47b7c59 100755 --- a/application/test/Catalog/Action/Helper/OsidTypeTest.php +++ b/application/test/Catalog/Action/Helper/OsidTypeTest.php @@ -34,7 +34,7 @@ protected function tearDown(): void public function testGetOsidTypeFromString() { - $type = new phpkit_type_Type('urn', 'example.edu', '123456789/abcd'); + $type = new phpkit_type_Type('urn', 'example.edu', '123456789.abcd'); $typeString = $this->osidTypeHelper->toString($type); $newType = $this->osidTypeHelper->fromString($typeString); @@ -44,7 +44,7 @@ public function testGetOsidTypeFromString() public function testGetStringFromOsidType() { - $type = new phpkit_type_Type('urn', 'example.edu', '123456789/abcd'); + $type = new phpkit_type_Type('urn', 'example.edu', '123456789.abcd'); $typeString = $this->osidTypeHelper->toString($type); $this->assertIsString($typeString); diff --git a/application/test/Catalog/frontend_config.ini b/application/test/Catalog/frontend_config.ini index 53aff9ab..d2a4456e 100755 --- a/application/test/Catalog/frontend_config.ini +++ b/application/test/Catalog/frontend_config.ini @@ -17,128 +17,128 @@ cache_control.expiration_offset = 3600 # Default course offering types to select in the search UI. -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering/LCT" -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering/SEM" +catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.LCT" +catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.SEM" # The Id authority to shorten for prettier URLs. catalog.shorten_ids_for_authority = "middlebury.edu" # A map of topics to external URLs. This allows linking out to external sites for # departments or programs. -catalog.topic_map.ALAC.id = "topic/department/ALAC" +catalog.topic_map.ALAC.id = "topic.department.ALAC" catalog.topic_map.ALAC.url = "http://go.middlebury.edu/ALAC" -catalog.topic_map.AMCV.id = "topic/department/AMCV" +catalog.topic_map.AMCV.id = "topic.department.AMCV" catalog.topic_map.AMCV.url = "http://go.middlebury.edu/AMCV" -catalog.topic_map.AMLT.id = "topic/department/AMLT" +catalog.topic_map.AMLT.id = "topic.department.AMLT" catalog.topic_map.AMLT.url = "http://go.middlebury.edu/AMLT" -catalog.topic_map.AMST.id = "topic/department/AMST" +catalog.topic_map.AMST.id = "topic.department.AMST" catalog.topic_map.AMST.url = "http://go.middlebury.edu/AMST" -catalog.topic_map.ARBC.id = "topic/department/ARBC" +catalog.topic_map.ARBC.id = "topic.department.ARBC" catalog.topic_map.ARBC.url = "http://go.middlebury.edu/ARBC" -catalog.topic_map.ARDV.id = "topic/department/ARDV" +catalog.topic_map.ARDV.id = "topic.department.ARDV" catalog.topic_map.ARDV.url = "http://go.middlebury.edu/ARDV" -catalog.topic_map.ART.id = "topic/department/ART" +catalog.topic_map.ART.id = "topic.department.ART" catalog.topic_map.ART.url = "http://go.middlebury.edu/ART" -catalog.topic_map.BIOL.id = "topic/department/BIOL" +catalog.topic_map.BIOL.id = "topic.department.BIOL" catalog.topic_map.BIOL.url = "http://go.middlebury.edu/BIOL" -catalog.topic_map.CHEM.id = "topic/department/CHEM" +catalog.topic_map.CHEM.id = "topic.department.CHEM" catalog.topic_map.CHEM.url = "http://go.middlebury.edu/CHEM" -catalog.topic_map.CHNS.id = "topic/department/CHNS" +catalog.topic_map.CHNS.id = "topic.department.CHNS" catalog.topic_map.CHNS.url = "http://go.middlebury.edu/CHNS" -catalog.topic_map.CLAS.id = "topic/department/CLAS" +catalog.topic_map.CLAS.id = "topic.department.CLAS" catalog.topic_map.CLAS.url = "http://go.middlebury.edu/CLAS" -catalog.topic_map.CSCI.id = "topic/department/CSCI" +catalog.topic_map.CSCI.id = "topic.department.CSCI" catalog.topic_map.CSCI.url = "http://go.middlebury.edu/CSCI" -catalog.topic_map.DANC.id = "topic/department/DANC" +catalog.topic_map.DANC.id = "topic.department.DANC" catalog.topic_map.DANC.url = "http://go.middlebury.edu/DANC" -catalog.topic_map.ECON.id = "topic/department/ECON" +catalog.topic_map.ECON.id = "topic.department.ECON" catalog.topic_map.ECON.url = "http://go.middlebury.edu/ECON" -catalog.topic_map.EDST.id = "topic/department/EDST" +catalog.topic_map.EDST.id = "topic.department.EDST" catalog.topic_map.EDST.url = "http://go.middlebury.edu/EDST" -catalog.topic_map.ENAM.id = "topic/department/ENAM" +catalog.topic_map.ENAM.id = "topic.department.ENAM" catalog.topic_map.ENAM.url = "http://go.middlebury.edu/ENAM" -catalog.topic_map.ENGL.id = "topic/department/ENGL" +catalog.topic_map.ENGL.id = "topic.department.ENGL" catalog.topic_map.ENGL.url = "http://go.middlebury.edu/ENGL" -catalog.topic_map.ENVS.id = "topic/department/ENVS" +catalog.topic_map.ENVS.id = "topic.department.ENVS" catalog.topic_map.ENVS.url = "http://go.middlebury.edu/ENVS" -catalog.topic_map.FMMC.id = "topic/department/FMMC" +catalog.topic_map.FMMC.id = "topic.department.FMMC" catalog.topic_map.FMMC.url = "http://go.middlebury.edu/FMMC" -catalog.topic_map.FREN.id = "topic/department/FREN" +catalog.topic_map.FREN.id = "topic.department.FREN" catalog.topic_map.FREN.url = "http://go.middlebury.edu/FREN" -catalog.topic_map.FYSE.id = "topic/department/FYSE" +catalog.topic_map.FYSE.id = "topic.department.FYSE" catalog.topic_map.FYSE.url = "http://go.middlebury.edu/FYSE" -catalog.topic_map.GEOG.id = "topic/department/GEOG" +catalog.topic_map.GEOG.id = "topic.department.GEOG" catalog.topic_map.GEOG.url = "http://go.middlebury.edu/GEOG" -catalog.topic_map.GEOL.id = "topic/department/GEOL" +catalog.topic_map.GEOL.id = "topic.department.GEOL" catalog.topic_map.GEOL.url = "http://go.middlebury.edu/GEOL" -catalog.topic_map.GRMN.id = "topic/department/GRMN" +catalog.topic_map.GRMN.id = "topic.department.GRMN" catalog.topic_map.GRMN.url = "http://go.middlebury.edu/GRMN" -catalog.topic_map.HARC.id = "topic/department/HARC" +catalog.topic_map.HARC.id = "topic.department.HARC" catalog.topic_map.HARC.url = "http://go.middlebury.edu/HARC" -catalog.topic_map.HIST.id = "topic/department/HIST" +catalog.topic_map.HIST.id = "topic.department.HIST" catalog.topic_map.HIST.url = "http://go.middlebury.edu/HIST" -catalog.topic_map.HUDV.id = "topic/department/HUDV" +catalog.topic_map.HUDV.id = "topic.department.HUDV" catalog.topic_map.HUDV.url = "http://go.middlebury.edu/HUDV" -catalog.topic_map.INDE.id = "topic/department/INDE" +catalog.topic_map.INDE.id = "topic.department.INDE" catalog.topic_map.INDE.url = "http://go.middlebury.edu/INDE" -catalog.topic_map.INTD.id = "topic/department/INTD" +catalog.topic_map.INTD.id = "topic.department.INTD" catalog.topic_map.INTD.url = "http://go.middlebury.edu/INTD" -catalog.topic_map.INTL.id = "topic/department/INTL" +catalog.topic_map.INTL.id = "topic.department.INTL" catalog.topic_map.INTL.url = "http://go.middlebury.edu/INTL" -catalog.topic_map.IPEC.id = "topic/department/IPEC" +catalog.topic_map.IPEC.id = "topic.department.IPEC" catalog.topic_map.IPEC.url = "http://go.middlebury.edu/IPEC" -catalog.topic_map.ISEA.id = "topic/department/ISEA" +catalog.topic_map.ISEA.id = "topic.department.ISEA" catalog.topic_map.ISEA.url = "http://go.middlebury.edu/ISEA" -catalog.topic_map.ISRU.id = "topic/department/ISRU" +catalog.topic_map.ISRU.id = "topic.department.ISRU" catalog.topic_map.ISRU.url = "http://go.middlebury.edu/ISRU" -catalog.topic_map.ITAL.id = "topic/department/ITAL" +catalog.topic_map.ITAL.id = "topic.department.ITAL" catalog.topic_map.ITAL.url = "http://go.middlebury.edu/ITAL" -catalog.topic_map.JAPN.id = "topic/department/JAPN" +catalog.topic_map.JAPN.id = "topic.department.JAPN" catalog.topic_map.JAPN.url = "http://go.middlebury.edu/JAPN" -catalog.topic_map.LITP.id = "topic/department/LITP" +catalog.topic_map.LITP.id = "topic.department.LITP" catalog.topic_map.LITP.url = "http://go.middlebury.edu/LITP" -catalog.topic_map.LITS.id = "topic/department/LITS" +catalog.topic_map.LITS.id = "topic.department.LITS" catalog.topic_map.LITS.url = "http://go.middlebury.edu/LITS" -catalog.topic_map.MATH.id = "topic/department/MATH" +catalog.topic_map.MATH.id = "topic.department.MATH" catalog.topic_map.MATH.url = "http://go.middlebury.edu/MATH" -catalog.topic_map.MBBC.id = "topic/department/MBBC" +catalog.topic_map.MBBC.id = "topic.department.MBBC" catalog.topic_map.MBBC.url = "http://go.middlebury.edu/MBBC" -catalog.topic_map.MUSC.id = "topic/department/MUSC" +catalog.topic_map.MUSC.id = "topic.department.MUSC" catalog.topic_map.MUSC.url = "http://go.middlebury.edu/MUSC" -catalog.topic_map.NSCI.id = "topic/department/NSCI" +catalog.topic_map.NSCI.id = "topic.department.NSCI" catalog.topic_map.NSCI.url = "http://go.middlebury.edu/NSCI" -catalog.topic_map.PGSE.id = "topic/department/PGSE" +catalog.topic_map.PGSE.id = "topic.department.PGSE" catalog.topic_map.PGSE.url = "http://go.middlebury.edu/PGSE" -catalog.topic_map.PHED.id = "topic/department/PHED" +catalog.topic_map.PHED.id = "topic.department.PHED" catalog.topic_map.PHED.url = "http://go.middlebury.edu/PHED" -catalog.topic_map.PHIL.id = "topic/department/PHIL" +catalog.topic_map.PHIL.id = "topic.department.PHIL" catalog.topic_map.PHIL.url = "http://go.middlebury.edu/PHIL" -catalog.topic_map.PHYS.id = "topic/department/PHYS" +catalog.topic_map.PHYS.id = "topic.department.PHYS" catalog.topic_map.PHYS.url = "http://go.middlebury.edu/PHYS" -catalog.topic_map.PSCI.id = "topic/department/PSCI" +catalog.topic_map.PSCI.id = "topic.department.PSCI" catalog.topic_map.PSCI.url = "http://go.middlebury.edu/PSCI" -catalog.topic_map.PSYC.id = "topic/department/PSYC" +catalog.topic_map.PSYC.id = "topic.department.PSYC" catalog.topic_map.PSYC.url = "http://go.middlebury.edu/PSYC" -catalog.topic_map.RELI.id = "topic/department/RELI" +catalog.topic_map.RELI.id = "topic.department.RELI" catalog.topic_map.RELI.url = "http://go.middlebury.edu/RELI" -catalog.topic_map.RUSS.id = "topic/department/RUSS" +catalog.topic_map.RUSS.id = "topic.department.RUSS" catalog.topic_map.RUSS.url = "http://go.middlebury.edu/RUSS" -catalog.topic_map.SISP.id = "topic/department/SISP" +catalog.topic_map.SISP.id = "topic.department.SISP" catalog.topic_map.SISP.url = "http://go.middlebury.edu/SISP" -catalog.topic_map.SOAN.id = "topic/department/SOAN" +catalog.topic_map.SOAN.id = "topic.department.SOAN" catalog.topic_map.SOAN.url = "http://go.middlebury.edu/SOAN" -catalog.topic_map.SPAN.id = "topic/department/SPAN" +catalog.topic_map.SPAN.id = "topic.department.SPAN" catalog.topic_map.SPAN.url = "http://go.middlebury.edu/SPAN" -catalog.topic_map.STLD.id = "topic/department/STLD" +catalog.topic_map.STLD.id = "topic.department.STLD" catalog.topic_map.STLD.url = "http://go.middlebury.edu/STLD" -catalog.topic_map.TEDU.id = "topic/department/TEDU" +catalog.topic_map.TEDU.id = "topic.department.TEDU" catalog.topic_map.TEDU.url = "http://go.middlebury.edu/TEDU" -catalog.topic_map.THEA.id = "topic/department/THEA" +catalog.topic_map.THEA.id = "topic.department.THEA" catalog.topic_map.THEA.url = "http://go.middlebury.edu/THEA" -catalog.topic_map.WAGS.id = "topic/department/WAGS" -catalog.topic_map.WAGS.url = "http://go.middlebury.edu/WAGS" -catalog.topic_map.WRPR.id = "topic/department/WRPR" -catalog.topic_map.WRPR.url = "http://go.middlebury.edu/WRPR" +catalog.topic_map.WAGS.id = "topic.department.WAGS" +catalog.topic_map.WAGS.url = "http://go.middlebury.edu.WAGS" +catalog.topic_map.WRPR.id = "topic.department.WRPR" +catalog.topic_map.WRPR.url = "http:..go.middlebury.edu.WRPR" [staging : production] diff --git a/application/test/apc/configuration.plist b/application/test/apc/configuration.plist index 81e4df0b..74d0dcf5 100755 --- a/application/test/apc/configuration.plist +++ b/application/test/apc/configuration.plist @@ -2,18 +2,18 @@ - urn:inet:middlebury.edu:config:banner_course/id_authority + urn:inet:middlebury.edu:config:banner_course.id_authority middlebury.edu - urn:inet:middlebury.edu:config:banner_course/pdo_count_queries + urn:inet:middlebury.edu:config:banner_course.pdo_count_queries - urn:inet:middlebury.edu:config:banner_course/pdo_dsn + urn:inet:middlebury.edu:config:banner_course.pdo_dsn mysql:dbname=afranco_catalog_test;host=localhost - urn:inet:middlebury.edu:config:banner_course/pdo_password + urn:inet:middlebury.edu:config:banner_course.pdo_password testpassword - urn:inet:middlebury.edu:config:banner_course/pdo_username + urn:inet:middlebury.edu:config:banner_course.pdo_username testuser - urn:inet:middlebury.edu:config:apc_course/impl_class_name + urn:inet:middlebury.edu:config:apc_course.impl_class_name banner_course_CourseManager diff --git a/application/test/apc/course/CourseManagerTest.php b/application/test/apc/course/CourseManagerTest.php index 737b2298..f46f0f7e 100755 --- a/application/test/apc/course/CourseManagerTest.php +++ b/application/test/apc/course/CourseManagerTest.php @@ -12,7 +12,7 @@ class apc_course_CourseManagerTest extends banner_course_CourseManagerTest */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->manager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'apc_course_CourseManager', '3.0.0'); } } diff --git a/application/test/banner/configuration.plist b/application/test/banner/configuration.plist index 1feea851..bc1fe3f1 100755 --- a/application/test/banner/configuration.plist +++ b/application/test/banner/configuration.plist @@ -2,18 +2,18 @@ - urn:inet:middlebury.edu:config:banner_course/id_authority + urn:inet:middlebury.edu:config:banner_course.id_authority middlebury.edu - urn:inet:middlebury.edu:config:banner_course/pdo_count_queries + urn:inet:middlebury.edu:config:banner_course.pdo_count_queries - urn:inet:middlebury.edu:config:banner_course/pdo_dsn + urn:inet:middlebury.edu:config:banner_course.pdo_dsn mysql:dbname=symfony_test;host=database - urn:inet:middlebury.edu:config:banner_course/pdo_password + urn:inet:middlebury.edu:config:banner_course.pdo_password symfony - urn:inet:middlebury.edu:config:banner_course/pdo_username + urn:inet:middlebury.edu:config:banner_course.pdo_username symfony - urn:inet:middlebury.edu:config:apc_course/impl_class_name + urn:inet:middlebury.edu:config:apc_course.impl_class_name banner_course_CourseManager diff --git a/application/test/banner/course/Course/Catalog/SessionTest.php b/application/test/banner/course/Course/Catalog/SessionTest.php index 1f515200..982ecd99 100755 --- a/application/test/banner/course/Course/Catalog/SessionTest.php +++ b/application/test/banner/course/Course/Catalog/SessionTest.php @@ -36,11 +36,11 @@ protected function setUp(): void { $this->session = self::$courseManager->getCourseCatalogSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); } /** diff --git a/application/test/banner/course/Course/Lookup/CombinedSessionTest.php b/application/test/banner/course/Course/Lookup/CombinedSessionTest.php index 7c9df7e3..15ec2786 100755 --- a/application/test/banner/course/Course/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/Course/Lookup/CombinedSessionTest.php @@ -34,22 +34,22 @@ protected function getSession() */ protected function setUp(): void { - $this->allId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/all'); + $this->allId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.all'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseLookupSession(); $this->session->useFederatedCourseCatalogView(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Course/Lookup/SessionTest.php b/application/test/banner/course/Course/Lookup/SessionTest.php index ed765c8d..e0e3f480 100755 --- a/application/test/banner/course/Course/Lookup/SessionTest.php +++ b/application/test/banner/course/Course/Lookup/SessionTest.php @@ -34,19 +34,19 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseLookupSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Course/Search/OrderTest.php b/application/test/banner/course/Course/Search/OrderTest.php index d2196884..9c6a15f5 100755 --- a/application/test/banner/course/Course/Search/OrderTest.php +++ b/application/test/banner/course/Course/Search/OrderTest.php @@ -21,8 +21,8 @@ class banner_course_Course_Search_OrderTest extends TestCase */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseSearchSessionForCatalog($this->mcugId); @@ -36,13 +36,13 @@ protected function setUp(): void $this->object = $this->session->getCourseSearchOrder(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Course/Search/QueryTest.php b/application/test/banner/course/Course/Search/QueryTest.php index ba4519c0..a5b7a869 100755 --- a/application/test/banner/course/Course/Search/QueryTest.php +++ b/application/test/banner/course/Course/Search/QueryTest.php @@ -21,8 +21,8 @@ class banner_course_Course_Search_QueryTest extends TestCase */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseSearchSessionForCatalog($this->mcugId); @@ -33,19 +33,19 @@ protected function setUp(): void $this->search = $this->session->getCourseSearch(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); - $this->levelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/level/UG'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); + $this->levelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.level.UG'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); @@ -58,12 +58,12 @@ protected function setUp(): void $this->topicQueryRecordType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:topic'); $this->otherType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:other'); - $this->barryId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000002'); - $this->dudleyId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000004'); - $this->calvinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000003'); + $this->barryId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000002'); + $this->dudleyId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000004'); + $this->calvinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000003'); - $this->mainCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/M'); - $this->breadloafCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/BL'); + $this->mainCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.M'); + $this->breadloafCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.BL'); } /** diff --git a/application/test/banner/course/Course/Search/SearchTest.php b/application/test/banner/course/Course/Search/SearchTest.php index be3999e4..e5d1fbf1 100755 --- a/application/test/banner/course/Course/Search/SearchTest.php +++ b/application/test/banner/course/Course/Search/SearchTest.php @@ -21,8 +21,8 @@ class banner_course_Course_Search_SearchTest extends TestCase */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseSearchSessionForCatalog($this->mcugId); @@ -34,14 +34,14 @@ protected function setUp(): void $this->object = $this->session->getCourseSearch(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Course/Search/SessionTest.php b/application/test/banner/course/Course/Search/SessionTest.php index 3fba2251..3703dae2 100755 --- a/application/test/banner/course/Course/Search/SessionTest.php +++ b/application/test/banner/course/Course/Search/SessionTest.php @@ -34,19 +34,19 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseSearchSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); - $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); + $this->deptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->subjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->divTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/CourseCatalog/Lookup/SessionTest.php b/application/test/banner/course/CourseCatalog/Lookup/SessionTest.php index f369a4db..94709803 100755 --- a/application/test/banner/course/CourseCatalog/Lookup/SessionTest.php +++ b/application/test/banner/course/CourseCatalog/Lookup/SessionTest.php @@ -36,8 +36,8 @@ protected function setUp(): void { $this->session = self::$courseManager->getCourseCatalogLookupSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/CourseCatalogTest.php b/application/test/banner/course/CourseCatalogTest.php index c141efbe..5f69a35c 100755 --- a/application/test/banner/course/CourseCatalogTest.php +++ b/application/test/banner/course/CourseCatalogTest.php @@ -39,17 +39,17 @@ protected function getObject() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseLookupSessionForCatalog($this->mcugId); $this->object = $this->session->getCourseCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/MATH0300'); - $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/XXXX0101'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.MATH0300'); + $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.XXXX0101'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/CourseManagerTest.php b/application/test/banner/course/CourseManagerTest.php index 8b9af891..4e80b6ad 100755 --- a/application/test/banner/course/CourseManagerTest.php +++ b/application/test/banner/course/CourseManagerTest.php @@ -31,7 +31,7 @@ protected function getManager() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->manager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'banner_course_CourseManager', '3.0.0'); } diff --git a/application/test/banner/course/CourseOffering/Catalog/SessionTest.php b/application/test/banner/course/CourseOffering/Catalog/SessionTest.php index 474e6509..c26fd4db 100755 --- a/application/test/banner/course/CourseOffering/Catalog/SessionTest.php +++ b/application/test/banner/course/CourseOffering/Catalog/SessionTest.php @@ -36,11 +36,11 @@ protected function setUp(): void { $this->session = self::$courseManager->getCourseOfferingCatalogSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->sectionId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/92418'); + $this->sectionId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.92418'); } /** diff --git a/application/test/banner/course/CourseOffering/Lookup/CombinedSessionTest.php b/application/test/banner/course/CourseOffering/Lookup/CombinedSessionTest.php index 660b80a8..79c2746e 100755 --- a/application/test/banner/course/CourseOffering/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/CourseOffering/Lookup/CombinedSessionTest.php @@ -31,30 +31,30 @@ protected function getSession() */ protected function setUp(): void { - $this->allId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/all'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->allId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.all'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseOfferingLookupSession(); $this->session->useFederatedCourseCatalogView(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/MATH0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.MATH0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); - $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); - $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); + $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); + $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); @@ -62,9 +62,9 @@ protected function setUp(): void $this->secondaryType = new phpkit_type_URNInetType('urn:inet:osid.org:genera:secondary'); $this->undergraduateType = new phpkit_type_URNInetType('urn:inet:osid.org:genera:undergraduate'); - $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LCT'); - $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LAB'); - $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/DSC'); + $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LCT'); + $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LAB'); + $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.DSC'); } /** diff --git a/application/test/banner/course/CourseOffering/Lookup/SessionTest.php b/application/test/banner/course/CourseOffering/Lookup/SessionTest.php index 2fe8df09..d2b3d8e9 100755 --- a/application/test/banner/course/CourseOffering/Lookup/SessionTest.php +++ b/application/test/banner/course/CourseOffering/Lookup/SessionTest.php @@ -31,29 +31,29 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseOfferingLookupSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/MATH0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.MATH0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); - $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); - $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); - $this->ugLevelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/level/UG'); + $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); + $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); + $this->ugLevelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.level.UG'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); @@ -61,9 +61,9 @@ protected function setUp(): void $this->secondaryType = new phpkit_type_URNInetType('urn:inet:osid.org:genera:secondary'); $this->undergraduateType = new phpkit_type_URNInetType('urn:inet:osid.org:genera:undergraduate'); - $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LCT'); - $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LAB'); - $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/DSC'); + $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LCT'); + $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LAB'); + $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.DSC'); } /** diff --git a/application/test/banner/course/CourseOffering/Search/OrderTest.php b/application/test/banner/course/CourseOffering/Search/OrderTest.php index 2eec3d7b..812afaec 100755 --- a/application/test/banner/course/CourseOffering/Search/OrderTest.php +++ b/application/test/banner/course/CourseOffering/Search/OrderTest.php @@ -23,21 +23,21 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->session = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getCourseOfferingSearchOrder(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200420'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200420'); $this->query = $this->session->getCourseOfferingQuery(); $this->query->matchTermId($this->termId, true); $this->search = $this->session->getCourseOfferingSearch(); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); $this->instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $this->otherType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:other'); diff --git a/application/test/banner/course/CourseOffering/Search/QueryTest.php b/application/test/banner/course/CourseOffering/Search/QueryTest.php index 04aba49c..cf72c017 100755 --- a/application/test/banner/course/CourseOffering/Search/QueryTest.php +++ b/application/test/banner/course/CourseOffering/Search/QueryTest.php @@ -23,44 +23,44 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getCourseOfferingQuery(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); - $this->termId2 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200790'); - - $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); - $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->geolSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/GEOL'); - $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); - $this->natsciDivTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); - $this->ugLevelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/level/UG'); - $this->ccBlockTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/block/CC'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); + $this->termId2 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200790'); + + $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); + $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->geolSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.GEOL'); + $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); + $this->natsciDivTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); + $this->ugLevelTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.level.UG'); + $this->ccBlockTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.block.CC'); $this->instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $this->weeklyScheduleType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); $this->enrollmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:enrollment'); $this->otherType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:other'); - $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LCT'); - $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/LAB'); - $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering/DSC'); + $this->lectureType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LCT'); + $this->labType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.LAB'); + $this->discussionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:offering.DSC'); - $this->barryId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000002'); - $this->calvinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000003'); + $this->barryId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000002'); + $this->calvinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000003'); - $this->mbh216Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/room/MBH/216'); - $this->mbh560Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/room/MBH/560'); - $this->mainCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/M'); - $this->breadloafCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/BL'); + $this->mbh216Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.room.MBH.216'); + $this->mbh560Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.room.MBH.560'); + $this->mainCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.M'); + $this->breadloafCampusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.BL'); } /** diff --git a/application/test/banner/course/CourseOffering/Search/SearchTest.php b/application/test/banner/course/CourseOffering/Search/SearchTest.php index 5f1db8f5..d51078a5 100755 --- a/application/test/banner/course/CourseOffering/Search/SearchTest.php +++ b/application/test/banner/course/CourseOffering/Search/SearchTest.php @@ -23,18 +23,18 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->session = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getCourseOfferingSearch(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200420'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200420'); $this->query = $this->session->getCourseOfferingQuery(); $this->query->matchTermId($this->termId, true); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); $this->instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $this->otherType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:other'); diff --git a/application/test/banner/course/CourseOffering/Search/SessionTest.php b/application/test/banner/course/CourseOffering/Search/SessionTest.php index 9d8f54f3..5644da2c 100755 --- a/application/test/banner/course/CourseOffering/Search/SessionTest.php +++ b/application/test/banner/course/CourseOffering/Search/SessionTest.php @@ -31,28 +31,28 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/MATH0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->mathId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.MATH0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); - $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); - $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); - $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); + $this->physDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->chemDeptTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); + $this->physSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->chemSubjTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); + $this->dedReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqTopicId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/CourseOfferingTest.php b/application/test/banner/course/CourseOfferingTest.php index 066f1fb6..74b75d8b 100755 --- a/application/test/banner/course/CourseOfferingTest.php +++ b/application/test/banner/course/CourseOfferingTest.php @@ -31,12 +31,12 @@ protected function getObject() */ protected function setUp(): void { - $this->mcugCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->physCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/92418'); - $this->geogOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/92443'); - $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200520/20022'); + $this->mcugCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->physCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.92418'); + $this->geogOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.92443'); + $this->chemOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200520.20022'); $this->session = self::$courseManager->getCourseOfferingLookupSessionForCatalog($this->mcugCatalogId); $this->object = $this->session->getCourseOffering($this->physOfferingId); @@ -64,7 +64,7 @@ public function testGenusType() { $type = $this->object->getGenusType(); $this->assertInstanceOf('osid_type_Type', $type); - $this->assertEquals('genera:offering/LCT', $type->getIdentifier()); + $this->assertEquals('genera:offering.LCT', $type->getIdentifier()); $this->assertEquals('Lecture', trim($type->getDisplayName())); } @@ -81,13 +81,13 @@ public function testGetTitle() */ public function testEffectiveDateTitle() { - $chem200390 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200390/90085'); - $chem200420 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); - $chem200490 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200490/90066'); - $chem200520 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200520/20019'); - $chem200590 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200590/90056'); - $chem200620 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200620/20017'); - $chem200890 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90040'); + $chem200390 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200390.90085'); + $chem200420 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); + $chem200490 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200490.90066'); + $chem200520 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200520.20019'); + $chem200590 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200590.90056'); + $chem200620 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200620.20017'); + $chem200890 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90040'); $this->assertEquals('Fundamentals of Chemistry II', $this->session->getCourseOffering($chem200390)->getTitle()); $this->assertEquals('Fundamentals of Chemistry II', $this->session->getCourseOffering($chem200420)->getTitle()); @@ -109,13 +109,13 @@ public function testGetPhysDescription() */ public function testEffectiveDateDescription() { - $chem200390 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200390/90085'); - $chem200420 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20073'); - $chem200490 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200490/90066'); - $chem200520 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200520/20019'); - $chem200590 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200590/90056'); - $chem200620 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200620/20017'); - $chem200890 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200890/90040'); + $chem200390 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200390.90085'); + $chem200420 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20073'); + $chem200490 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200490.90066'); + $chem200520 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200520.20019'); + $chem200590 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200590.90056'); + $chem200620 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200620.20017'); + $chem200890 = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200890.90040'); $description = 'Major topics include chemical kinetics, chemical equilibrium, acid-base equilibria, chemical thermodynamics, electrochemistry, descriptive inorganic chemistry, and coordination chemistry. Lab work includes inorganic synthesis, qualitative analysis, and quantitative analysis in kinetics, acid-base and redox chemistry. (CHEM 0103 or by waiver) 3 hrs. lect., 3 hrs. lab, 1 hr. disc.'; @@ -192,12 +192,12 @@ public function testTopicIds() { $list = $this->object->getTopicIds(); $identifiers = [ - 'topic/subject/PHYS', - 'topic/department/PHYS', - 'topic/division/NSCI', - 'topic/requirement/DED', - 'topic/requirement/SCI', - 'topic/level/UG', + 'topic.subject.PHYS', + 'topic.department.PHYS', + 'topic.division.NSCI', + 'topic.requirement.DED', + 'topic.requirement.SCI', + 'topic.level.UG', ]; $found = []; $this->assertTrue($list->hasNext()); @@ -226,13 +226,13 @@ public function testGeolTopicIds() $list = $offering->getTopicIds(); $this->assertEquals(7, $list->available()); $identifiers = [ - 'topic/subject/GEOL', - 'topic/department/GEOL', - 'topic/division/NSCI', - 'topic/requirement/DED', - 'topic/requirement/SCI', - 'topic/level/UG', - 'topic/block/CC', + 'topic.subject.GEOL', + 'topic.department.GEOL', + 'topic.division.NSCI', + 'topic.requirement.DED', + 'topic.requirement.SCI', + 'topic.level.UG', + 'topic.block.CC', ]; $found = []; while ($list->hasNext()) { diff --git a/application/test/banner/course/CourseTest.php b/application/test/banner/course/CourseTest.php index 6d8851cb..a12a73bd 100755 --- a/application/test/banner/course/CourseTest.php +++ b/application/test/banner/course/CourseTest.php @@ -31,11 +31,11 @@ protected function getObject() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0250'); - $this->geogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOG0250'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0250'); + $this->geogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOG0250'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); $this->session = self::$courseManager->getCourseLookupSessionForCatalog($this->mcugId); $this->object = $this->session->getCourse($this->physId); @@ -120,10 +120,10 @@ public function testTopicIds() { $list = $this->object->getTopicIds(); $identifiers = [ - 'topic/subject/PHYS', - 'topic/department/PHYS', - 'topic/division/NSCI', - 'topic/level/UG', + 'topic.subject.PHYS', + 'topic.department.PHYS', + 'topic.division.NSCI', + 'topic.level.UG', ]; $found = []; $this->assertTrue($list->hasNext()); diff --git a/application/test/banner/course/PartOfTermCourseOfferingTest.php b/application/test/banner/course/PartOfTermCourseOfferingTest.php index 70328a61..19f284c2 100644 --- a/application/test/banner/course/PartOfTermCourseOfferingTest.php +++ b/application/test/banner/course/PartOfTermCourseOfferingTest.php @@ -31,13 +31,13 @@ protected function getObject() */ protected function setUp(): void { - $this->mclsCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCLS'); - $this->hebmCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/HEBM5642'); - $this->hebmOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/201690/92587'); - $this->mcugCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->physCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200390/90260'); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); + $this->mclsCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCLS'); + $this->hebmCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.HEBM5642'); + $this->hebmOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.201690.92587'); + $this->mcugCatalogId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->physCourseId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200390.90260'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); $this->session = self::$courseManager->getCourseOfferingLookupSessionForCatalog($this->mclsCatalogId); $this->searchSession = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mclsCatalogId); @@ -61,14 +61,14 @@ protected function tearDown(): void public function testGetTermId() { $this->assertInstanceOf('osid_id_Id', $this->object->getTermId()); - $this->assertEquals('term/201690/HBM', $this->object->getTermId()->getIdentifier()); + $this->assertEquals('term.201690.HBM', $this->object->getTermId()->getIdentifier()); } public function testGetTerm() { $term = $this->object->getTerm(); $this->assertInstanceOf('osid_course_Term', $term); - $this->assertEquals('term/201690/HBM', $term->getId()->getIdentifier()); + $this->assertEquals('term.201690.HBM', $term->getId()->getIdentifier()); } public function testTermStartDate() @@ -88,7 +88,7 @@ public function testTermEndDate() */ public function testOfferingFoundInBaseTerm() { - $offerings = $this->session->getCourseOfferingsByTermForCourse(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/201690'), $this->hebmCourseId); + $offerings = $this->session->getCourseOfferingsByTermForCourse(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.201690'), $this->hebmCourseId); $this->assertTrue($offerings->hasNext()); $offering = $offerings->getNextCourseOffering(); $this->assertTrue($this->hebmOfferingId->isEqual($offering->getId())); @@ -99,7 +99,7 @@ public function testOfferingFoundInBaseTerm() */ public function testOfferingFoundInPartOfTerm() { - $offerings = $this->session->getCourseOfferingsByTermForCourse(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/201690/HBM'), $this->hebmCourseId); + $offerings = $this->session->getCourseOfferingsByTermForCourse(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.201690.HBM'), $this->hebmCourseId); $this->assertTrue($offerings->hasNext()); $offering = $offerings->getNextCourseOffering(); $this->assertTrue($this->hebmOfferingId->isEqual($offering->getId())); @@ -111,7 +111,7 @@ public function testOfferingFoundInPartOfTerm() public function testOfferingSearchBaseTerm() { $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/201690'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.201690'), true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertTrue($offerings->hasNext()); $offering = $offerings->getNextCourseOffering(); @@ -124,7 +124,7 @@ public function testOfferingSearchBaseTerm() public function testOfferingSearchPartOfTerm() { $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/201690/HBM'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.201690.HBM'), true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertTrue($offerings->hasNext()); $offering = $offerings->getNextCourseOffering(); @@ -139,7 +139,7 @@ public function testOfferingSearchBaseTermUg() $this->searchSession = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugCatalogId); $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200390'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200390'), true); $query->matchCourseId($this->physId, true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertTrue($offerings->hasNext()); @@ -154,7 +154,7 @@ public function testOfferingSearchPartOfTermUg1() { $this->searchSession = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugCatalogId); $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200390/1'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200390.1'), true); $query->matchCourseId($this->physId, true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertTrue($offerings->hasNext()); @@ -169,7 +169,7 @@ public function testOfferingSearchPartOfTermUgHbm() { $this->searchSession = self::$courseManager->getCourseOfferingSearchSessionForCatalog($this->mcugCatalogId); $query = $this->searchSession->getCourseOfferingQuery(); - $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200390/HBM'), true); + $query->matchTermId(new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200390.HBM'), true); $query->matchCourseId($this->physId, true); $offerings = $this->searchSession->getCourseOfferingsByQuery($query); $this->assertFalse($offerings->hasNext()); diff --git a/application/test/banner/course/Term/Catalog/SessionTest.php b/application/test/banner/course/Term/Catalog/SessionTest.php index b168e9b6..de2143df 100755 --- a/application/test/banner/course/Term/Catalog/SessionTest.php +++ b/application/test/banner/course/Term/Catalog/SessionTest.php @@ -38,11 +38,11 @@ protected function setUp(): void { $this->session = self::$courseManager->getTermCatalogSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); } /** diff --git a/application/test/banner/course/Term/Lookup/CombinedSessionTest.php b/application/test/banner/course/Term/Lookup/CombinedSessionTest.php index e4b01d44..670ec779 100755 --- a/application/test/banner/course/Term/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/Term/Lookup/CombinedSessionTest.php @@ -31,11 +31,11 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); - $this->springTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200920'); - $this->badTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200866'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); + $this->springTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200920'); + $this->badTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200866'); $this->session = self::$courseManager->getTermLookupSession(); $this->session->useComparativeView(); diff --git a/application/test/banner/course/Term/Lookup/SessionTest.php b/application/test/banner/course/Term/Lookup/SessionTest.php index 18061b9b..29ea475f 100755 --- a/application/test/banner/course/Term/Lookup/SessionTest.php +++ b/application/test/banner/course/Term/Lookup/SessionTest.php @@ -31,11 +31,11 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); - $this->springTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200920'); - $this->badTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200866'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); + $this->springTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200920'); + $this->badTermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200866'); $this->session = self::$courseManager->getTermLookupSessionForCatalog($this->mcugId); diff --git a/application/test/banner/course/TermTest.php b/application/test/banner/course/TermTest.php index cf947632..9538fade 100755 --- a/application/test/banner/course/TermTest.php +++ b/application/test/banner/course/TermTest.php @@ -31,9 +31,9 @@ protected function getObject() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200890'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); $this->session = self::$courseManager->getTermLookupSessionForCatalog($this->mcugId); $this->object = $this->session->getTerm($this->termId); diff --git a/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php b/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php index 1ee6c798..fd1a7993 100755 --- a/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php @@ -33,45 +33,45 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getTopicLookupSession(); $this->session->useComparativeView(); $this->session->useFederatedCourseCatalogView(); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->geolSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/GEOL'); - $this->chemSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); + $this->physSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->geolSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.GEOL'); + $this->chemSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); - $this->physDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->geolDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/GEOL'); - $this->chemDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); + $this->physDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->geolDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.GEOL'); + $this->chemDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); - $this->dedReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); + $this->dedReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); - $this->ccBlockId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/block/CC'); + $this->ccBlockId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.block.CC'); - $this->nsciDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); - $this->artsDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/ARTS'); + $this->nsciDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); + $this->artsDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.ARTS'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200893/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200893.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200893'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200893'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Topic/Lookup/SessionTest.php b/application/test/banner/course/Topic/Lookup/SessionTest.php index 922aefdf..f120d5b6 100755 --- a/application/test/banner/course/Topic/Lookup/SessionTest.php +++ b/application/test/banner/course/Topic/Lookup/SessionTest.php @@ -33,46 +33,46 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->session = self::$courseManager->getTopicLookupSessionForCatalog($this->mcugId); - $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/PHYS0201'); - $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/GEOL0300'); - $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course/CHEM0104'); + $this->physId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.PHYS0201'); + $this->geolId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.GEOL0300'); + $this->chemId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:course.CHEM0104'); - $this->physSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/PHYS'); - $this->geolSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/GEOL'); - $this->chemSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/subject/CHEM'); + $this->physSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.PHYS'); + $this->geolSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.GEOL'); + $this->chemSubjId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.subject.CHEM'); - $this->physDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/PHYS'); - $this->geolDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/GEOL'); - $this->chemDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/department/CHEM'); + $this->physDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.PHYS'); + $this->geolDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.GEOL'); + $this->chemDeptId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.department.CHEM'); - $this->dedReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'); - $this->sciReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'); + $this->dedReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'); + $this->sciReqId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'); - $this->ugLevelId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/level/UG'); + $this->ugLevelId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.level.UG'); - $this->ccBlockId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/block/CC'); + $this->ccBlockId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.block.CC'); - $this->nsciDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/NSCI'); - $this->artsDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/division/ARTS'); + $this->nsciDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.NSCI'); + $this->artsDivId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.division.ARTS'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); - $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200893/90143'); - $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/200420/20663'); - $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section/178293/2101'); + $this->physOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200893.90143'); + $this->geolOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.200420.20663'); + $this->unknownOfferingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:section.178293.2101'); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200893'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200893'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/course/Topic/Search/OrderTest.php b/application/test/banner/course/Topic/Search/OrderTest.php index 7492f920..c499a11e 100755 --- a/application/test/banner/course/Topic/Search/OrderTest.php +++ b/application/test/banner/course/Topic/Search/OrderTest.php @@ -23,20 +23,20 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getTopicSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getTopicSearchOrder(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200820'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200820'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); } /** diff --git a/application/test/banner/course/Topic/Search/QueryTest.php b/application/test/banner/course/Topic/Search/QueryTest.php index 6203ce5e..4208a6c4 100755 --- a/application/test/banner/course/Topic/Search/QueryTest.php +++ b/application/test/banner/course/Topic/Search/QueryTest.php @@ -23,22 +23,22 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getTopicSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getTopicQuery(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200820'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200820'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/block'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); } /** diff --git a/application/test/banner/course/Topic/Search/SearchTest.php b/application/test/banner/course/Topic/Search/SearchTest.php index 7428639f..5bbffdcf 100755 --- a/application/test/banner/course/Topic/Search/SearchTest.php +++ b/application/test/banner/course/Topic/Search/SearchTest.php @@ -23,20 +23,20 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getTopicSearchSessionForCatalog($this->mcugId); $this->object = $this->session->getTopicSearch(); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200820'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200820'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); } /** @@ -68,8 +68,8 @@ public function testSearchWithinTopicResults() public function testSearchAmongTopics() { $topicList = new phpkit_id_ArrayIdList([ - new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/DED'), - new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic/requirement/SCI'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.DED'), + new phpkit_id_URNInetId('urn:inet:middlebury.edu:topic.requirement.SCI'), ]); $this->object->searchAmongTopics($topicList); diff --git a/application/test/banner/course/Topic/Search/SessionTest.php b/application/test/banner/course/Topic/Search/SessionTest.php index 1cfe2518..4a17f2fe 100755 --- a/application/test/banner/course/Topic/Search/SessionTest.php +++ b/application/test/banner/course/Topic/Search/SessionTest.php @@ -23,19 +23,19 @@ protected function setUp(): void { $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->session = self::$courseManager->getTopicSearchSessionForCatalog($this->mcugId); - $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term/200820'); + $this->termId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200820'); $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic/requirement'); + $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); } /** diff --git a/application/test/banner/resource/Bin/Lookup/SessionTest.php b/application/test/banner/resource/Bin/Lookup/SessionTest.php index c548617b..97e3e4ad 100755 --- a/application/test/banner/resource/Bin/Lookup/SessionTest.php +++ b/application/test/banner/resource/Bin/Lookup/SessionTest.php @@ -37,8 +37,8 @@ protected function setUp(): void $this->manager = self::$courseManager->getResourceManager(); $this->session = $this->manager->getBinLookupSession(); - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); diff --git a/application/test/banner/resource/Resource/Lookup/PerCatalogSessionTest.php b/application/test/banner/resource/Resource/Lookup/PerCatalogSessionTest.php index 5a8d3f25..8b51fb73 100755 --- a/application/test/banner/resource/Resource/Lookup/PerCatalogSessionTest.php +++ b/application/test/banner/resource/Resource/Lookup/PerCatalogSessionTest.php @@ -31,24 +31,24 @@ protected function getSession() */ protected function setUp(): void { - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MCUG'); - $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog/MIIS'); + $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->miisId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MIIS'); - $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/all'); + $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.all'); $this->manager = self::$courseManager->getResourceManager(); $this->session = $this->manager->getResourceLookupSessionForBin($this->mcugId); - $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/person'); - $this->roomType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/room'); - $this->buildingType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/building'); - $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus'); - $this->placeType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place'); + $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.person'); + $this->roomType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.room'); + $this->buildingType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.building'); + $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus'); + $this->placeType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place'); - $this->person1Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000002'); - $this->person2Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000007'); - $this->campusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/M'); - $this->buildingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/building/MBH'); - $this->roomId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/room/MBH/538'); + $this->person1Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000002'); + $this->person2Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000007'); + $this->campusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.M'); + $this->buildingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.building.MBH'); + $this->roomId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.room.MBH.538'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); @@ -146,7 +146,7 @@ public function testGetResourcesByPersonGenusType() $this->assertEquals(14, $resources->available()); $this->assertInstanceOf('osid_resource_Resource', $resources->getNextResource()); $resourceGenusType = $resources->getNextResource()->getGenusType(); - $this->assertEquals('genera:resource/person', $resourceGenusType->getIdentifier()); + $this->assertEquals('genera:resource.person', $resourceGenusType->getIdentifier()); $this->assertTrue($resourceGenusType->isEqual($this->personType)); } @@ -194,7 +194,7 @@ public function testGetResourcesByParentPersonGenusType() $this->assertEquals(14, $resources->available()); $this->assertInstanceOf('osid_resource_Resource', $resources->getNextResource()); $resourceGenusType = $resources->getNextResource()->getGenusType(); - $this->assertEquals('genera:resource/person', $resourceGenusType->getIdentifier()); + $this->assertEquals('genera:resource.person', $resourceGenusType->getIdentifier()); $this->assertTrue($resourceGenusType->isEqual($this->personType)); } diff --git a/application/test/banner/resource/Resource/Lookup/SessionTest.php b/application/test/banner/resource/Resource/Lookup/SessionTest.php index 8e28ae93..2c997561 100755 --- a/application/test/banner/resource/Resource/Lookup/SessionTest.php +++ b/application/test/banner/resource/Resource/Lookup/SessionTest.php @@ -31,21 +31,21 @@ protected function getSession() */ protected function setUp(): void { - $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/all'); + $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.all'); $this->manager = self::$courseManager->getResourceManager(); $this->session = $this->manager->getResourceLookupSession(); - $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/person'); - $this->roomType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/room'); - $this->buildingType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/building'); - $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place/campus'); - $this->placeType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/place'); + $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.person'); + $this->roomType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.room'); + $this->buildingType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.building'); + $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus'); + $this->placeType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place'); - $this->person1Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000002'); - $this->person2Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/person/WEBID1000007'); - $this->campusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/campus/M'); - $this->buildingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/building/MBH'); - $this->roomId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/place/room/MBH/538'); + $this->person1Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000002'); + $this->person2Id = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.person.WEBID1000007'); + $this->campusId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.campus.M'); + $this->buildingId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.building.MBH'); + $this->roomId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.place.room.MBH.538'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:osid.org:unknown_type'); $this->unknownId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:unknown_id'); @@ -143,7 +143,7 @@ public function testGetResourcesByPersonGenusType() $this->assertEquals(14, $resources->available()); $this->assertInstanceOf('osid_resource_Resource', $resources->getNextResource()); $resourceGenusType = $resources->getNextResource()->getGenusType(); - $this->assertEquals('genera:resource/person', $resourceGenusType->getIdentifier()); + $this->assertEquals('genera:resource.person', $resourceGenusType->getIdentifier()); $this->assertTrue($resourceGenusType->isEqual($this->personType)); } @@ -191,7 +191,7 @@ public function testGetResourcesByParentPersonGenusType() $this->assertEquals(14, $resources->available()); $this->assertInstanceOf('osid_resource_Resource', $resources->getNextResource()); $resourceGenusType = $resources->getNextResource()->getGenusType(); - $this->assertEquals('genera:resource/person', $resourceGenusType->getIdentifier()); + $this->assertEquals('genera:resource.person', $resourceGenusType->getIdentifier()); $this->assertTrue($resourceGenusType->isEqual($this->personType)); } diff --git a/application/test/banner/resource/Resource/PersonTest.php b/application/test/banner/resource/Resource/PersonTest.php index 6de1b632..edd35b18 100755 --- a/application/test/banner/resource/Resource/PersonTest.php +++ b/application/test/banner/resource/Resource/PersonTest.php @@ -36,10 +36,10 @@ protected function setUp(): void { $this->namesType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:person_names'); $this->unknownType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:unknown'); - $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource/person'); + $this->personType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.person'); $this->object = new banner_resource_Resource_Person( - new phpkit_id_Id('urn', 'middlebury.edu', 'person/12345'), + new phpkit_id_Id('urn', 'middlebury.edu', 'person.12345'), "O'Brien", 'Thaddeus', 'Peter Michael', @@ -50,7 +50,7 @@ protected function setUp(): void $this->names = $this->object->getResourceRecord($this->namesType); $this->object2 = new banner_resource_Resource_Person( - new phpkit_id_Id('urn', 'middlebury.edu', 'person/54321'), + new phpkit_id_Id('urn', 'middlebury.edu', 'person.54321'), 'Jones', 'Howard' ); @@ -147,7 +147,7 @@ public function testGetGenusType() $this->assertInstanceOf('osid_type_Type', $type); $this->assertEquals('urn', $type->getIdentifierNamespace()); $this->assertEquals('middlebury.edu', $type->getAuthority()); - $this->assertEquals('genera:resource/person', $type->getIdentifier()); + $this->assertEquals('genera:resource.person', $type->getIdentifier()); $this->assertTrue($type->isEqual($this->personType)); } } diff --git a/application/test/banner/resource/ResourceManagerTest.php b/application/test/banner/resource/ResourceManagerTest.php index cc255905..8e1ac4f4 100755 --- a/application/test/banner/resource/ResourceManagerTest.php +++ b/application/test/banner/resource/ResourceManagerTest.php @@ -31,7 +31,7 @@ protected function getManager() */ protected function setUp(): void { - $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource/all'); + $this->allBinId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:resource.all'); $this->manager = self::$courseManager->getResourceManager(); } diff --git a/application/views/scripts/offerings/search.phtml b/application/views/scripts/offerings/search.phtml index 97ab35f6..bb6153ff 100755 --- a/application/views/scripts/offerings/search.phtml +++ b/application/views/scripts/offerings/search.phtml @@ -443,7 +443,7 @@ print "\n\t
"; print "\n\t\t
Type:
"; print "\n\t\t
".$this->escape($section->getGenusType()->getDisplayName())."
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/instruction_method")); +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.instruction_method")); if (!empty($topics)) { print "\n\t\t
Course Modality:
"; print "\n\t\t
"; @@ -464,7 +464,7 @@ print "\n\t\t
Term:
"; +print "\n\t\t"; print "\n\t\t
Department:
"; print "\n\t\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/department")); +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.department")); foreach ($topics as $topic) { $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); print "url($topicParams)."\">"; @@ -475,7 +475,7 @@ print "
"; print "\n\t\t
Requirements Fulfilled:
"; print "\n\t\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/requirement")); +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.requirement")); foreach ($topics as $topic) { $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); print "url($topicParams)."\">"; @@ -486,7 +486,7 @@ print "
"; print "\n\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/block")); +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.block")); if (!empty($topics)) { print "\n\t\t
Additional Details:
"; print "\n\t\t
"; @@ -566,7 +566,7 @@ if (!empty($availabilityLink)) { // print "\n\t
Subject:
"; // print "\n\t\t
"; -// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/subject")); +// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.subject")); // foreach ($topics as $topic) { // $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); // print "url($topicParams)."\">"; @@ -577,7 +577,7 @@ if (!empty($availabilityLink)) { // print "\n\t\t
Division:
"; // print "\n\t\t
"; -// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/division")); +// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.division")); // foreach ($topics as $topic) { // $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); // print "url($topicParams)."\">"; diff --git a/application/views/scripts/offerings/searchxml.phtml b/application/views/scripts/offerings/searchxml.phtml index 14792cce..498a77c2 100755 --- a/application/views/scripts/offerings/searchxml.phtml +++ b/application/views/scripts/offerings/searchxml.phtml @@ -109,7 +109,7 @@ print " "; printTerm($this, $term); -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/subject"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.subject"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -119,7 +119,7 @@ foreach ($topics as $topic) { print " "; } -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/department"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.department"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -129,7 +129,7 @@ foreach ($topics as $topic) { print " "; } -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/requirement"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.requirement"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -139,7 +139,7 @@ foreach ($topics as $topic) { print " "; } -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/level"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.level"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { @@ -149,7 +149,7 @@ foreach ($topics as $topic) { print " "; } -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic/block"); +$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.block"); $topicTypeString = $this->getStringFromOsidType($topicType); $topics = $this->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { From 4086f33a7477ccc3ec7f434cccf568ccb26bf48f Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 27 Sep 2024 14:42:01 -0400 Subject: [PATCH 014/173] Add phpmyadmin to local development environment. --- .lando.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.lando.yml b/.lando.yml index e2a9f83b..260515dd 100644 --- a/.lando.yml +++ b/.lando.yml @@ -38,3 +38,7 @@ services: # Install and enable OCI8 - echo "instantclient,/opt/oracle/instantclient_19_10" | pecl install oci8-3.2.1 - docker-php-ext-enable oci8 + phpmyadmin: + type: phpmyadmin + hosts: + - database From 2fc1b2525ae9904527672c4ebf626ffc2e52f698 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 27 Sep 2024 14:42:50 -0400 Subject: [PATCH 015/173] #47: Use pre-existing 'test' database available in local dev environment. --- application/test/apc/configuration.plist | 6 +++--- application/test/banner/configuration.plist | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/test/apc/configuration.plist b/application/test/apc/configuration.plist index 74d0dcf5..550fe949 100755 --- a/application/test/apc/configuration.plist +++ b/application/test/apc/configuration.plist @@ -7,11 +7,11 @@ urn:inet:middlebury.edu:config:banner_course.pdo_count_queries urn:inet:middlebury.edu:config:banner_course.pdo_dsn - mysql:dbname=afranco_catalog_test;host=localhost + mysql:dbname=test;host=database urn:inet:middlebury.edu:config:banner_course.pdo_password - testpassword + symfony urn:inet:middlebury.edu:config:banner_course.pdo_username - testuser + symfony urn:inet:middlebury.edu:config:apc_course.impl_class_name banner_course_CourseManager diff --git a/application/test/banner/configuration.plist b/application/test/banner/configuration.plist index bc1fe3f1..550fe949 100755 --- a/application/test/banner/configuration.plist +++ b/application/test/banner/configuration.plist @@ -7,7 +7,7 @@ urn:inet:middlebury.edu:config:banner_course.pdo_count_queries urn:inet:middlebury.edu:config:banner_course.pdo_dsn - mysql:dbname=symfony_test;host=database + mysql:dbname=test;host=database urn:inet:middlebury.edu:config:banner_course.pdo_password symfony urn:inet:middlebury.edu:config:banner_course.pdo_username From ec5c0fa8f4e7d1e53477b93fa86405dd0519a15f Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 27 Sep 2024 14:43:30 -0400 Subject: [PATCH 016/173] #47: Fix Deprecated array access of boolean value error. --- .../library/banner/course/CourseOffering/Lookup/Session.php | 2 +- application/library/banner/course/Term/Lookup/Session.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/library/banner/course/CourseOffering/Lookup/Session.php b/application/library/banner/course/CourseOffering/Lookup/Session.php index af38f847..89497c39 100755 --- a/application/library/banner/course/CourseOffering/Lookup/Session.php +++ b/application/library/banner/course/CourseOffering/Lookup/Session.php @@ -264,7 +264,7 @@ public function getCourseOffering(osid_id_Id $courseOfferingId) $row = self::$getOffering_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getOffering_stmts[$catalogWhere]->closeCursor(); - if (!$row['SSBSECT_CRN'] || !$row['SSBSECT_TERM_CODE']) { + if (!$row || !$row['SSBSECT_CRN'] || !$row['SSBSECT_TERM_CODE']) { throw new osid_NotFoundException('Could not find a course offering matching the term code '.$this->getTermCodeFromOfferingId($courseOfferingId).' and the crn '.$this->getCrnFromOfferingId($courseOfferingId).'.'); } diff --git a/application/library/banner/course/Term/Lookup/Session.php b/application/library/banner/course/Term/Lookup/Session.php index 116ac0b0..e43e9b5c 100755 --- a/application/library/banner/course/Term/Lookup/Session.php +++ b/application/library/banner/course/Term/Lookup/Session.php @@ -250,7 +250,7 @@ protected function getBaseTerm($idString) $row = self::$getTerm_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getTerm_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVTERM_CODE']) { + if (!$row || !$row['STVTERM_CODE']) { throw new osid_NotFoundException("Could not find a term matching the term code $idString."); } From 93a1767bb48d56e403b52f40f461c672a03e647a Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 27 Sep 2024 14:44:01 -0400 Subject: [PATCH 017/173] Provide access to the database for test fixture setup/cleanup. --- application/library/apc/course/CourseManager.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/application/library/apc/course/CourseManager.php b/application/library/apc/course/CourseManager.php index 109fc2f8..0189df78 100755 --- a/application/library/apc/course/CourseManager.php +++ b/application/library/apc/course/CourseManager.php @@ -35,6 +35,16 @@ public function __construct() // The underlying course manager. private $manager; + /** + * Allow access to the underlying database for test setup/tear down. + * + * @return PDO + * The backing database. + */ + public function getDB() { + return $this->manager->getDB(); + } + /********************************************************* * From OsidManager *********************************************************/ From ed320b895095bffa3279640904f0c1202a2f7502 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 27 Sep 2024 15:54:47 -0400 Subject: [PATCH 018/173] #47: Update id-subcomponent separators missed in 8336afc9 --- README.md | 8 +-- configuration.plist-example | 14 ++-- frontend_config.ini-example | 130 ++++++++++++++++++------------------ 3 files changed, 76 insertions(+), 76 deletions(-) diff --git a/README.md b/README.md index 1235ac72..12ae2a7c 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,10 @@ Examples Examples of the the Course-Catalog in action at Middlebury College: -* [Main Search UI](https://catalog.middlebury.edu/catalogs/view/catalog/catalog%2FMCUG) (catalog app) -* [Section Details Page](https://catalog.middlebury.edu/offerings/view/catalog/catalog%2FMCUG/offering/section%2F201090%2F91241) (catalog app) -* [Department "courses" RSS feed](https://catalog.middlebury.edu/courses/topicxml/catalog/catalog%2FMCUG/topic/topic%2Fdepartment%2FBIOL) (catalog app) -* [Departments listing to feed to the Drupal content type form](https://catalog.middlebury.edu/topics/listdepartmentstxt/catalog/catalog%2FMCUG/) (catalog app) +* [Main Search UI](https://catalog.middlebury.edu/catalogs/view/catalog/catalog.MCUG) (catalog app) +* [Section Details Page](https://catalog.middlebury.edu/offerings/view/catalog/catalog.MCUG/offering/section.201090.91241) (catalog app) +* [Department "courses" RSS feed](https://catalog.middlebury.edu/courses/topicxml/catalog/catalog.MCUG/topic/topic.department.BIOL) (catalog app) +* [Departments listing to feed to the Drupal content type form](https://catalog.middlebury.edu/topics/listdepartmentstxt/catalog/catalog.MCUG/) (catalog app) * [Department Course Listing](http://www.middlebury.edu/academics/bio/courses) (Drupal "courses" content-type displaying a feed from the catalog app) * [Department Section Listing](http://www.middlebury.edu/academics/bio/courses/offerings) (Drupal "courses" content-type displaying a feed from the catalog app) * [Faculty Profile](http://www.middlebury.edu/academics/bio/faculty/node/48111) (Drupal "profile" content-type displaying a feed from the catalog app) diff --git a/configuration.plist-example b/configuration.plist-example index 9d4d7f8a..6108af4d 100755 --- a/configuration.plist-example +++ b/configuration.plist-example @@ -2,11 +2,11 @@ - urn:inet:middlebury.edu:config:banner_course/id_authority + urn:inet:middlebury.edu:config:banner_course.id_authority middlebury.edu - urn:inet:middlebury.edu:config:banner_course/pdo_count_queries + urn:inet:middlebury.edu:config:banner_course.pdo_count_queries - urn:inet:middlebury.edu:config:banner_course/pdo_driver_options + urn:inet:middlebury.edu:config:banner_course.pdo_driver_options - urn:inet:middlebury.edu:config:banner_course/pdo_dsn + urn:inet:middlebury.edu:config:banner_course.pdo_dsn mysql:dbname=afranco_catalog;host=localhost - urn:inet:middlebury.edu:config:banner_course/pdo_password + urn:inet:middlebury.edu:config:banner_course.pdo_password testpassword - urn:inet:middlebury.edu:config:banner_course/pdo_username + urn:inet:middlebury.edu:config:banner_course.pdo_username testuser - urn:inet:middlebury.edu:config:apc_course/impl_class_name + urn:inet:middlebury.edu:config:apc_course.impl_class_name banner_course_CourseManager diff --git a/frontend_config.ini-example b/frontend_config.ini-example index 6babecda..b4f4a627 100755 --- a/frontend_config.ini-example +++ b/frontend_config.ini-example @@ -90,14 +90,14 @@ resources.layout.layout = midd ; Custom layouts to use for some catalogs ; ; Each entry must have a catalog Id and a layout. -catalog.layouts.MIIS.catalog_id = "urn:inet:middlebury.edu:catalog/MIIS" +catalog.layouts.MIIS.catalog_id = "urn:inet:middlebury.edu:catalog.MIIS" catalog.layouts.MIIS.layout = "miis" ; Default course offering types to select in the search UI. -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering/LCT" -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering/SEM" -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering/PRC" -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering/WKS" +catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.LCT" +catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.SEM" +catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.PRC" +catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.WKS" ; The Id authority to shorten for prettier URLs. catalog.shorten_ids_for_authority = "middlebury.edu" @@ -106,7 +106,7 @@ catalog.shorten_ids_for_authority = "middlebury.edu" catalog.banner_web_url = "https://ssb-prod.ec.middlebury.edu/PNTR/bwckschd.p_disp_detail_sched" ; Extra URLs to print in the sidebar -catalog.menu_links.MCUG.catalog_id = "urn:inet:middlebury.edu:catalog/MCUG" +catalog.menu_links.MCUG.catalog_id = "urn:inet:middlebury.edu:catalog.MCUG" catalog.menu_links.MCUG.links[] = "Courses & Requirements" ; A map of topics to external URLs. This allows linking out to external sites for @@ -114,67 +114,67 @@ catalog.menu_links.MCUG.links[] = " Date: Fri, 27 Sep 2024 16:52:37 -0400 Subject: [PATCH 019/173] #47: Get the Catalog list working with a redirect to offering search. Other actions are still a work in progress. --- config/services.yaml | 2 + src/Controller/Catalogs.php | 51 ++--- .../Controller/Offerings.php | 181 +++++++++++------- .../Service/Osid/TermHelper.php | 58 ++++-- templates/catalogs.html.twig | 2 +- 5 files changed, 182 insertions(+), 112 deletions(-) rename application/controllers/OfferingsController.php => src/Controller/Offerings.php (77%) rename application/resources/Catalog/Action/Helper/OsidTerms.php => src/Service/Osid/TermHelper.php (74%) diff --git a/config/services.yaml b/config/services.yaml index 70e52634..94b3690f 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -45,3 +45,5 @@ services: class: App\Service\Osid\IdMap osid.type_map: class: App\Service\Osid\TypeMap + osid.term_helper: + class: App\Service\Osid\TermHelper diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index ebf61a5e..2d2771f7 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -8,8 +8,9 @@ namespace App\Controller; -use App\Service\Osid\Runtime; use App\Service\Osid\IdMap; +use App\Service\Osid\Runtime; +use App\Service\Osid\TermHelper; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -35,20 +36,28 @@ class Catalogs extends AbstractController */ private $osidIdMap; + /** + * @var \App\Service\Osid\TermHelper + */ + private $osidTermHelper; + /** * Construct a new Catalogs controller. * * @param \App\Service\Osid\Runtime $osidRuntime * The osid.runtime service. - * @param \App\Service\Osid\Identifier $osidIdentifier - * The osid.identifier service. + * @param \App\Service\Osid\IdMap $osidIdMap + * The osid.id_map service. + * @param \App\Service\Osid\TermHelper $osidTermHelper + * The osid.term_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper) { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; + $this->osidTermHelper = $osidTermHelper; } - #[Route('/catalogs/', name: 'List all catalogs')] + #[Route('/catalogs/', name: 'list_catalogs')] public function listAction() { $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); @@ -82,32 +91,26 @@ public function listxmlAction() $this->listAction(); } - /** - * View a catalog details. - * - * @return void - * - * @since 4/21/09 - */ - public function viewAction() + #[Route('/catalogs/view/{catalog}/{term}', name: 'view_catalog')] + public function viewAction(string $catalog, $term = NULL) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - if ($this->_getParam('term')) { + $catalogId = $this->osidIdMap->fromString($catalog); + if ($term) { try { // Verify that the term is valid in this catalog - $termLookup = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $termLookup = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookup->useFederatedCourseCatalogView(); - $termId = $termLookup->getTerm($this->_helper->osidId->fromString($this->_getParam('term')))->getId(); - } catch (osid_NotFoundException $e) { + $termId = $termLookup->getTerm($this->osidIdMap->fromString($term))->getId(); + } catch (\osid_NotFoundException $e) { } } if (!isset($termId)) { - $termId = $this->_helper->osidTerms->getNextOrLatestTermId($catalogId); + $termId = $this->osidTermHelper->getNextOrLatestTermId($catalogId); } - $this->_forward('search', 'Offerings', null, [ - 'catalog' => $this->_helper->osidId->toString($catalogId), - 'term' => $this->_helper->osidId->toString($termId), + return $this->redirectToRoute('search_offerings', [ + 'catalog' => $this->osidIdMap->toString($catalogId), + 'term' => $this->osidIdMap->toString($termId), ]); } @@ -121,9 +124,9 @@ public function viewxmlAction() $this->_helper->layout->disableLayout(); $this->getResponse()->setHeader('Content-Type', 'text/xml'); - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseCatalogLookupSession(); + $lookupSession = $this->runtime->getCourseManager()->getCourseCatalogLookupSession(); $catalog = $lookupSession->getCourseCatalog($catalogId); $this->view->catalogs = new phpkit_course_ArrayCourseCatalogList([$catalog]); diff --git a/application/controllers/OfferingsController.php b/src/Controller/Offerings.php similarity index 77% rename from application/controllers/OfferingsController.php rename to src/Controller/Offerings.php index 16815c9e..3a5934be 100755 --- a/application/controllers/OfferingsController.php +++ b/src/Controller/Offerings.php @@ -6,6 +6,16 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL) */ +namespace App\Controller; + +use App\Service\Osid\IdMap; +use App\Service\Osid\Runtime; +use App\Service\Osid\TermHelper; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; + + /** * A controller for working with courses. * @@ -14,8 +24,40 @@ * @copyright Copyright © 2009, Middlebury College * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL) */ -class OfferingsController extends AbstractCatalogController +class Offerings extends AbstractController { + + /** + * @var \App\Service\Osid\Runtime + */ + private $osidRuntime; + + /** + * @var \App\Service\Osid\IdMap + */ + private $osidIdMap; + + /** + * @var \App\Service\Osid\TermHelper + */ + private $osidTermHelper; + + /** + * Construct a new Catalogs controller. + * + * @param \App\Service\Osid\Runtime $osidRuntime + * The osid.runtime service. + * @param \App\Service\Osid\IdMap $osidIdMap + * The osid.id_map service. + * @param \App\Service\Osid\TermHelper $osidTermHelper + * The osid.term_helper service. + */ + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper) { + $this->osidRuntime = $osidRuntime; + $this->osidIdMap = $osidIdMap; + $this->osidTermHelper = $osidTermHelper; + } + /** * Initialize object. * @@ -25,27 +67,27 @@ class OfferingsController extends AbstractCatalogController */ public function init() { - $this->wildcardStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); - $this->booleanStringMatchType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:boolean'); - $this->instructorType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); - $this->enrollmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:enrollment'); - $this->locationType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:location'); - $this->alternateType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); - $this->weeklyScheduleType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); + $this->wildcardStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); + $this->booleanStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:boolean'); + $this->instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); + $this->enrollmentType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:enrollment'); + $this->locationType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:location'); + $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); + $this->weeklyScheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); parent::init(); - $this->subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); - $this->departmentType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); - $this->divisionType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); - $this->requirementType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); - $this->levelType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); - $this->blockType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); - $this->instructionMethodType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'); + $this->subjectType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + $this->departmentType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $this->divisionType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); + $this->requirementType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $this->levelType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $this->blockType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'); + $this->instructionMethodType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'); - $this->termType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); + $this->termType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - $this->campusType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus'); + $this->campusType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus'); } /** @@ -57,25 +99,25 @@ public function init() */ public function listAction() { - if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + if ($catalog) { + $catalogId = $this->osidRuntimeId->fromString($catalog); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); $this->view->title = $lookupSession->getCourseCatalog()->getDisplayName(); } else { - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $this->view->title = 'All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); // Add our parameters to the search query - if ($this->_getParam('term')) { - if ('CURRENT' == $this->_getParam('term')) { - $termId = $this->_helper->osidTerms->getNextOrLatestTermId(); + if ($term) { + if ('CURRENT' == $term) { + $termId = $this->osidRuntimeTerms->getNextOrLatestTermId(); } else { - $termId = $this->_helper->osidId->fromString($this->_getParam('term')); + $termId = $this->osidRuntimeId->fromString($term); } - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $this->view->term = $termLookupSession->getTerm($termId); @@ -108,12 +150,13 @@ public function listAction() * * @since 10/21/09 */ - public function searchxmlAction() + #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings')] + public function searchxml(string $catalog = NULL, $term = NULL) { $this->_helper->layout->disableLayout(); $this->getResponse()->setHeader('Content-Type', 'text/xml'); - $this->searchAction(); + $this->search($catalog, $term); $this->view->sections = $this->searchSession->getCourseOfferingsByQuery($this->query); // Set the next and previous terms @@ -147,29 +190,23 @@ public function searchxmlAction() $this->postDispatch(); } - /** - * Display a search form and search results. - * - * @return void - * - * @since 6/1/09 - */ - public function searchAction() + #[Route('/offerings/search/{catalog}/{term}', name: 'search_offerings')] + public function search(string $catalog = NULL, $term = NULL) { - if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $offeringSearchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); - $offeringLookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); - $topicSearchSession = $this->_helper->osid->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $resourceLookupSession = $this->_helper->osid->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); + if ($catalog) { + $catalogId = $catalogId = $this->osidIdMap->fromString($catalog); + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $topicSearchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); $this->view->title = 'Search in '.$offeringSearchSession->getCourseCatalog()->getDisplayName(); } else { - $offeringSearchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSession(); - $offeringLookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSession(); - $topicSearchSession = $this->_helper->osid->getCourseManager()->getTopicSearchSession(); - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); - $resourceLookupSession = $this->_helper->osid->getCourseManager()->getResourceManager()->getResourceLookupSession(); + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $topicSearchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSession(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $this->view->title = 'Search in All Catalogs'; } $termLookupSession->useFederatedCourseCatalogView(); @@ -180,18 +217,18 @@ public function searchAction() *********************************************************/ // Term - if ('ANY' == $this->_getParam('term')) { + if ('ANY' == $term) { // Don't set a term - } elseif (!$this->_getParam('term') || 'CURRENT' == $this->_getParam('term')) { + } elseif (!$term || 'CURRENT' == $term) { // When accessing the "current" term via xml, use the term we are in. // When displaying the search interface, use the next upcoming term. if ('searchxml' == $this->_getParam('action')) { - $termId = $this->_helper->osidTerms->getCurrentTermId($offeringSearchSession->getCourseCatalogId()); + $termId = $this->osidRuntimeTerms->getCurrentTermId($offeringSearchSession->getCourseCatalogId()); } else { - $termId = $this->_helper->osidTerms->getNextOrLatestTermId($offeringSearchSession->getCourseCatalogId()); + $termId = $this->osidRuntimeTerms->getNextOrLatestTermId($offeringSearchSession->getCourseCatalogId()); } } else { - $termId = $this->_helper->osidId->fromString($this->_getParam('term')); + $termId = $this->osidRuntimeId->fromString($term); } // Topics @@ -282,13 +319,13 @@ public function searchAction() $this->view->terms = $termLookupSession->getTerms(); // Add our parameters to the search query - if ($this->_getParam('term')) { - $this->view->searchParams['term'] = $this->_getParam('term'); + if ($term) { + $this->view->searchParams['term'] = $term; if (isset($termId)) { $query->matchTermId($termId, true); - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $this->view->term = $termLookupSession->getTerm($termId); $this->view->selectedTermId = $termId; @@ -306,7 +343,7 @@ public function searchAction() if (count($departments)) { foreach ($departments as $idString) { - $id = $this->_helper->osidId->fromString($idString); + $id = $this->osidRuntimeId->fromString($idString); $query->matchTopicId($id, true); // set the first as the selected one if multiple. if (!isset($this->view->selectedDepartmentId)) { @@ -326,7 +363,7 @@ public function searchAction() if (count($subjects)) { foreach ($subjects as $idString) { - $id = $this->_helper->osidId->fromString($idString); + $id = $this->osidRuntimeId->fromString($idString); $query->matchTopicId($id, true); // set the first as the selected one if multiple. if (!isset($this->view->selectedSubjectId)) { @@ -346,7 +383,7 @@ public function searchAction() if (count($divisions)) { foreach ($divisions as $idString) { - $id = $this->_helper->osidId->fromString($idString); + $id = $this->osidRuntimeId->fromString($idString); $query->matchTopicId($id, true); // set the first as the selected one if multiple. if (!isset($this->view->selectedDivisionId)) { @@ -367,7 +404,7 @@ public function searchAction() if (count($requirements)) { foreach ($requirements as $idString) { - $id = $this->_helper->osidId->fromString($idString); + $id = $this->osidRuntimeId->fromString($idString); $query->matchTopicId($id, true); $this->view->selectedRequirementIds[] = $id; } @@ -385,7 +422,7 @@ public function searchAction() if (count($levels)) { foreach ($levels as $idString) { - $id = $this->_helper->osidId->fromString($idString); + $id = $this->osidRuntimeId->fromString($idString); $query->matchTopicId($id, true); $this->view->selectedLevelIds[] = $id; } @@ -403,7 +440,7 @@ public function searchAction() if (count($blocks)) { foreach ($blocks as $idString) { - $id = $this->_helper->osidId->fromString($idString); + $id = $this->osidRuntimeId->fromString($idString); $query->matchTopicId($id, true); $this->view->selectedBlockIds[] = $id; } @@ -421,7 +458,7 @@ public function searchAction() if (count($instructionMethods)) { foreach ($instructionMethods as $idString) { - $id = $this->_helper->osidId->fromString($idString); + $id = $this->osidRuntimeId->fromString($idString); $query->matchTopicId($id, true); $this->view->selectedInstructionMethodIds[] = $id; } @@ -439,7 +476,7 @@ public function searchAction() if (count($genusTypes)) { foreach ($genusTypes as $typeString) { - $genusType = $this->_helper->osidType->fromString($typeString); + $genusType = $this->osidRuntimeType->fromString($typeString); $query->matchGenusType($genusType, true); $this->view->selectedGenusTypes[] = $genusType; } @@ -458,7 +495,7 @@ public function searchAction() if (count($campuses)) { foreach ($campuses as $idString) { - $id = $this->_helper->osidId->fromString($idString); + $id = $this->osidRuntimeId->fromString($idString); $query->matchLocationId($id, true); $this->view->selectedCampusIds[] = $id; } @@ -468,7 +505,7 @@ public function searchAction() // Set the default selection to lecture/seminar if the is a new search if (!$this->_getParam('search') && !count($this->view->selectedGenusTypes)) { - $this->view->selectedGenusTypes = $this->_helper->osidTypes->getDefaultGenusTypes(); + $this->view->selectedGenusTypes = $this->osidRuntimeTypes->getDefaultGenusTypes(); } if ($query->hasRecordType($this->weeklyScheduleType)) { @@ -583,7 +620,7 @@ public function searchAction() if ($this->_getParam('instructor')) { if ($query->hasRecordType($this->instructorType)) { $queryRecord = $query->getCourseOfferingQueryRecord($this->instructorType); - $queryRecord->matchInstructorId($this->_helper->osidId->fromString($this->_getParam('instructor')), true); + $queryRecord->matchInstructorId($this->osidRuntimeId->fromString($this->_getParam('instructor')), true); } $this->view->searchParams['instructor'] = $this->_getParam('instructor'); } @@ -639,8 +676,8 @@ public function viewAction() protected function viewBase() { - $id = $this->_helper->osidId->fromString($this->_getParam('offering')); - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSession(); + $id = $this->osidRuntimeId->fromString($this->_getParam('offering')); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $lookupSession->useFederatedCourseCatalogView(); $this->view->offering = $lookupSession->getCourseOffering($id); @@ -648,7 +685,7 @@ protected function viewBase() $this->loadTopics($this->view->offering->getTopics()); // Set the selected Catalog Id. - $catalogSession = $this->_helper->osid->getCourseManager()->getCourseOfferingCatalogSession(); + $catalogSession = $this->osidRuntime->getCourseManager()->getCourseOfferingCatalogSession(); $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($id); if ($catalogIds->hasNext()) { $this->setSelectedCatalogId($catalogIds->getNextId()); @@ -693,8 +730,8 @@ public function viewxmlAction() $this->viewBase(); $this->view->feedTitle = $this->view->title; - $this->view->feedLink = $this->_helper->pathAsAbsoluteUrl('/offerings/view/'.$this->_getParam('catalog').'/offering/'.$this->_getParam('offering')); - $this->view->sections = new phpkit_course_ArrayCourseOfferingList([$this->view->offering]); + $this->view->feedLink = $this->_helper->pathAsAbsoluteUrl('/offerings/view/'.$catalog.'/offering/'.$this->_getParam('offering')); + $this->view->sections = new \phpkit_course_ArrayCourseOfferingList([$this->view->offering]); $this->postDispatch(); } } diff --git a/application/resources/Catalog/Action/Helper/OsidTerms.php b/src/Service/Osid/TermHelper.php similarity index 74% rename from application/resources/Catalog/Action/Helper/OsidTerms.php rename to src/Service/Osid/TermHelper.php index 6257f290..013fa697 100755 --- a/application/resources/Catalog/Action/Helper/OsidTerms.php +++ b/src/Service/Osid/TermHelper.php @@ -1,5 +1,7 @@ runtime = $runtime; + $this->idMap = $idMap; + } + /** * Answer the "current" termId for the catalog passed. If multiple terms overlap * to be 'current', only one will be returned. @@ -20,20 +48,20 @@ class Catalog_Action_Helper_OsidTerms extends Catalog_Action_Helper_AbstractOsid * * @since 6/11/09 */ - public function getNextOrLatestTermId(osid_id_Id $catalogId) + public function getNextOrLatestTermId(\osid_id_Id $catalogId) { - $catalogIdString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($catalogId); + $catalogIdString = $this->idMap->toString($catalogId); $cacheKey = 'upcoming_term::'.$catalogIdString; $currentTerm = self::cache_get($cacheKey); if (!$currentTerm) { - $manager = Zend_Controller_Action_HelperBroker::getStaticHelper('Osid')->getCourseManager(); + $manager = $this->runtime->getCourseManager(); if (!$manager->supportsTermLookup()) { - throw new osid_NotFoundException('Could not determine a current term id. The manager does not support term lookup.'); + throw new \osid_NotFoundException('Could not determine a current term id. The manager does not support term lookup.'); } $termLookup = $manager->getTermLookupSessionForCatalog($catalogId); $currentTerm = $this->findNextOrLatestTermId($termLookup->getTerms()); if (!$currentTerm) { - throw new osid_NotFoundException('Could not determine an upcoming term id for the catalog passed.'); + throw new \osid_NotFoundException('Could not determine an upcoming term id for the catalog passed.'); } self::cache_set($cacheKey, $currentTerm); @@ -52,20 +80,20 @@ public function getNextOrLatestTermId(osid_id_Id $catalogId) * * @since 6/11/09 */ - public function getCurrentTermId(osid_id_Id $catalogId) + public function getCurrentTermId(\osid_id_Id $catalogId) { - $catalogIdString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($catalogId); + $catalogIdString = $this->idMap->toString($catalogId); $cacheKey = 'current_term::'.$catalogIdString; $currentTerm = self::cache_get($cacheKey); if (!$currentTerm) { - $manager = Zend_Controller_Action_HelperBroker::getStaticHelper('Osid')->getCourseManager(); + $manager = $this->runtime->getCourseManager(); if (!$manager->supportsTermLookup()) { - throw new osid_NotFoundException('Could not determine a current term id. The manager does not support term lookup.'); + throw new \osid_NotFoundException('Could not determine a current term id. The manager does not support term lookup.'); } $termLookup = $manager->getTermLookupSessionForCatalog($catalogId); $currentTerm = $this->findClosestTermId($termLookup->getTerms()); if (!$currentTerm) { - throw new osid_NotFoundException('Could not determine a current term id for the catalog passed.'); + throw new \osid_NotFoundException('Could not determine a current term id for the catalog passed.'); } self::cache_set($cacheKey, $currentTerm); @@ -132,7 +160,7 @@ private static function cache_set($key, $value) * * @since 2/07/13 */ - public function findNextOrLatestTermId(osid_course_TermList $terms, ?DateTime $date = null) + public function findNextOrLatestTermId(\osid_course_TermList $terms, ?DateTime $date = null) { $upcomingIds = []; $upcomingDates = []; @@ -146,7 +174,7 @@ public function findNextOrLatestTermId(osid_course_TermList $terms, ?DateTime $d } if (!$terms->hasNext()) { - throw new osid_NotFoundException('Could not determine a current term id. No terms found.'); + throw new \osid_NotFoundException('Could not determine a current term id. No terms found.'); } while ($terms->hasNext()) { @@ -188,7 +216,7 @@ public function findNextOrLatestTermId(osid_course_TermList $terms, ?DateTime $d * * @since 6/11/09 */ - public function findClosestTermId(osid_course_TermList $terms, ?DateTime $date = null) + public function findClosestTermId(\osid_course_TermList $terms, ?DateTime $date = null) { $ids = []; $diffs = []; @@ -200,7 +228,7 @@ public function findClosestTermId(osid_course_TermList $terms, ?DateTime $date = } if (!$terms->hasNext()) { - throw new osid_NotFoundException('Could not determine a current term id. No terms found.'); + throw new \osid_NotFoundException('Could not determine a current term id. No terms found.'); } while ($terms->hasNext()) { diff --git a/templates/catalogs.html.twig b/templates/catalogs.html.twig index e34022c4..555055cf 100755 --- a/templates/catalogs.html.twig +++ b/templates/catalogs.html.twig @@ -1,4 +1,4 @@ {% for catalog in catalogs %} -

{{ catalog.display_name }}

+

{{ catalog.display_name }}

{{ catalog.description }}
{% endfor %} From 7fdc42e4387244adff18a14ca87e2a06fd769b6e Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 1 Oct 2024 17:31:14 -0400 Subject: [PATCH 020/173] #47: Port the offering view action. --- .../library/AbstractCatalogController.php | 28 --- .../Catalog/Action/Helper/Topics.php | 50 ---- .../views/scripts/offerings/view.phtml | 226 ------------------ config/services.yaml | 2 + .../Controller/Courses.php | 76 ++++-- src/Controller/Offerings.php | 136 +++++++---- .../Controller/Resources.php | 83 ++++--- .../Controller/Terms.php | 73 ++++-- .../Controller/Topics.php | 105 ++++---- src/Service/Osid/TopicHelper.php | 99 ++++++++ templates/offering.html.twig | 128 ++++++++++ 11 files changed, 544 insertions(+), 462 deletions(-) delete mode 100755 application/resources/Catalog/Action/Helper/Topics.php delete mode 100755 application/views/scripts/offerings/view.phtml rename application/controllers/CoursesController.php => src/Controller/Courses.php (93%) rename application/controllers/ResourcesController.php => src/Controller/Resources.php (62%) rename application/controllers/TermsController.php => src/Controller/Terms.php (58%) rename application/controllers/TopicsController.php => src/Controller/Topics.php (71%) create mode 100755 src/Service/Osid/TopicHelper.php create mode 100755 templates/offering.html.twig diff --git a/application/library/AbstractCatalogController.php b/application/library/AbstractCatalogController.php index ea3cdcd2..8ec8ea25 100755 --- a/application/library/AbstractCatalogController.php +++ b/application/library/AbstractCatalogController.php @@ -83,34 +83,6 @@ protected function getSelectedCatalogId() return $this->view->menuCatalogSelectedId; } - /** - * Load topics into our view. - * - * @param osid_course_TopicList - * - * @return void - * - * @since 4/28/09 - */ - protected function loadTopics(osid_course_TopicList $topicList) - { - $topics = $this->_helper->topics->topicListAsArray($topicList); - - $this->view->subjectTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); - - $this->view->departmentTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); - - $this->view->divisionTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division')); - - $this->view->requirementTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); - - $this->view->levelTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); - - $this->view->blockTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); - - $this->view->instructionMethodTopics = $this->_helper->topics->filterTopicsByType($topics, new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); - } - private $startTime; /** diff --git a/application/resources/Catalog/Action/Helper/Topics.php b/application/resources/Catalog/Action/Helper/Topics.php deleted file mode 100755 index fe4a7394..00000000 --- a/application/resources/Catalog/Action/Helper/Topics.php +++ /dev/null @@ -1,50 +0,0 @@ -hasNext()) { - $topics[] = $topicList->getNextTopic(); - } - - return $topics; - } - - /** - * Return an array of topics matching a type. - * - * @return array - * - * @since 4/28/09 - * - * @static - */ - public static function filterTopicsByType(array $topics, osid_type_Type $type) - { - $matching = []; - foreach ($topics as $topic) { - if ($topic->getGenusType()->isEqual($type)) { - $matching[] = $topic; - } - } - - return $matching; - } -} diff --git a/application/views/scripts/offerings/view.phtml b/application/views/scripts/offerings/view.phtml deleted file mode 100755 index 03be6099..00000000 --- a/application/views/scripts/offerings/view.phtml +++ /dev/null @@ -1,226 +0,0 @@ -render('schedules/bookmark_control.phtml'); - -// print "\n\t
".$this->escape($this->offering->getDisplayName())."
"; -print "\n\t

".nl2br($this->escape($this->offering->getTitle()))."

"; -if ($this->offering->getDescription()) - print "\n\t
".$this->offering->getDescription()."
"; - -$term = $this->offering->getTerm(); - -$resourceParams = array( - 'controller' => 'resources', - 'action' => 'view', - 'offering' => null, - 'term' => $this->getStringFromOsidId($term->getId()), - ); - -$termUrl = $this->url(array( - 'controller' => 'terms', - 'action' => 'view', - 'term' => $this->getStringFromOsidId($term->getId()), - 'offering' => null - )); -$offeringParams = array( - 'controller' => 'offerings', - 'action' => 'view', - 'course' => null - ); - -print "\n\t
"; -print "\n\t\t
Term:
"; -print "\n\t\t
"; -// print "\n\t\t\t"; -print $this->escape($term->getDisplayName()); -// print ""; -print "\n\t\t
"; -if ($this->offering->hasLocation()) { - print "\n\t\t
Location:
"; - print "\n\t\t
"; - $locationResource = $this->offering->getLocation(); - $resourceParams['resource'] = $this->getStringFromOsidId($locationResource->getId()); -// print "url($resourceParams)."\">"; - print $this->escape($locationResource->getDisplayName()); -// print " "; - if ($locationResource->getDescription()) - print "(".$this->escape($locationResource->getDescription()).")"; - print "\n\t\t
"; -} else if ($this->offering->getLocationInfo()) { - print "\n\t\t
Location:
"; - print "\n\t\t
".$this->escape($this->offering->getLocationInfo())."
"; -} -$scheduleInfo = $this->offering->getScheduleInfo(); -if (!empty($scheduleInfo)) { - print "\n\t\t
Schedule:
"; - print "\n\t\t
".$this->formatScheduleInfo($scheduleInfo)."
"; -} -print "\n\t\t
Type:
"; -print "\n\t\t
".$this->escape($this->offering->getGenusType()->getDisplayName())."
"; - -if (!empty($this->instructionMethodTopics)) { - print "\n\t\t
Course Modality:
"; - print "\n\t\t
"; - foreach ($this->instructionMethodTopics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; - } - print "
"; -} - -$instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); -if ($this->offering->hasRecordType($instructorsType)) { - $instructorsRecord = $this->offering->getCourseOfferingRecord($instructorsType); - print "\n\t\t
Instructors:
"; - print "\n\t\t
"; - $instructors = $instructorsRecord->getInstructors(); - while ($instructors->hasNext()) { - $instructor = $instructors->getNextResource(); - $resourceParams['resource'] = $this->getStringFromOsidId($instructor->getId()); - print "url($resourceParams)."\">"; - print $this->escape($instructor->getDisplayName()); - print " "; - } - print "
"; -} -// Topics -$topicParams = array( - 'controller' => 'topics', - 'action' => 'view', - 'offering' => null, - 'term' => $this->getStringFromOsidId($term->getId()) - ); -print "\n\t
Subject:
"; -print "\n\t\t
"; -foreach ($this->subjectTopics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -print "\n\t\t
Department:
"; -print "\n\t\t
"; -foreach ($this->departmentTopics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -print "\n\t\t
Division:
"; -print "\n\t\t
"; -foreach ($this->divisionTopics as $topic) { -// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); -// print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); -// print " "; -} -print "
"; - -print "\n\t\t
Requirements Fulfilled:
"; -print "\n\t\t
"; -foreach ($this->requirementTopics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -if (!empty($this->blockTopics)) { - print "\n\t\t
Additional Details:
"; - print "\n\t\t
"; - foreach ($this->blockTopics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; - } - print "
"; -} - -if (!empty($this->levelTopics)) { - print "\n\t\t
Levels:
"; - print "\n\t\t
"; - $i = 0; - foreach ($this->levelTopics as $topic) { - if ($i > 0) - print ", "; -// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); -// print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); -// print " "; - $i++; - } - print "
"; -} - -if (isset($this->alternates)) { - $alternateType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); - - print "\n\t\t
Cross-Listed As:
"; - print "\n\t\t
"; - while ($this->alternates->hasNext()) { - $alternate = $this->alternates->getNextCourseOffering(); - $offeringParams['offering'] = $this->getStringFromOsidId($alternate->getId()); - print "url($offeringParams)."\">"; - print $this->escape($alternate->getDisplayName()); - print ""; - if ($alternate->hasRecordType($alternateType)) { - $alternateRecord = $alternate->getCourseOfferingRecord($alternateType); - if ($alternateRecord->isPrimary()) { - print " * "; - } - } - print "
\n\t\t"; - } - print "
"; -} - -$availabilityLink = $this->getAvailabilityLink($this->offering); -if (!empty($availabilityLink)) { - print "\n\t\t
Availability:
"; - print "\n\t\t
"; - print $availabilityLink; - print "\n\t\t
"; -} - -print "\n\t
"; - - -print "\n\t
"; -$properties = $this->offering->getProperties(); -while ($properties->hasNext()) { - $property = $properties->getNextProperty(); - print "\n\t\t
"; - print $property->getDisplayName(); - if ($property->getDisplayName() != $property->getDisplayLabel()) - print " (".$property->getDisplayLabel().")"; - print ":
"; - print "\n\t\t
".$property->getValue()."
"; -} -print "\n\t
"; - -print "\n
"; - -$course = $this->offering->getCourse(); -$courseParams = array( - 'controller' => 'courses', - 'action' => 'view', - 'course' => $this->getStringFromOsidId($course->getId()), - 'offering' => null - ); -print "\n\t

Course

"; -print "\n\t"; - - -if (isset($this->parentOffering)) { - $offeringParams['offering'] = $this->getStringFromOsidId($this->parentOffering->getId()); - print "\n\t

Offering

"; -print "\n\t\t"; -} diff --git a/config/services.yaml b/config/services.yaml index 94b3690f..a8c70bce 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -47,3 +47,5 @@ services: class: App\Service\Osid\TypeMap osid.term_helper: class: App\Service\Osid\TermHelper + osid.topic_helper: + class: App\Service\Osid\TopicHelper diff --git a/application/controllers/CoursesController.php b/src/Controller/Courses.php similarity index 93% rename from application/controllers/CoursesController.php rename to src/Controller/Courses.php index 2e604c41..3e5648a1 100755 --- a/application/controllers/CoursesController.php +++ b/src/Controller/Courses.php @@ -1,21 +1,67 @@ osidRuntime = $osidRuntime; + $this->osidIdMap = $osidIdMap; + $this->osidTermHelper = $osidTermHelper; + $this->osidTopicHelper = $osidTopicHelper; + } + /** * Initialize object. * @@ -57,16 +103,10 @@ public function listAction() $this->view->menuIsCourses = true; } - /** - * View a catalog details. - * - * @return void - * - * @since 4/21/09 - */ - public function viewAction() + #[Route('/courses/view/{course}/{term}', name: 'view_course')] + public function view($course, $term = NULL) { - $id = $this->_helper->osidId->fromString($this->_getParam('course')); + $id = $this->_helper->osidId->fromString($course); $lookupSession = $this->_helper->osid->getCourseManager()->getCourseLookupSession(); $lookupSession->useFederatedCourseCatalogView(); $this->view->course = $lookupSession->getCourse($id); @@ -96,8 +136,8 @@ public function viewAction() } // Term - if ($this->_getParam('term')) { - $termId = $this->_helper->osidId->fromString($this->_getParam('term')); + if ($term) { + $termId = $this->_helper->osidId->fromString($term); $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $this->view->term = $termLookupSession->getTerm($termId); diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 3a5934be..6e6bc874 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -1,8 +1,6 @@ osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; + $this->osidTopicHelper = $osidTopicHelper; } /** @@ -235,8 +240,8 @@ public function search(string $catalog = NULL, $term = NULL) $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->departmentType, true); // if (isset($termId) && $topicQuery->hasRecordType($this->termType)) { - // $record = $topicQuery->getTopicQueryRecord($this->termType); - // $record->matchTermId($termId, true); + // $record = $topicQuery->getTopicQueryRecord($this->termType); + // $record->matchTermId($termId, true); // } $search = $topicSearchSession->getTopicSearch(); $order = $topicSearchSession->getTopicSearchOrder(); @@ -248,8 +253,8 @@ public function search(string $catalog = NULL, $term = NULL) $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->subjectType, true); // if (isset($termId) && $topicQuery->hasRecordType($this->termType)) { - // $record = $topicQuery->getTopicQueryRecord($this->termType); - // $record->matchTermId($termId, true); + // $record = $topicQuery->getTopicQueryRecord($this->termType); + // $record->matchTermId($termId, true); // } $search = $topicSearchSession->getTopicSearch(); $order = $topicSearchSession->getTopicSearchOrder(); @@ -654,64 +659,103 @@ public function search(string $catalog = NULL, $term = NULL) $this->view->menuIsSearch = true; } - /** - * View a catalog details. - * - * @return void - * - * @since 4/21/09 - */ - public function viewAction() + #[Route('/offerings/view/{id}', name: 'view_offering')] + public function viewAction($id) { - $this->viewBase(); + $data = $this->viewBase($id); // Bookmarked Courses and Schedules - $this->view->bookmarks_CourseId = $this->view->offering->getCourseId(); + $data['bookmarks_CourseId'] = $data['offering']->getCourseId(); - $this->view->menuIsOfferings = true; + $data['menuIsOfferings'] = true; - $this->render(); - $this->render('offerings', null, true); + return $this->render('offering.html.twig', $data); } - protected function viewBase() + protected function viewBase($idString) { - $id = $this->osidRuntimeId->fromString($this->_getParam('offering')); + $data = []; + $id = $this->osidIdMap->fromString($idString); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $lookupSession->useFederatedCourseCatalogView(); - $this->view->offering = $lookupSession->getCourseOffering($id); + $offering = $data['offering'] = $lookupSession->getCourseOffering($id); // Load the topics into our view - $this->loadTopics($this->view->offering->getTopics()); + $data = array_merge( + $data, + $this->osidTopicHelper->asTypedArray($offering->getTopics()) + ); // Set the selected Catalog Id. $catalogSession = $this->osidRuntime->getCourseManager()->getCourseOfferingCatalogSession(); $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($id); if ($catalogIds->hasNext()) { - $this->setSelectedCatalogId($catalogIds->getNextId()); + $catalogId = $catalogIds->getNextId(); + $data['menuCatalogSelectedId'] = $catalogId; + $data['menuCatalogSelected'] = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession()->getCourseCatalog($catalogId); } - // Set the title - $this->view->title = $this->view->offering->getDisplayName(); - $this->view->headTitle($this->view->title); + $data['title'] = $offering->getDisplayName(); - // Term - $this->view->term = $this->view->offering->getTerm(); + $data['term'] = $offering->getTerm(); - // Other offerings - $this->view->offeringsTitle = 'All Sections'; - $this->view->offerings = $lookupSession->getCourseOfferingsByTermForCourse( - $this->view->offering->getTermId(), - $this->view->offering->getCourseId() - ); + $data['location'] = NULL; + if ($offering->hasLocation()) { + $data['location'] = $offering->getLocation(); + } + + // Instructors + $data['instructors'] = NULL; + $instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); + if ($offering->hasRecordType($instructorsType)) { + $instructorsRecord = $offering->getCourseOfferingRecord($instructorsType); + $instructors = $instructorsRecord->getInstructors(); + $data['instructors'] = []; + while ($instructors->hasNext()) { + $data['instructors'][] = $instructors->getNextResource(); + } + } - // Alternates - if ($this->view->offering->hasRecordType($this->alternateType)) { - $record = $this->view->offering->getCourseOfferingRecord($this->alternateType); + // Alternates. + $data['alternates'] = NULL; + if ($offering->hasRecordType($this->getAlternateType())) { + $record = $offering->getCourseOfferingRecord($this->getAlternateType()); if ($record->hasAlternates()) { - $this->view->alternates = $record->getAlternates(); + $data['alternates'] = []; + $alternates = $record->getAlternates(); + while ($alternates->hasNext()) { + $alternate = $alternates->getNextCourseOffering(); + $alternate->is_primary = FALSE; + if ($alternate->hasRecordType($this->getAlternateType())) { + $alternateRecord = $alternate->getCourseOfferingRecord($this->getAlternateType()); + if ($alternateRecord->isPrimary()) { + $alternate->is_primary = TRUE; + } + } + $data['alternates'][] = $alternate; + } + } } + + // Availability link. @todo + $data['availabilityLink'] = NULL; + //$this->getAvailabilityLink($this->offering); + + $data['properties'] = []; + $properties = $offering->getProperties(); + while ($properties->hasNext()) { + $data['properties'][] = $properties->getNextProperty(); + } + + // Other offerings + $data['offeringsTitle'] = 'All Sections'; + $data['offerings'] = $lookupSession->getCourseOfferingsByTermForCourse( + $offering->getTermId(), + $offering->getCourseId() + ); + + return $data; } /** @@ -734,4 +778,8 @@ public function viewxmlAction() $this->view->sections = new \phpkit_course_ArrayCourseOfferingList([$this->view->offering]); $this->postDispatch(); } + + protected function getAlternateType() { + return new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); + } } diff --git a/application/controllers/ResourcesController.php b/src/Controller/Resources.php similarity index 62% rename from application/controllers/ResourcesController.php rename to src/Controller/Resources.php index 77af7c19..c4f3498e 100755 --- a/application/controllers/ResourcesController.php +++ b/src/Controller/Resources.php @@ -1,21 +1,50 @@ osidRuntime = $osidRuntime; + $this->osidIdMap = $osidIdMap; + } + /** * Initialize object. * @@ -38,11 +67,11 @@ public function init() // */ // public function listAction () { // if ($this->_getParam('catalog')) { - // $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - // $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + // $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + // $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); // $this->view->title = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); // } else { - // $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSession(); + // $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); // $this->view->title = 'Topics in All Catalogs'; // } // $lookupSession->useFederatedCourseCatalogView(); @@ -53,30 +82,24 @@ public function init() // $this->view->headTitle($this->view->title); // } - /** - * View a catalog details. - * - * @return void - * - * @since 4/21/09 - */ - public function viewAction() + #[Route('/resources/view/{resource}/{term}', name: 'view_resource')] + public function viewAction($resource, $term = NULL) { - $id = $this->_helper->osidId->fromString($this->_getParam('resource')); - $lookupSession = $this->_helper->osid->getCourseManager()->getResourceManager()->getResourceLookupSession(); + $id = $this->osidIdMap->fromString($resource); + $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $lookupSession->useFederatedBinView(); $this->view->resource = $lookupSession->getResource($id); - $offeringSearchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSession(); + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringSearchSession->useFederatedCourseCatalogView(); $query = $offeringSearchSession->getCourseOfferingQuery(); - if ($this->_getParam('term')) { - $termId = $this->_helper->osidId->fromString($this->_getParam('term')); + if ($term) { + $termId = $this->osidIdMap->fromString($term); $query->matchTermId($termId, true); - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $this->view->term = $termLookupSession->getTerm($termId); } @@ -99,7 +122,7 @@ public function viewAction() $allParams = []; $allParams['resource'] = $this->_getParam('resource'); if ($this->getSelectedCatalogId()) { - $allParams['catalog'] = $this->_helper->osidId->toString($this->getSelectedCatalogId()); + $allParams['catalog'] = $this->osidIdMap->toString($this->getSelectedCatalogId()); } $this->view->offeringsForAllTermsUrl = $this->_helper->url('view', 'resources', null, $allParams); @@ -110,7 +133,7 @@ public function viewAction() // Set the selected Catalog Id. if ($this->_getParam('catalog')) { - $this->setSelectedCatalogId($this->_helper->osidId->fromString($this->_getParam('catalog'))); + $this->setSelectedCatalogId($this->osidIdMap->fromString($this->_getParam('catalog'))); } // Set the title @@ -142,11 +165,11 @@ private function renderTextList(osid_type_Type $genusType) header('Content-Type: text/plain'); if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); $this->view->title = 'Resources in '.$lookupSession->getBin()->getDisplayName(); } else { - $lookupSession = $this->_helper->osid->getCourseManager()->getResourceManager()->getResourceLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $this->view->title = 'Resources in All Bins'; } $lookupSession->useFederatedBinView(); @@ -155,7 +178,7 @@ private function renderTextList(osid_type_Type $genusType) while ($resources->hasNext()) { $resource = $resources->getNextResource(); - echo $this->_helper->osidId->toString($resource->getId()).'|'.$this->_helper->osidId->toString($resource->getId()).' - '.$resource->getDisplayName()."\n"; + echo $this->osidIdMap->toString($resource->getId()).'|'.$this->osidIdMap->toString($resource->getId()).' - '.$resource->getDisplayName()."\n"; } // var_dump($lookupSession); // var_dump($resources); diff --git a/application/controllers/TermsController.php b/src/Controller/Terms.php similarity index 58% rename from application/controllers/TermsController.php rename to src/Controller/Terms.php index 55ed07e9..7372276c 100755 --- a/application/controllers/TermsController.php +++ b/src/Controller/Terms.php @@ -1,21 +1,50 @@ osidRuntime = $osidRuntime; + $this->osidIdMap = $osidIdMap; + } + /** * Print out a list of all terms. * @@ -26,11 +55,11 @@ class TermsController extends AbstractCatalogController public function listAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $this->view->title = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); } else { - $lookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $this->view->title = 'Terms in All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); @@ -56,26 +85,20 @@ public function listxmlAction() $this->listAction(); } - /** - * View a catalog details. - * - * @return void - * - * @since 4/21/09 - */ - public function viewAction() + #[Route('/terms/view/{id}', name: 'view_term')] + public function viewAction($id) { - $id = $this->_helper->osidId->fromString($this->_getParam('term')); - $lookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $id = $this->osidIdMap->fromString($this->_getParam('term')); + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $lookupSession->useFederatedCourseCatalogView(); $this->view->term = $lookupSession->getTerm($id); - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $lookupSession->useFederatedCourseCatalogView(); $this->view->offerings = $lookupSession->getCourseOfferingsByTerm($id); // Set the selected Catalog Id. - $catalogSession = $this->_helper->osid->getCourseManager()->getTermCatalogSession(); + $catalogSession = $this->osidRuntime->getCourseManager()->getTermCatalogSession(); $catalogIds = $catalogSession->getCatalogIdsByTerm($id); if ($catalogIds->hasNext()) { $this->setSelectedCatalogId($catalogIds->getNextId()); @@ -95,13 +118,13 @@ public function viewAction() */ public function detailsAction() { - $id = $this->_helper->osidId->fromString($this->_getParam('term')); - $lookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $id = $this->osidIdMap->fromString($this->_getParam('term')); + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $lookupSession->useFederatedCourseCatalogView(); $this->view->term = $lookupSession->getTerm($id); // Set the selected Catalog Id. - $catalogSession = $this->_helper->osid->getCourseManager()->getTermCatalogSession(); + $catalogSession = $this->osidRuntime->getCourseManager()->getTermCatalogSession(); $catalogIds = $catalogSession->getCatalogIdsByTerm($id); if ($catalogIds->hasNext()) { $this->setSelectedCatalogId($catalogIds->getNextId()); diff --git a/application/controllers/TopicsController.php b/src/Controller/Topics.php similarity index 71% rename from application/controllers/TopicsController.php rename to src/Controller/Topics.php index 453bb5fa..018e9daf 100755 --- a/application/controllers/TopicsController.php +++ b/src/Controller/Topics.php @@ -1,21 +1,50 @@ osidRuntime = $osidRuntime; + $this->osidIdMap = $osidIdMap; + } + /** * Print out a list of all topics. * @@ -26,17 +55,17 @@ class TopicsController extends AbstractCatalogController public function listAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); $this->view->title = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); } else { - $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $this->view->title = 'Topics in All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); if ($this->_getParam('type')) { - $genusType = $this->_helper->osidType->fromString($this->_getParam('type')); + $genusType = $this->osidRuntimeType->fromString($this->_getParam('type')); $topics = $lookupSession->getTopicsByGenusType($genusType); $this->view->title .= ' of type '.$this->_getParam('type'); } else { @@ -72,13 +101,13 @@ public function listxmlAction() public function recentAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $searchSession = $this->_helper->osid->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $this->view->title = 'Topics in '.$searchSession->getCourseCatalog()->getDisplayName(); } else { - $searchSession = $this->_helper->osid->getCourseManager()->getTopicSearchSession(); - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSession(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $this->view->title = 'Topics in All Catalogs'; } @@ -99,7 +128,7 @@ public function recentAction() } if ($this->_getParam('type')) { - $genusType = $this->_helper->osidType->fromString($this->_getParam('type')); + $genusType = $this->osidRuntimeType->fromString($this->_getParam('type')); $query->matchGenusType($genusType, true); $this->view->title .= ' of type '.$this->_getParam('type'); } @@ -144,27 +173,21 @@ public function recentxmlAction() $this->_helper->viewRenderer->setRender('topics/listxml', null, true); } - /** - * View a catalog details. - * - * @return void - * - * @since 4/21/09 - */ - public function viewAction() + #[Route('/topics/view/{topic}/{term}', name: 'view_topic')] + public function view($topic, $term = NULL) { - $id = $this->_helper->osidId->fromString($this->_getParam('topic')); - $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSession(); + $id = $this->osidIdMap->fromString($topic); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $lookupSession->useFederatedCourseCatalogView(); $this->view->topic = $lookupSession->getTopic($id); - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $lookupSession->useFederatedCourseCatalogView(); if ($this->_getParam('term')) { - $termId = $this->_helper->osidId->fromString($this->_getParam('term')); + $termId = $this->osidIdMap->fromString($term); $this->view->offerings = $lookupSession->getCourseOfferingsByTermByTopic($termId, $id); - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $this->view->term = $termLookupSession->getTerm($termId); } else { @@ -179,7 +202,7 @@ public function viewAction() // Set the selected Catalog Id. if ($this->_getParam('catalog')) { - $this->setSelectedCatalogId($this->_helper->osidId->fromString($this->_getParam('catalog'))); + $this->setSelectedCatalogId($this->osidIdMap->fromString($this->_getParam('catalog'))); } // Set the title @@ -191,7 +214,7 @@ public function viewAction() $allParams = []; $allParams['topic'] = $this->_getParam('topic'); if ($this->getSelectedCatalogId()) { - $allParams['catalog'] = $this->_helper->osidId->toString($this->getSelectedCatalogId()); + $allParams['catalog'] = $this->osidIdMap->toString($this->getSelectedCatalogId()); } $this->view->offeringsForAllTermsUrl = $this->_helper->url('view', 'topics', null, $allParams); @@ -209,16 +232,16 @@ public function viewxmlAction() $this->getResponse()->setHeader('Content-Type', 'text/xml'); if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); $this->view->title = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); } else { - $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $this->view->title = 'Topics in All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); - $topicId = $this->_helper->osidId->fromString($this->_getParam('topic')); + $topicId = $this->osidIdMap->fromString($this->_getParam('topic')); $topic = $lookupSession->getTopic($topicId); $topics = new phpkit_course_ArrayTopicList([$topic]); @@ -316,11 +339,11 @@ private function renderTextList(osid_type_Type $genusType) header('Content-Type: text/plain'); if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); $this->view->title = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); } else { - $lookupSession = $this->_helper->osid->getCourseManager()->getTopicLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $this->view->title = 'Topics in All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); @@ -329,7 +352,7 @@ private function renderTextList(osid_type_Type $genusType) while ($topics->hasNext()) { $topic = $topics->getNextTopic(); - echo $this->_helper->osidId->toString($topic->getId()).'|'.$this->_helper->osidId->toString($topic->getId()).' - '.$topic->getDisplayName()."\n"; + echo $this->osidIdMap->toString($topic->getId()).'|'.$this->osidIdMap->toString($topic->getId()).' - '.$topic->getDisplayName()."\n"; } exit; diff --git a/src/Service/Osid/TopicHelper.php b/src/Service/Osid/TopicHelper.php new file mode 100755 index 00000000..dfdb245e --- /dev/null +++ b/src/Service/Osid/TopicHelper.php @@ -0,0 +1,99 @@ +hasNext()) { + $topics[] = $topicList->getNextTopic(); + } + + return $topics; + } + + /** + * Return an array of topics matching a type. + * + * @param array $topics + * An array of osid_course_TopicList objects. + * @param osid_type_Type $type + * The type of topic to filter for. + * + * @return array + */ + public function filterTopicsByType(array $topics, \osid_type_Type $type) + { + $matching = []; + foreach ($topics as $topic) { + if ($topic->getGenusType()->isEqual($type)) { + $matching[] = $topic; + } + } + + return $matching; + } + + /** + * Return an array of topics organized by type. + * + * @param osid_course_TopicList $topicList + * + * @return array + * + */ + public function asTypedArray(\osid_course_TopicList $topicList) + { + $topics = $this->topicListAsArray($topicList); + $typedArray = []; + + $typedArray['subjectTopics'] = $this->filterTopicsByType( + $topics, + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject') + ); + $typedArray['departmentTopics'] = $this->filterTopicsByType( + $topics, + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department') + ); + $typedArray['divisionTopics'] = $this->filterTopicsByType( + $topics, + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division') + ); + $typedArray['requirementTopics'] = $this->filterTopicsByType( + $topics, + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement') + ); + $typedArray['levelTopics'] = $this->filterTopicsByType( + $topics, + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level') + ); + $typedArray['blockTopics'] = $this->filterTopicsByType( + $topics, + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block') + ); + $typedArray['instructionMethodTopics'] = $this->filterTopicsByType( + $topics, + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method') + ); + + return $typedArray; + } +} diff --git a/templates/offering.html.twig b/templates/offering.html.twig new file mode 100755 index 00000000..502b2c01 --- /dev/null +++ b/templates/offering.html.twig @@ -0,0 +1,128 @@ +print $this->render('schedules/bookmark_control.phtml'); + +
{{ offering.displayname }}
+

{{ offering.title|nl2br }}

+{% if offering.description %} +
{{ offering.description|raw }}
+{% endif %} + +
+
Term:
+
{{ term.displayname }}
+ +{% if location %} +
Location:
+
+ {{ location.displayname }} + {% if location.description %} + {{ location.description }} + {% endif %} +
+{% elseif offering.locationinfo %} +
Location:
+
{{ offering.locationinfo }}
+{% endif %} + +{% if offering.scheduleinfo %} +
Schedule:
+
{{ offering.scheduleinfo|nl2br|noWrapParentheticals|raw }}
+{% endif %} + +
Type:
+
{{ offering.genustype.displayname }}
+ +{% if instructionMethodTopics is not empty %} +
Schedule:
+
+ {% for topic in instructionMethodTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+{% endif %} + +{% if instructors is not null %} +
Instructors:
+
+ {% for instructor in instructors %} + {{ instructor.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+{% endif %} + +
Subject:
+
+{% for topic in subjectTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} +{% endfor %} +
+ +
Department:
+
+{% for topic in departmentTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} +{% endfor %} +
+ +
Division:
+
+{% for topic in divisionTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} +{% endfor %} +
+ +
Requirements Fulfilled:
+
+{% for topic in requirementTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} +{% endfor %} +
+ +{% if blockTopics is not empty %} +
Additional Details:
+
+ {% for topic in blockTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+{% endif %} + +{% if levelTopics is not empty %} +
Levels:
+
+ {% for topic in levelTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+{% endif %} + +{% if alternates is not empty %} +
Cross-Listed As:
+
+ {% for alternate in alternates %} + {{ alternate.displayname }} + {{ alternate.is_primary ? ' * ' }} +
+ {% endfor %} +
+{% endif %} + +{% if availabilityLink is not empty %} +
Availability:
+
{{ availabilityLink|raw }}
+{% endif %} + +
+ +
+{% for property in properties %} +
{{ property.displayname }}{{ property.displayname != property.displaylabel ? " (#{property.displaylabel})" }}:
+
{{ property.value }}
+{% endfor %} +
+ +
+ +

Course

+ From 024361b49b4e761a8bee70b26cce51efebd028ee Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 1 Oct 2024 17:33:09 -0400 Subject: [PATCH 021/173] #47: Add twig extensions to allow building of URLs from osid_Id objects. --- .../views/helpers/FormatScheduleInfo.php | 24 ----------- config/services.yaml | 8 ++++ src/Twig/NoWrapParentheticals.php | 21 ++++++++++ src/Twig/OsidIdExtension.php | 40 +++++++++++++++++++ 4 files changed, 69 insertions(+), 24 deletions(-) delete mode 100755 application/views/helpers/FormatScheduleInfo.php create mode 100644 src/Twig/NoWrapParentheticals.php create mode 100644 src/Twig/OsidIdExtension.php diff --git a/application/views/helpers/FormatScheduleInfo.php b/application/views/helpers/FormatScheduleInfo.php deleted file mode 100755 index cb60d856..00000000 --- a/application/views/helpers/FormatScheduleInfo.php +++ /dev/null @@ -1,24 +0,0 @@ -view->escape($scheduleInfo)); - $scheduleInfo = preg_replace('/\([^\)]+\)/', '$0', $scheduleInfo); - - return $scheduleInfo; - } -} diff --git a/config/services.yaml b/config/services.yaml index a8c70bce..5262ce94 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -38,6 +38,14 @@ services: arguments: $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' + App\Twig\OsidIdExtension: + tags: + - { name: 'twig.extension' } + + App\Twig\NoWrapParentheticals: + tags: + - { name: 'twig.extension' } + # Service aliases. osid.runtime: class: App\Service\Osid\Runtime diff --git a/src/Twig/NoWrapParentheticals.php b/src/Twig/NoWrapParentheticals.php new file mode 100644 index 00000000..243feadc --- /dev/null +++ b/src/Twig/NoWrapParentheticals.php @@ -0,0 +1,21 @@ +$0', $input); + } +} diff --git a/src/Twig/OsidIdExtension.php b/src/Twig/OsidIdExtension.php new file mode 100644 index 00000000..230f28f7 --- /dev/null +++ b/src/Twig/OsidIdExtension.php @@ -0,0 +1,40 @@ +idMap = $idMap; + } + + public function getFunctions(): array + { + return [ + new TwigFunction('osidIdToString', [$this, 'osidIdToString']), + ]; + } + + public function osidIdToString(\osid_id_Id $id): string + { + return $this->idMap->toString($id); + } +} From 77e13560f1654fa68dffcd4cb5dfc45793e8c144 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 1 Oct 2024 17:33:43 -0400 Subject: [PATCH 022/173] #47: Ensure that the FSMParser and Harmoni Primitives classes are available --- application/library/banner/course/Course.php | 3 --- composer.json | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/library/banner/course/Course.php b/application/library/banner/course/Course.php index 4d905f64..e809754a 100755 --- a/application/library/banner/course/Course.php +++ b/application/library/banner/course/Course.php @@ -6,9 +6,6 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL) */ -include_once 'fsmparserclass.inc.php'; -include_once 'harmoni/Primitives/Collections-Text/HtmlString.class.php'; - /** *

A Course represents a canonical learning unit. A * Course is instantiated at a time and place through the creation of diff --git a/composer.json b/composer.json index 8835e682..c3dcdc4b 100644 --- a/composer.json +++ b/composer.json @@ -35,7 +35,11 @@ "osid_": "library/osid-phpkit/", "phpkit_": "library/osid-phpkit/", "": "application/library/" - } + }, + "classmap": [ + "library/fsmparser/", + "application/library/harmoni/Primitives/" + ] }, "autoload-dev": { "psr-4": { From df1de2cdef2f1f1f3171a374dd09913049e06e87 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 2 Oct 2024 14:00:26 -0400 Subject: [PATCH 023/173] #47: Use subdirectories for template files to aid organization. --- src/Controller/Catalogs.php | 2 +- src/Controller/Offerings.php | 2 +- templates/{catalogs.html.twig => catalogs/list.html.twig} | 0 templates/{offering.html.twig => offerings/view.html.twig} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename templates/{catalogs.html.twig => catalogs/list.html.twig} (100%) rename templates/{offering.html.twig => offerings/view.html.twig} (100%) diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index 2d2771f7..88b72081 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -72,7 +72,7 @@ public function listAction() "description" => $catalog->getDescription(), ]; } - return $this->render('catalogs.html.twig', [ + return $this->render('catalogs/list.html.twig', [ 'title' => 'Available Catalogs', 'catalogs' => $catalogData, ]); diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 6e6bc874..2ed78ec4 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -669,7 +669,7 @@ public function viewAction($id) $data['menuIsOfferings'] = true; - return $this->render('offering.html.twig', $data); + return $this->render('offerings/view.html.twig', $data); } protected function viewBase($idString) diff --git a/templates/catalogs.html.twig b/templates/catalogs/list.html.twig similarity index 100% rename from templates/catalogs.html.twig rename to templates/catalogs/list.html.twig diff --git a/templates/offering.html.twig b/templates/offerings/view.html.twig similarity index 100% rename from templates/offering.html.twig rename to templates/offerings/view.html.twig From 4cb59994701088b160fc4096094aafaf8866af50 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 3 Oct 2024 13:45:57 -0400 Subject: [PATCH 024/173] #47: Add single-section XML view. --- .../views/scripts/offerings/searchxml.phtml | 220 ------------------ config/services.yaml | 4 + src/Controller/Offerings.php | 39 ++-- src/Service/Osid/IdMap.php | 40 ++++ src/Twig/DateRangeFormatter.php | 24 ++ src/Twig/OsidIdExtension.php | 6 + templates/offerings/search.xml.twig | 83 +++++++ templates/partials/term.xml.twig | 1 + 8 files changed, 180 insertions(+), 237 deletions(-) delete mode 100755 application/views/scripts/offerings/searchxml.phtml create mode 100644 src/Twig/DateRangeFormatter.php create mode 100755 templates/offerings/search.xml.twig create mode 100644 templates/partials/term.xml.twig diff --git a/application/views/scripts/offerings/searchxml.phtml b/application/views/scripts/offerings/searchxml.phtml deleted file mode 100755 index 498a77c2..00000000 --- a/application/views/scripts/offerings/searchxml.phtml +++ /dev/null @@ -1,220 +0,0 @@ -pathAsAbsoluteUrl($view->url(array( - 'controller' => 'terms', - 'action' => 'view', - 'term' => $view->getStringFromOsidId($term->getId()), - 'offering' => null - ))); - - $start_date = $term->getStartTime()->format('Y-m-d'); - $end_date = $term->getEndTime()->format('Y-m-d'); - // PHP >= 5.3 -// $span = $term->getEndTime()->diff($term->getStartTime()); -// $weeks = ceil($span->days / 7); - // PHP < 5.3 - $weeks = ceil(abs($term->getEndTime()->format('U') - $term->getStartTime()->format('U'))/60/60/24/7); - - print "\n".$tabs."getStringFromOsidId($term->getId())."\" href=\"".$termUrl."\" start_date=\"".$start_date."\" end_date=\"".$end_date."\" weeks=\"".$weeks."\">"; - print $view->escape($term->getDisplayName()); - print " "; -} - -print ' - - - '.$this->feedTitle.' - '.$this->feedLink.' - - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss -'; - -if (isset($this->previousTerm)) - printTerm($this, $this->previousTerm, 'previous_term', "\t\t"); -if (isset($this->term)) - printTerm($this, $this->term, 'chosen_term', "\t\t"); -if (isset($this->nextTerm)) - printTerm($this, $this->nextTerm, 'next_term', "\t\t"); - - -if (isset($this->terms)) { - print "\n\t\t"; - while ($this->terms->hasNext()) { - printTerm($this, $this->terms->getNextTerm()); - } - print "\n\t\t"; -} - -print "\n"; - -$alternateType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); -while ($this->sections->hasNext()) { - $section = $this->sections->getNextCourseOffering(); - - $offeringParams = array( - 'controller' => 'offerings', - 'action' => 'view', - 'offering' => $this->getStringFromOsidId($section->getId()) - ); - $resourceParams = array( - 'controller' => 'resources', - 'action' => 'view', - 'offering' => null - ); - - $term = $section->getTerm(); - $topicParams = array( - 'controller' => 'topics', - 'action' => 'view', - 'offering' => null, - 'term' => $this->getStringFromOsidId($term->getId()) - ); - - // Topics - $allTopics = $this->topicListAsArray($section->getTopics()); -?> - - - <?php print $this->escape($section->getDisplayName()); ?> - pathAsAbsoluteUrl($this->url($offeringParams)); ?> - getDescription(); ?>]]> - escape($section->getTitle()); ?> - escape($this->getStringFromOsidId($section->getId())); ?> -hasRecordType($alternateType)) { - $record = $section->getCourseOfferingRecord($alternateType); - print "\n\t\t\t"; - print $record->isPrimary()?"true":"false"; - print " "; - if ($record->hasAlternates()) { - $alternates = $record->getAlternates(); - while ($alternates->hasNext()) { - $alternate = $alternates->getNextCourseOffering(); - $offeringParams['offering'] = $this->getStringFromOsidId($alternate->getId()); - print "\n\t\t\tgetStringFromOsidId($alternate->getId())."\" href=\"".$this->pathAsAbsoluteUrl($this->url($offeringParams))."\">"; - print $this->escape($alternate->getDisplayName()); - print " "; - } - } -} - -print "\n\t\t\tgetStringFromOsidType($section->getGenusType())."\" "; -print "href=\"".$this->pathAsAbsoluteUrl($this->url($offeringParams))."\">"; -print $this->escape($section->getGenusType()->getDisplayName()); -print " "; - -printTerm($this, $term); - -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.subject"); -$topicTypeString = $this->getStringFromOsidType($topicType); -$topics = $this->filterTopicsByType($allTopics, $topicType); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "\n\t\t\tgetStringFromOsidId($topic->getId())."\" href=\"".$this->pathAsAbsoluteUrl($this->url($topicParams))."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} - -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.department"); -$topicTypeString = $this->getStringFromOsidType($topicType); -$topics = $this->filterTopicsByType($allTopics, $topicType); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "\n\t\t\tgetStringFromOsidId($topic->getId())."\" href=\"".$this->pathAsAbsoluteUrl($this->url($topicParams))."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} - -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.requirement"); -$topicTypeString = $this->getStringFromOsidType($topicType); -$topics = $this->filterTopicsByType($allTopics, $topicType); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "\n\t\t\tgetStringFromOsidId($topic->getId())."\" href=\"".$this->pathAsAbsoluteUrl($this->url($topicParams))."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} - -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.level"); -$topicTypeString = $this->getStringFromOsidType($topicType); -$topics = $this->filterTopicsByType($allTopics, $topicType); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "\n\t\t\tgetStringFromOsidId($topic->getId())."\" href=\"".$this->pathAsAbsoluteUrl($this->url($topicParams))."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} - -$topicType = new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.block"); -$topicTypeString = $this->getStringFromOsidType($topicType); -$topics = $this->filterTopicsByType($allTopics, $topicType); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "\n\t\t\tgetStringFromOsidId($topic->getId())."\" href=\"".$this->pathAsAbsoluteUrl($this->url($topicParams))."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} - - -$instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); -if ($section->hasRecordType($instructorsType)) { - $instructorsRecord = $section->getCourseOfferingRecord($instructorsType); - $instructors = $instructorsRecord->getInstructors(); - while ($instructors->hasNext()) { - $instructor = $instructors->getNextResource(); - $resourceParams['resource'] = $this->getStringFromOsidId($instructor->getId()); - print "\n\t\t\tgetStringFromOsidId($instructor->getId())."\" href=\"".$this->pathAsAbsoluteUrl($this->url($resourceParams))."\">"; - print $this->escape($instructor->getDisplayName()); - print " "; - } -} - -if ($section->hasLocation()) { - try { - $locationResource = $section->getLocation(); - $resourceParams['resource'] = $this->getStringFromOsidId($locationResource->getId()); - print "\n\t\t\tgetStringFromOsidId($locationResource->getId())."\" href=\"".$this->pathAsAbsoluteUrl($this->url($resourceParams))."\">"; - print $this->escape($locationResource->getDisplayName()); - print " "; -// if ($locationResource->getDescription()) -// print "(".$this->escape($locationResource->getDescription()).")"; -// print "\n\t\t

"; - } catch (osid_OperationFailedException $e) { - print "\n\t\t\t".$this->escape($section->getLocationInfo()).""; - } -} else if ($section->getLocationInfo()) { - print "\n\t\t\t".$this->escape($section->getLocationInfo()).""; -} -print "\n\t\t\thasRecordType($weeklyScheduleType)) { - $scheduleRecord = $section->getCourseOfferingRecord($weeklyScheduleType); - if ($scheduleRecord->hasMeetingStartDate()) { - print ' meeting_start_date="' . $scheduleRecord->getMeetingStartDate()->format('Y-m-d') . '"'; - } - if ($scheduleRecord->hasMeetingEndDate()) { - print ' meeting_end_date="' . $scheduleRecord->getMeetingEndDate()->format('Y-m-d') . '"'; - } -} -print ">".$this->escape($section->getScheduleInfo()).""; - -$properties = $section->getProperties(); -while ($properties->hasNext()) { - $property = $properties->getNextProperty(); - print "\n\t\t\t"; - print "\n\t\t\t\t".$property->getDisplayName().""; - print "\n\t\t\t\t".$property->getDisplayLabel().""; - print "\n\t\t\t\tgetDescription()."]]>"; - print "\n\t\t\t\tgetValue()."]]>"; - print "\n\t\t\t"; -} -?> - - - - - diff --git a/config/services.yaml b/config/services.yaml index 5262ce94..7e46208b 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -46,6 +46,10 @@ services: tags: - { name: 'twig.extension' } + App\Twig\DateRangeFormatter: + tags: + - { name: 'twig.extension' } + # Service aliases. osid.runtime: class: App\Service\Osid\Runtime diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 2ed78ec4..eb20d4de 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -13,7 +13,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; - +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; /** * A controller for working with courses. @@ -697,13 +697,22 @@ protected function viewBase($idString) $data['title'] = $offering->getDisplayName(); + $data['previousTerm'] = NULL; $data['term'] = $offering->getTerm(); + $data['nextTerm'] = NULL; + $data['terms'] = NULL; $data['location'] = NULL; if ($offering->hasLocation()) { $data['location'] = $offering->getLocation(); } + $data['weekly_schedule'] = NULL; + $weeklyScheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); + if ($offering->hasRecordType($weeklyScheduleType)) { + $data['weekly_schedule'] = $offering->getCourseOfferingRecord($weeklyScheduleType); + } + // Instructors $data['instructors'] = NULL; $instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); @@ -717,9 +726,11 @@ protected function viewBase($idString) } // Alternates. + $data['is_primary'] = TRUE; $data['alternates'] = NULL; if ($offering->hasRecordType($this->getAlternateType())) { $record = $offering->getCourseOfferingRecord($this->getAlternateType()); + $data['is_primary'] = $record->isPrimary(); if ($record->hasAlternates()) { $data['alternates'] = []; $alternates = $record->getAlternates(); @@ -758,25 +769,19 @@ protected function viewBase($idString) return $data; } - /** - * Answer search results as an xml feed. - * - * @return void - * - * @since 10/21/09 - */ - public function viewxmlAction() + #[Route('/offerings/viewxml/{id}', name: 'view_offering_xml')] + public function viewxmlAction($id) { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setRender('searchxml'); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); + $data = $this->viewBase($id); - $this->viewBase(); + $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); - $this->view->feedTitle = $this->view->title; - $this->view->feedLink = $this->_helper->pathAsAbsoluteUrl('/offerings/view/'.$catalog.'/offering/'.$this->_getParam('offering')); - $this->view->sections = new \phpkit_course_ArrayCourseOfferingList([$this->view->offering]); - $this->postDispatch(); + + $data['sections'] = [$data['offering']]; + + $response = new Response($this->renderView('offerings/search.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } protected function getAlternateType() { diff --git a/src/Service/Osid/IdMap.php b/src/Service/Osid/IdMap.php index c22f7007..2402e02d 100755 --- a/src/Service/Osid/IdMap.php +++ b/src/Service/Osid/IdMap.php @@ -50,4 +50,44 @@ public function toString(\osid_id_Id $id) return \phpkit_id_URNInetId::getInetURNString($id); } } + + /** + * Get and OSID Type object from a string. + * + * @param string $typeString + * + * @return osid_type_Type + * + * @since 4/21/09 + */ + public function typeFromString($typeString) + { + try { + return new \phpkit_type_URNInetType($typeString); + } catch (\osid_InvalidArgumentException $e) { + if ($this->getIdAuthorityToShorten()) { + return new \phpkit_type_Type($this->getIdAuthorityToShorten(), 'urn', $typeString); + } else { + throw $e; + } + } + } + + /** + * Answer a string representation of an OSID type object. + * + * @return string + * + * @since 4/21/09 + */ + public function typeToString(\osid_type_Type $type) + { + if ($this->getIdAuthorityToShorten() + && 'urn' == strtolower($type->getIdentifierNamespace()) + && strtolower($type->getAuthority()) == $this->getIdAuthorityToShorten()) { + return $type->getIdentifier(); + } else { + return \phpkit_type_URNInetType::getInetURNString($type); + } + } } diff --git a/src/Twig/DateRangeFormatter.php b/src/Twig/DateRangeFormatter.php new file mode 100644 index 00000000..eb0b8f74 --- /dev/null +++ b/src/Twig/DateRangeFormatter.php @@ -0,0 +1,24 @@ +format('U') - $start->format('U'))/60/60/24/7); + } +} diff --git a/src/Twig/OsidIdExtension.php b/src/Twig/OsidIdExtension.php index 230f28f7..0b9bcb69 100644 --- a/src/Twig/OsidIdExtension.php +++ b/src/Twig/OsidIdExtension.php @@ -30,6 +30,7 @@ public function getFunctions(): array { return [ new TwigFunction('osidIdToString', [$this, 'osidIdToString']), + new TwigFunction('osidTypeToString', [$this, 'osidTypeToString']), ]; } @@ -37,4 +38,9 @@ public function osidIdToString(\osid_id_Id $id): string { return $this->idMap->toString($id); } + + public function osidTypeToString(\osid_type_Type $type): string + { + return $this->idMap->typeToString($type); + } } diff --git a/templates/offerings/search.xml.twig b/templates/offerings/search.xml.twig new file mode 100755 index 00000000..4ea4987c --- /dev/null +++ b/templates/offerings/search.xml.twig @@ -0,0 +1,83 @@ + + + + {{ title }} + {{ feedLink }} + + {{ 'now' | date('r') }} + Course Catalog + http://blogs.law.harvard.edu/tech/rss + {% if previousTerm %}{{ include('partials/term.xml.twig', {term: previousTerm, key: 'previous_term'}) }}{% endif %} + {% if term %}{{ include('partials/term.xml.twig', {term: term, key: 'chosen_term'}) }}{% endif %} + {% if nextTerm %}{{ include('partials/term.xml.twig', {term: nextTerm, key: 'next_term'}) }}{% endif %} +{% if terms %} + + {% for t in terms %} + {{ include('partials/term.xml.twig', {term: t, key: 'term'}) }} + {% endfor %} + +{% endif %} + +{% for section in sections %} + + {{ section.displayname }} + {{ url('view_offering', {'id': osidIdToString(section.id)}) }} + + {{ section.title }} + {{ osidIdToString(section.id) }} + {%~ if is_primary is not null %} + {{ is_primary ? 'true':'false' }} + {% endif ~%} +{%- if alternates is not empty %} +{%- for alternate in alternates %} + {{ alternate.displayname }} +{% endfor ~%} +{% endif %} + {{ offering.genustype.displayname }} + {{ include('partials/term.xml.twig', {term: section.term, key: 'term'}) }} + +{%- for topic in subjectTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in departmentTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in divisionTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in requirementTopics %} + {{ topic.displayname }} +{% endfor %} +{%- if blockTopics is not empty %} + {%- for topic in blockTopics %} + {{ topic.displayname }} + {% endfor %} +{% endif %} +{%- if levelTopics is not empty %} + {%- for topic in levelTopics %} + {{ topic.displayname }} + {% endfor ~%} +{% endif %} +{%- if instructors is not null %} + {%- for instructor in instructors %} + {{ instructor.displayname }} + {% endfor %} +{% endif %} +{%- if location %} + {{ location.displayname }} +{% elseif offering.locationinfo %} + {{ offering.locationinfo }} +{% endif %} + {{ offering.scheduleinfo|raw }} +{% for property in properties %} + + {{ property.displayname }} + {{ property.displaylabel}} + + + +{% endfor %} +{% endfor %} + + + diff --git a/templates/partials/term.xml.twig b/templates/partials/term.xml.twig new file mode 100644 index 00000000..e3a771c7 --- /dev/null +++ b/templates/partials/term.xml.twig @@ -0,0 +1 @@ +{{ term.displayname }} From f2c7e69e40cefff568e19aabb19b4f631d923d75 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 3 Oct 2024 14:18:40 -0400 Subject: [PATCH 025/173] #47: Reorganize offering XML template code into a self-contained partial. --- src/Controller/Offerings.php | 54 +++++++++++++----------- templates/offerings/search.xml.twig | 62 +--------------------------- templates/offerings/view.html.twig | 24 +++++------ templates/partials/offering.xml.twig | 59 ++++++++++++++++++++++++++ 4 files changed, 103 insertions(+), 96 deletions(-) create mode 100644 templates/partials/offering.xml.twig diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index eb20d4de..c772e34f 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -662,23 +662,38 @@ public function search(string $catalog = NULL, $term = NULL) #[Route('/offerings/view/{id}', name: 'view_offering')] public function viewAction($id) { - $data = $this->viewBase($id); + $data = $this->getOfferingDataByIdString($id); // Bookmarked Courses and Schedules $data['bookmarks_CourseId'] = $data['offering']->getCourseId(); $data['menuIsOfferings'] = true; + // Set the selected Catalog Id. + $catalogSession = $this->osidRuntime->getCourseManager()->getCourseOfferingCatalogSession(); + $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($data['offering']->getId()); + if ($catalogIds->hasNext()) { + $catalogId = $catalogIds->getNextId(); + $data['menuCatalogSelectedId'] = $catalogId; + $data['menuCatalogSelected'] = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession()->getCourseCatalog($catalogId); + } + return $this->render('offerings/view.html.twig', $data); } - protected function viewBase($idString) + protected function getOfferingDataByIdString($idString) { - $data = []; $id = $this->osidIdMap->fromString($idString); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $lookupSession->useFederatedCourseCatalogView(); - $offering = $data['offering'] = $lookupSession->getCourseOffering($id); + return $this->getOfferingData($lookupSession->getCourseOffering($id)); + } + + protected function getOfferingData(\osid_course_CourseOffering $offering) { + $id = $offering->getId(); + + // Templates can access basic getter methods on the offering itself. + $data = ['offering' => $offering]; // Load the topics into our view $data = array_merge( @@ -686,22 +701,6 @@ protected function viewBase($idString) $this->osidTopicHelper->asTypedArray($offering->getTopics()) ); - // Set the selected Catalog Id. - $catalogSession = $this->osidRuntime->getCourseManager()->getCourseOfferingCatalogSession(); - $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($id); - if ($catalogIds->hasNext()) { - $catalogId = $catalogIds->getNextId(); - $data['menuCatalogSelectedId'] = $catalogId; - $data['menuCatalogSelected'] = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession()->getCourseCatalog($catalogId); - } - - $data['title'] = $offering->getDisplayName(); - - $data['previousTerm'] = NULL; - $data['term'] = $offering->getTerm(); - $data['nextTerm'] = NULL; - $data['terms'] = NULL; - $data['location'] = NULL; if ($offering->hasLocation()) { $data['location'] = $offering->getLocation(); @@ -759,7 +758,9 @@ protected function viewBase($idString) $data['properties'][] = $properties->getNextProperty(); } - // Other offerings + // Other offerings. + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $lookupSession->useFederatedCourseCatalogView(); $data['offeringsTitle'] = 'All Sections'; $data['offerings'] = $lookupSession->getCourseOfferingsByTermForCourse( $offering->getTermId(), @@ -772,12 +773,17 @@ protected function viewBase($idString) #[Route('/offerings/viewxml/{id}', name: 'view_offering_xml')] public function viewxmlAction($id) { - $data = $this->viewBase($id); + $data = []; + $data['offerings'] = [$this->getOfferingDataByIdString($id)]; + $offering = $data['offerings'][0]['offering']; + $data['title'] = $offering->getDisplayName(); $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); - - $data['sections'] = [$data['offering']]; + $data['previousTerm'] = NULL; + $data['term'] = $offering->getTerm(); + $data['nextTerm'] = NULL; + $data['terms'] = NULL; $response = new Response($this->renderView('offerings/search.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); diff --git a/templates/offerings/search.xml.twig b/templates/offerings/search.xml.twig index 4ea4987c..4dc74c5f 100755 --- a/templates/offerings/search.xml.twig +++ b/templates/offerings/search.xml.twig @@ -18,66 +18,8 @@ {% endif %} -{% for section in sections %} - - {{ section.displayname }} - {{ url('view_offering', {'id': osidIdToString(section.id)}) }} - - {{ section.title }} - {{ osidIdToString(section.id) }} - {%~ if is_primary is not null %} - {{ is_primary ? 'true':'false' }} - {% endif ~%} -{%- if alternates is not empty %} -{%- for alternate in alternates %} - {{ alternate.displayname }} -{% endfor ~%} -{% endif %} - {{ offering.genustype.displayname }} - {{ include('partials/term.xml.twig', {term: section.term, key: 'term'}) }} - -{%- for topic in subjectTopics %} - {{ topic.displayname }} -{% endfor %} -{%- for topic in departmentTopics %} - {{ topic.displayname }} -{% endfor %} -{%- for topic in divisionTopics %} - {{ topic.displayname }} -{% endfor %} -{%- for topic in requirementTopics %} - {{ topic.displayname }} -{% endfor %} -{%- if blockTopics is not empty %} - {%- for topic in blockTopics %} - {{ topic.displayname }} - {% endfor %} -{% endif %} -{%- if levelTopics is not empty %} - {%- for topic in levelTopics %} - {{ topic.displayname }} - {% endfor ~%} -{% endif %} -{%- if instructors is not null %} - {%- for instructor in instructors %} - {{ instructor.displayname }} - {% endfor %} -{% endif %} -{%- if location %} - {{ location.displayname }} -{% elseif offering.locationinfo %} - {{ offering.locationinfo }} -{% endif %} - {{ offering.scheduleinfo|raw }} -{% for property in properties %} - - {{ property.displayname }} - {{ property.displaylabel}} - - - -{% endfor %} +{% for offering in offerings %} +{{ include('partials/offering.xml.twig', offering, with_context = false) }} {% endfor %} - diff --git a/templates/offerings/view.html.twig b/templates/offerings/view.html.twig index 502b2c01..235b10ca 100755 --- a/templates/offerings/view.html.twig +++ b/templates/offerings/view.html.twig @@ -8,12 +8,12 @@ print $this->render('schedules/bookmark_control.phtml');
Term:
-
{{ term.displayname }}
+
{{ offering.term.displayname }}
{% if location %}
Location:
- {{ location.displayname }} + {{ location.displayname }} {% if location.description %} {{ location.description }} {% endif %} @@ -35,7 +35,7 @@ print $this->render('schedules/bookmark_control.phtml');
Schedule:
{% for topic in instructionMethodTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -44,7 +44,7 @@ print $this->render('schedules/bookmark_control.phtml');
Instructors:
{% for instructor in instructors %} - {{ instructor.displayname }}{{ not loop.last ? ',' }} + {{ instructor.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -52,28 +52,28 @@ print $this->render('schedules/bookmark_control.phtml');
Subject:
{% for topic in subjectTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Department:
{% for topic in departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Division:
{% for topic in divisionTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -81,7 +81,7 @@ print $this->render('schedules/bookmark_control.phtml');
Additional Details:
{% for topic in blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -90,7 +90,7 @@ print $this->render('schedules/bookmark_control.phtml');
Levels:
{% for topic in levelTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -99,7 +99,7 @@ print $this->render('schedules/bookmark_control.phtml');
Cross-Listed As:
{% for alternate in alternates %} - {{ alternate.displayname }} + {{ alternate.displayname }} {{ alternate.is_primary ? ' * ' }}
{% endfor %} @@ -124,5 +124,5 @@ print $this->render('schedules/bookmark_control.phtml');

Course

diff --git a/templates/partials/offering.xml.twig b/templates/partials/offering.xml.twig new file mode 100644 index 00000000..87f3b5ae --- /dev/null +++ b/templates/partials/offering.xml.twig @@ -0,0 +1,59 @@ + + {{ offering.displayname }} + {{ url('view_offering', {'id': osidIdToString(offering.id)}) }} + + {{ offering.title }} + {{ osidIdToString(offering.id) }} +{%~ if is_primary is not null %} + {{ is_primary ? 'true':'false' }} +{% endif ~%} +{%- if alternates is not empty %} +{%- for alternate in alternates %} + {{ alternate.displayname }} +{% endfor ~%} +{% endif %} + {{ offering.genustype.displayname }} + {{ include('partials/term.xml.twig', {term: offering.term, key: 'term'}) }} + +{%- for topic in subjectTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in departmentTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in divisionTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in requirementTopics %} + {{ topic.displayname }} +{% endfor %} +{%- if blockTopics is not empty %} +{%- for topic in blockTopics %} + {{ topic.displayname }} +{% endfor %} +{% endif %} +{%- if levelTopics is not empty %} +{%- for topic in levelTopics %} + {{ topic.displayname }} +{% endfor ~%} +{% endif %} +{%- if instructors is not null %} +{%- for instructor in instructors %} + {{ instructor.displayname }} +{% endfor %} +{% endif %} +{%- if location %} + {{ location.displayname }} +{% elseif offering.locationinfo %} + {{ offering.locationinfo }} +{% endif %} + {{ offering.scheduleinfo|raw }} +{% for property in properties %} + + {{ property.displayname }} + {{ property.displaylabel}} + + + +{% endfor %} + From 2885b60bed0aeac8767f48ec9a6ded3a1fa027df Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 3 Oct 2024 14:19:32 -0400 Subject: [PATCH 026/173] #47: Reorganize internal methods to the end of the class. --- src/Controller/Offerings.php | 40 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index c772e34f..9e9b3a9d 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -681,6 +681,26 @@ public function viewAction($id) return $this->render('offerings/view.html.twig', $data); } + #[Route('/offerings/viewxml/{id}', name: 'view_offering_xml')] + public function viewxmlAction($id) + { + $data = []; + $data['offerings'] = [$this->getOfferingDataByIdString($id)]; + $offering = $data['offerings'][0]['offering']; + + $data['title'] = $offering->getDisplayName(); + $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); + + $data['previousTerm'] = NULL; + $data['term'] = $offering->getTerm(); + $data['nextTerm'] = NULL; + $data['terms'] = NULL; + + $response = new Response($this->renderView('offerings/search.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; + } + protected function getOfferingDataByIdString($idString) { $id = $this->osidIdMap->fromString($idString); @@ -770,26 +790,6 @@ protected function getOfferingData(\osid_course_CourseOffering $offering) { return $data; } - #[Route('/offerings/viewxml/{id}', name: 'view_offering_xml')] - public function viewxmlAction($id) - { - $data = []; - $data['offerings'] = [$this->getOfferingDataByIdString($id)]; - $offering = $data['offerings'][0]['offering']; - - $data['title'] = $offering->getDisplayName(); - $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); - - $data['previousTerm'] = NULL; - $data['term'] = $offering->getTerm(); - $data['nextTerm'] = NULL; - $data['terms'] = NULL; - - $response = new Response($this->renderView('offerings/search.xml.twig', $data)); - $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); - return $response; - } - protected function getAlternateType() { return new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); } From 6a202bda339ec396e2f1e95e5584d36b9b52dee6 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 8 Oct 2024 14:39:39 -0400 Subject: [PATCH 027/173] #47: Add single course view. --- application/views/scripts/courses/view.phtml | 90 ----- application/views/scripts/offerings.phtml | 63 ---- src/Controller/Courses.php | 342 +++++++++++-------- templates/courses/view.html.twig | 78 +++++ templates/partials/offerings.html.twig | 26 ++ 5 files changed, 307 insertions(+), 292 deletions(-) delete mode 100755 application/views/scripts/courses/view.phtml delete mode 100755 application/views/scripts/offerings.phtml create mode 100755 templates/courses/view.html.twig create mode 100755 templates/partials/offerings.html.twig diff --git a/application/views/scripts/courses/view.phtml b/application/views/scripts/courses/view.phtml deleted file mode 100755 index c9c8967e..00000000 --- a/application/views/scripts/courses/view.phtml +++ /dev/null @@ -1,90 +0,0 @@ -render('schedules/bookmark_control.phtml'); - -// print "\n\t
".$this->escape($this->course->getDisplayName())."
"; -print "\n\t

".$this->escape($this->course->getTitle())."

"; -if ($this->course->getDescription()) - print "\n\t
".$this->course->getDescription()."
"; - -print "\n\t
"; -// Topics -$topicParams = array( - 'controller' => 'topics', - 'action' => 'view', - 'offering' => null - ); -if (isset($this->term)) { - $topicParams['term'] = $this->getStringFromOsidId($this->term->getId()); -} else if (isset($this->linkTermId)) { - $topicParams['term'] = $this->getStringFromOsidId($this->linkTermId); -} - -print "\n\t
Subject:
"; -print "\n\t\t
"; -foreach ($this->subjectTopics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -print "\n\t\t
Department:
"; -print "\n\t\t
"; -foreach ($this->departmentTopics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -print "\n\t\t
Division:
"; -print "\n\t\t
"; -foreach ($this->divisionTopics as $topic) { -// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); -// print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); -// print " "; -} -print "
"; - -print "\n\t\t
Requirements Fulfilled:
"; -print "\n\t\t
"; -foreach ($this->requirementTopics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -if (isset($this->alternates)) { - $alternateType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); - - print "\n\t\t
Equivalent Courses:
"; - print "\n\t\t
"; - while ($this->alternates->hasNext()) { - try { - $alternate = $this->alternates->getNextCourse(); - $altParams['course'] = $this->getStringFromOsidId($alternate->getId()); - print "url($altParams)."\">"; - print $this->escape($alternate->getDisplayName()); - print ""; - if ($alternate->hasRecordType($alternateType)) { - $alternateRecord = $alternate->getCourseRecord($alternateType); - if ($alternateRecord->isPrimary()) { - print " * "; - } - } - print "
\n\t\t"; - } catch(osid_NotFoundException $e) { - } - } - print "
"; -} - -print "\n\t
"; - -print $this->render('offerings.phtml'); diff --git a/application/views/scripts/offerings.phtml b/application/views/scripts/offerings.phtml deleted file mode 100755 index fa0af3bd..00000000 --- a/application/views/scripts/offerings.phtml +++ /dev/null @@ -1,63 +0,0 @@ -"; -if (isset($this->term)) { - print "\n\t

".$this->offeringsTitle." in ".$this->term->getDisplayName()."

"; - if (isset($this->offeringsForAllTermsUrl)) { - print "\n\t
show ".strtolower($this->offeringsTitle)." in all terms
"; - } -} else { - print "\n\t

".$this->offeringsTitle."

"; -} - -$offeringParams = array( - 'controller' => 'offerings', - 'action' => 'view', - 'course' => null, - 'topic' => null, - 'resource' => null - ); -while ($this->offerings->hasNext()) { - $offering = $this->offerings->getNextCourseOffering(); - if (!isset($currentTerm) || $currentTerm->getId() != $offering->getTermId()) { - $currentTerm = $offering->getTerm(); - print "\n

".$currentTerm->getDisplayName()."

"; - } - - $offeringParams['offering'] = $this->getStringFromOsidId($offering->getId()); - - if (isset($this->offering) && $offering->getId()->isEqual($this->offering->getId())) - print "\n\t
"; - else - print "\n\t
"; - - print "".$this->escape($offering->getDisplayName()).""; - print " ".$this->escape($offering->getGenusType()->getDisplayName()).""; - - if (!isset($this->hideOfferingInstructors) || !$this->hideOfferingInstructors) { - if ($offering->hasRecordType($instructorsType)) { - $instructorsRecord = $offering->getCourseOfferingRecord($instructorsType); - $instructors = $instructorsRecord->getInstructors(); - if ($instructors->hasNext()) { - $instNames = array(); - while ($instructors->hasNext()) { - $instructor = $instructors->getNextResource(); - if ($instructor->hasRecordType($namesType)) { - $namesRecord = $instructor->getResourceRecord($namesType); - $instNames[] = $this->escape($namesRecord->getSurname()); - } else { - $instNames[] = $this->escape($instructor->getDisplayName()); - } - } - print " ("; - print implode(', ', $instNames); - print ")"; - } - } - } - print "
"; -} -print "\n\t
"; diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 3e5648a1..1df9fe86 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -60,20 +60,9 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $ $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; $this->osidTopicHelper = $osidTopicHelper; - } - - /** - * Initialize object. - * - * Called from {@link __construct()} as final step of object instantiation. - * - * @return void - */ - public function init() - { - $this->alternateType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); - - parent::init(); + $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); + $this->instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); + $this->namesType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:person_names'); } /** @@ -86,11 +75,11 @@ public function init() public function listAction() { if ($this->_getParam('catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); $this->view->title = 'Courses in '.$lookupSession->getCourseCatalog()->getDisplayName(); } else { - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseLookupSession(); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $this->view->title = 'Courses in All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); @@ -106,67 +95,111 @@ public function listAction() #[Route('/courses/view/{course}/{term}', name: 'view_course')] public function view($course, $term = NULL) { - $id = $this->_helper->osidId->fromString($course); - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - $this->view->course = $lookupSession->getCourse($id); - - // Load the topics into our view - $this->loadTopics($this->view->course->getTopics()); + $data = $this->getCourseDataByIdString($course, $term); // Set the selected Catalog Id. - $catalogSession = $this->_helper->osid->getCourseManager()->getCourseCatalogSession(); - $catalogIds = $catalogSession->getCatalogIdsByCourse($id); - if ($catalogIds->hasNext()) { - $this->setSelectedCatalogId($catalogIds->getNextId()); + // $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); + // $catalogIds = $catalogSession->getCatalogIdsByCourse($id); + // if ($catalogIds->hasNext()) { + // $this->setSelectedCatalogId($catalogIds->getNextId()); + // } + + // $this->view->menuIsCourses = true; + + // Bookmarked Courses and Schedules + // $data['bookmarks_CourseId'] = $course->getId(); + + return $this->render('courses/view.html.twig', $data); + + } + + protected function getCourseDataByIdString($idString, $termIdString = NULL) + { + $id = $this->osidIdMap->fromString($idString); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); + $lookupSession->useFederatedCourseCatalogView(); + + if ($termIdString) { + $termId = $this->osidIdMap->fromString($termIdString); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $term = $termLookupSession->getTerm($termId); + } + else { + $term = NULL; } - // Set the title - $this->view->title = $this->view->course->getDisplayName(); - $this->view->headTitle($this->view->title); + return $this->getCourseData($lookupSession->getCourse($id), $term); + } - $this->view->menuIsCourses = true; + protected function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + $data['course'] = $course; + // Load the topics into our view + $data = array_merge($data, $this->getTopics($course->getTopics())); // Alternates - if ($this->view->course->hasRecordType($this->alternateType)) { - $record = $this->view->course->getCourseRecord($this->alternateType); + $data['is_primary'] = TRUE; + $data['alternates'] = NULL; + if ($course->hasRecordType($this->alternateType)) { + $record = $course->getCourseRecord($this->alternateType); + $data['is_primary'] = $record->isPrimary(); if ($record->hasAlternates()) { - $this->view->alternates = $record->getAlternates(); + $data['alternates'] = []; + $alternates = $record->getAlternates(); + while ($alternates->hasNext()) { + $alternate = $alternates->getNextCourse(); + $alternate->is_primary = FALSE; + if ($alternate->hasRecordType($this->alternateType)) { + $alternateRecord = $alternate->getCourseRecord($this->alternateType); + if ($alternateRecord->isPrimary()) { + $alternate->is_primary = TRUE; + } + } + $data['alternates'][] = $alternate; + } } } // Term - if ($term) { - $termId = $this->_helper->osidId->fromString($term); - $termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - $this->view->term = $termLookupSession->getTerm($termId); - - $allParams = []; - $allParams['course'] = $this->_getParam('course'); - if ($this->getSelectedCatalogId()) { - $allParams['catalog'] = $this->_helper->osidId->toString($this->getSelectedCatalogId()); - } - $this->view->offeringsForAllTermsUrl = $this->_helper->url('view', 'courses', null, $allParams); - } else { - $this->view->linkTermId = $this->_helper->osidTerms->getNextOrLatestTermId($this->getSelectedCatalogId()); - } - - // Bookmarked Courses and Schedules - $this->view->bookmarks_CourseId = $this->view->course->getId(); + $data['term'] = $term; - // offerings - $this->view->offeringsTitle = 'Sections'; - $offeringLookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSession(); + // offerings. + $data['offerings'] = []; + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $offeringLookupSession->useFederatedCourseCatalogView(); - if (isset($this->view->term)) { - $this->view->offerings = $offeringLookupSession->getCourseOfferingsByTermForCourse( - $this->view->term->getId(), - $id + if ($term) { + $offerings = $offeringLookupSession->getCourseOfferingsByTermForCourse( + $term->getId(), + $course->getId(), ); } else { - $this->view->offerings = $offeringLookupSession->getCourseOfferingsForCourse($id); + $offerings = $offeringLookupSession->getCourseOfferingsForCourse($course->getId()); } + while ($offerings->hasNext()) { + $offering = $offerings->getNextCourseOffering(); + + if ($offering->hasRecordType($this->instructorsType)) { + $instructorsRecord = $offering->getCourseOfferingRecord($this->instructorsType); + $instructors = $instructorsRecord->getInstructors(); + $offering->instructors = []; + if ($instructors->hasNext()) { + $instNames = array(); + while ($instructors->hasNext()) { + $instructor = $instructors->getNextResource(); + if ($instructor->hasRecordType($this->namesType)) { + $namesRecord = $instructor->getResourceRecord($this->namesType); + $offering->instructors[] = $namesRecord->getSurname(); + } else { + $offering->instructors[] = $instructor->getDisplayName(); + } + } + } + } + + $data['offerings'][] = $offering; + } + + return $data; } /** @@ -200,8 +233,8 @@ public function searchxmlAction() exit; } try { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $searchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $searchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); } catch (osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -218,13 +251,13 @@ public function searchxmlAction() header('Content-Type: text/xml'); echo ' - - Course Search: "'.htmlspecialchars($keywords).'" - '.$searchUrl.' - - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss + + Course Search: "'.htmlspecialchars($keywords).'" + '.$searchUrl.' + + '.date('r').' + Course Catalog + http://blogs.law.harvard.edu/tech/rss '; $courses = []; @@ -236,18 +269,18 @@ public function searchxmlAction() $query = $searchSession->getCourseOfferingQuery(); $query->matchKeyword( $keywords, - new phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'), + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'), true); $offerings = $searchSession->getCourseOfferingsByQuery($query); while ($offerings->hasNext() && count($courses) <= 20) { $offering = $offerings->getNextCourseOffering(); - $courseIdString = $this->_helper->osidId->toString($offering->getCourseId()); + $courseIdString = $this->osidIdMap->toString($offering->getCourseId()); if (!isset($courses[$courseIdString])) { try { $courses[$courseIdString] = $offering->getCourse(); } catch (osid_OperationFailedException $e) { - // print "\nFailure on ".$offering->getDisplayName()."OfferingId:\n".print_r($offering->getId(), true)."\n\nCourseId:\n".print_r($offering->getCourseId(), true)."]]>"; + // print "\nFailure on ".$offering->getDisplayName()."OfferingId:\n".print_r($offering->getId(), true)."\n\nCourseId:\n".print_r($offering->getCourseId(), true)."]]>"; } } } @@ -278,7 +311,7 @@ public function searchxmlAction() } echo ' - + '; exit; @@ -302,10 +335,10 @@ public function topicxmlAction() exit; } try { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $searchSession = $this->_helper->osid->getCourseManager()->getCourseSearchSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $searchSession = $this->osidRuntime->getCourseManager()->getCourseSearchSessionForCatalog($catalogId); - $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } catch (osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -325,10 +358,10 @@ public function topicxmlAction() $topicsIds = []; if (is_array($this->_getParam('topic'))) { foreach ($this->_getParam('topic') as $idString) { - $topicIds[] = $this->_helper->osidId->fromString($idString); + $topicIds[] = $this->osidIdMap->fromString($idString); } } else { - $topicIds[] = $this->_helper->osidId->fromString($this->_getParam('topic')); + $topicIds[] = $this->osidIdMap->fromString($this->_getParam('topic')); } $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('search', 'offerings', null, [])); @@ -336,7 +369,7 @@ public function topicxmlAction() // Fetch courses $query = $searchSession->getCourseQuery(); - $topicRecord = $query->getCourseQueryRecord(new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:topic')); + $topicRecord = $query->getCourseQueryRecord(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:topic')); foreach ($topicIds as $topicId) { $topicRecord->matchTopicId($topicId, true); } @@ -345,22 +378,22 @@ public function topicxmlAction() $locationIds = []; if (is_array($this->_getParam('location'))) { foreach ($this->_getParam('location') as $idString) { - $locationIds[] = $this->_helper->osidId->fromString($idString); + $locationIds[] = $this->osidIdMap->fromString($idString); } } elseif ($this->_getParam('location')) { - $locationIds[] = $this->_helper->osidId->fromString($this->_getParam('location')); + $locationIds[] = $this->osidIdMap->fromString($this->_getParam('location')); } - $locationRecord = $query->getCourseQueryRecord(new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:location')); + $locationRecord = $query->getCourseQueryRecord(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:location')); foreach ($locationIds as $locationId) { $locationRecord->matchLocationId($locationId, true); } // Limit to just active courses - $query->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:status-active'), true); + $query->matchGenusType(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:status-active'), true); $courses = $searchSession->getCoursesByQuery($query)->getCourses(); - $topicLookup = $this->_helper->osid->getCourseManager()->getTopicLookupSession(); + $topicLookup = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $topicLookup->useFederatedCourseCatalogView(); $topic = $topicLookup->getTopic($topicId); @@ -389,9 +422,9 @@ public function byidxmlAction() exit; } try { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); - $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } catch (osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -411,10 +444,10 @@ public function byidxmlAction() $courseIds = []; if (is_array($this->_getParam('id'))) { foreach ($this->_getParam('id') as $idString) { - $courseIds[] = $this->_helper->osidId->fromString($idString); + $courseIds[] = $this->osidIdMap->fromString($idString); } } else { - $courseIds[] = $this->_helper->osidId->fromString($this->_getParam('id')); + $courseIds[] = $this->osidIdMap->fromString($this->_getParam('id')); } // Use Comparative view to include any found courses, ignoring missing ids. @@ -455,28 +488,28 @@ public function instructorxmlAction() $this->_helper->viewRenderer->setNoRender(); if (!$this->_getParam('catalog')) { - $offeringSearchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSession(); + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringSearchSession->useFederatedCourseCatalogView(); - $courseLookupSession = $this->_helper->osid->getCourseManager()->getCourseLookupSession(); + $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $courseLookupSession->useFederatedCourseCatalogView(); // Allow term current/past to be limited to a certain catalog while courses are fetched from many if ($this->_getParam('term_catalog')) { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('term_catalog')); - $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('term_catalog')); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } // fall back to terms from any catalog. else { - $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $this->termLookupSession->useFederatedCourseCatalogView(); } } else { try { - $catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $offeringSearchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); - $courseLookupSession = $this->_helper->osid->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); + $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); + $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); - $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } catch (osid_InvalidArgumentException $e) { throw new osid_InvalidArgumentException('The catalog id specified was not of the correct format.'); } catch (osid_NotFoundException $e) { @@ -495,10 +528,10 @@ public function instructorxmlAction() throw new InvalidArgumentException('An instructor must be specified.'); } - $instructorId = $this->_helper->osidId->fromString('resource.person.'.$instructor); + $instructorId = $this->osidIdMap->fromString('resource.person.'.$instructor); $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'resources', null, ['catalog' => $this->_getParam('catalog'), 'resource' => 'resouce.person.'.$instructor])); - $resourceLookup = $this->_helper->osid->getCourseManager()->getResourceManager()->getResourceLookupSession(); + $resourceLookup = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); try { $instructorResource = $resourceLookup->getResource($instructorId); } catch (osid_NotFoundException $e) { @@ -512,7 +545,7 @@ public function instructorxmlAction() // Fetch Offerings $query = $offeringSearchSession->getCourseOfferingQuery(); - $instructorRecord = $query->getCourseOfferingQueryRecord(new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors')); + $instructorRecord = $query->getCourseOfferingQueryRecord(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors')); $instructorRecord->matchInstructorId($instructorId, true); $order = $offeringSearchSession->getCourseOfferingSearchOrder(); @@ -554,13 +587,13 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse header('Content-Type: text/xml'); echo ' - - '.htmlspecialchars($title).' - '.$url.' - - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss + + '.htmlspecialchars($title).' + '.$url.' + + '.date('r').' + Course Catalog + http://blogs.law.harvard.edu/tech/rss '; @@ -570,26 +603,26 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse flush(); // Set the next and previous terms - $currentTermId = $this->_helper->osidTerms->getCurrentTermId($this->termLookupSession->getCourseCatalogId()); + $currentTermId = $this->osidTermHelper->getCurrentTermId($this->termLookupSession->getCourseCatalogId()); $currentTerm = $this->termLookupSession->getTerm($currentTermId); $currentEndTime = $this->DateTime_getTimestamp($currentTerm->getEndTime()); - // print "debug()); - // print "]]>"; + // print "debug()); + // print "]]>"; - $catalogSession = $this->_helper->osid->getCourseManager()->getCourseCatalogSession(); - $termsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); + $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); + $termsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - // foreach ($groups as $key => $group) { - // print "\n$key"; - // foreach ($group as $course) { - // print "\n\t".$this->_helper->osidId->toString($course->getId()); - // } - // } + // foreach ($groups as $key => $group) { + // print "\n$key"; + // foreach ($group as $course) { + // print "\n\t".$this->osidIdMap->toString($course->getId()); + // } + // } foreach ($recentCourses->getPrimaryCourses() as $course) { - $courseIdString = $this->_helper->osidId->toString($course->getId()); + $courseIdString = $this->osidIdMap->toString($course->getId()); echo "\n\t\t"; @@ -605,7 +638,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse echo "\n\t\t\t"; $catalog = $catalogSession->getCatalogIdsByCourse($course->getId()); if ($catalog->hasNext()) { - $catalogIdString = $this->_helper->osidId->toString($catalog->getNextId()); + $catalogIdString = $this->osidIdMap->toString($catalog->getNextId()); } else { $catalogIdString = null; } @@ -625,7 +658,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse foreach ($alternates as $alt) { echo "\n\t\t\t"; - echo "\n\t\t\t\t".$this->_helper->osidId->toString($alt->getId()).''; + echo "\n\t\t\t\t".$this->osidIdMap->toString($alt->getId()).''; echo "\n\t\t\t\t".htmlspecialchars($alt->getDisplayName()).''; echo "\n\t\t\t\t".htmlspecialchars($alt->getTitle()).''; echo "\n\t\t\t"; @@ -635,7 +668,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse if (count($recentTerms)) { $termStrings = []; foreach ($recentTerms as $term) { - echo "\n\t\t\t_helper->osidId->toString($term->getId()).'"'; + echo "\n\t\t\tosidIdMap->toString($term->getId()).'"'; if ($term->getId()->isEqual($currentTermId)) { echo ' type="current"'; } elseif ($currentEndTime < $this->DateTime_getTimestamp($term->getEndTime())) { @@ -649,33 +682,33 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse } } - $allTopics = $this->_helper->topics->topicListAsArray($course->getTopics()); - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); + $allTopics = $this->osidTopicHelper->topicListAsArray($course->getTopics()); + $topicType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); $topicTypeString = $this->_helper->osidType->toString($topicType); - $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); + $topics = $this->osidTopicHelper->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { - $topicParams['topic'] = $this->_helper->osidId->toString($topic->getId()); - echo "\n\t\t\t'; + $topicParams['topic'] = $this->osidIdMap->toString($topic->getId()); + echo "\n\t\t\t'; echo $this->view->escape($topic->getDisplayName()); echo ' '; } - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); + $topicType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); $topicTypeString = $this->_helper->osidType->toString($topicType); - $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); + $topics = $this->osidTopicHelper->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { - $topicParams['topic'] = $this->_helper->osidId->toString($topic->getId()); - echo "\n\t\t\t'; + $topicParams['topic'] = $this->osidIdMap->toString($topic->getId()); + echo "\n\t\t\t'; echo $this->view->escape($topic->getDisplayName()); echo ' '; } - $topicType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); + $topicType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); $topicTypeString = $this->_helper->osidType->toString($topicType); - $topics = $this->_helper->topics->filterTopicsByType($allTopics, $topicType); + $topics = $this->osidTopicHelper->filterTopicsByType($allTopics, $topicType); foreach ($topics as $topic) { - $topicParams['topic'] = $this->_helper->osidId->toString($topic->getId()); - echo "\n\t\t\t'; + $topicParams['topic'] = $this->osidIdMap->toString($topic->getId()); + echo "\n\t\t\t'; echo $this->view->escape($topic->getDisplayName()); echo ' '; } @@ -685,7 +718,7 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse } echo ' - + '; exit; } @@ -705,4 +738,35 @@ public function DateTime_getTimestamp($dt) return gmmktime($hour, $minute, $second, $month, $day, $year); } + + /** + * Load topics into our view. + * + * @param osid_course_TopicList + * + * @return void + * + * @since 4/28/09 + */ + protected function getTopics(\osid_course_TopicList $topicList) + { + $data = []; + $topics = $this->osidTopicHelper->topicListAsArray($topicList); + + $data['subjectTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); + + $data['departmentTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); + + $data['divisionTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division')); + + $data['requirementTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); + + $data['levelTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); + + $data['blockTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); + + $data['instructionMethodTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); + + return $data; + } } diff --git a/templates/courses/view.html.twig b/templates/courses/view.html.twig new file mode 100755 index 00000000..3b9241db --- /dev/null +++ b/templates/courses/view.html.twig @@ -0,0 +1,78 @@ +print $this->render('schedules/bookmark_control.phtml'); + +
{{ course.displayname }}
+

{{ course.title }}

+{% if course.description %} +
{{ course.description|raw }}
+{% endif %} +
+
Subject:
+
+ {% for topic in subjectTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ +
Department:
+
+ {% for topic in departmentTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ +
Division:
+
+ {% for topic in divisionTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ +
Requirements Fulfilled:
+
+ {% for topic in requirementTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ +{% if blockTopics is not empty %} +
Additional Details:
+
+ {% for topic in blockTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+{% endif %} + +{% if levelTopics is not empty %} +
Levels:
+
+ {% for topic in levelTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+{% endif %} + +{% if alternates is not empty %} +
Equivalent Courses:
+
+ {% for alternate in alternates %} + {{ alternate.displayname }} + {{ alternate.is_primary ? ' * ' }} +
+ {% endfor %} +
+{% endif %} + +
+ +{{ include( + 'partials/offerings.html.twig', + { + offerings: offerings, + term: term, + offeringsForAllTermsUrl: url('view_course', {course: osidIdToString(course.id)}), + hideOfferingInstructors: FALSE, + selectedOffering: NULL + }, + with_context = false +)}} diff --git a/templates/partials/offerings.html.twig b/templates/partials/offerings.html.twig new file mode 100755 index 00000000..60e62e6d --- /dev/null +++ b/templates/partials/offerings.html.twig @@ -0,0 +1,26 @@ +
+{% if term %} +

Sections in {{ term.displayname }}

+
show sections in all terms
+{% else %} +

Sections

+{% endif %} + +{% set currentTerm = null %} +{% for offering in offerings %} + {% if currentTerm is null or currentTerm.id != offering.termid %} + {% set currentTerm = offering.term %} +

{{ currentTerm.displayname }}

+ {% endif %} + {% if selectedOffering and selectedOffering.id == offering.id %} +
+ {% else %} +
+ {% endif %} + {{offering.displayname}} + {{ offering.genustype.displayname }} + {% if offering.instructors %} + ({{ offering.instructors|join(', ') }}) + {% endif %} +
+{% endfor %} From d1c741531bddb6d48cf13627145f5a5a54bcc289 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 8 Oct 2024 16:25:22 -0400 Subject: [PATCH 028/173] #47: Add single-course XML view. --- .../views/scripts/courses/viewxml.phtml | 93 ------------------- application/views/scripts/offeringsxml.phtml | 64 ------------- src/Controller/Courses.php | 42 +++++---- templates/courses/list.xml.twig | 15 +++ templates/partials/course.xml.twig | 39 ++++++++ templates/partials/offering_list.xml.twig | 29 ++++++ templates/partials/offerings.html.twig | 4 +- 7 files changed, 111 insertions(+), 175 deletions(-) delete mode 100755 application/views/scripts/courses/viewxml.phtml delete mode 100755 application/views/scripts/offeringsxml.phtml create mode 100755 templates/courses/list.xml.twig create mode 100644 templates/partials/course.xml.twig create mode 100755 templates/partials/offering_list.xml.twig diff --git a/application/views/scripts/courses/viewxml.phtml b/application/views/scripts/courses/viewxml.phtml deleted file mode 100755 index d49df5f5..00000000 --- a/application/views/scripts/courses/viewxml.phtml +++ /dev/null @@ -1,93 +0,0 @@ - - - - '.$this->escape($this->title).' - '.$this->pathAsAbsoluteUrl($this->url()).' - - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss -'; - -$courseIdString = $this->getStringFromOsidId($this->course->getId()); -$catalogIdString = $this->getStringFromOsidId($this->menuCatalogSelectedId); -print "\n\t\t"; - -print "\n\t\t\t".$this->escape($this->course->getTitle()).""; - - -$viewUrl = $this->pathAsAbsoluteUrl($this->url(array('controller' => 'courses', 'action' => 'view', 'catalog' => $catalogIdString, 'course' => $courseIdString))); -print "\n\t\t\t".$viewUrl.""; -print "\n\t\t\t".$viewUrl.""; - -print "\n\t\t\tcourse->getDescription(); -print "]]>"; - -$topicParams = array( - 'controller' => 'topics', - 'action' => 'view', - 'catalog' => $catalogIdString, -); -foreach ($this->subjectTopics as $topic) { - $topicIdString = $this->getStringFromOsidId($topic->getId()); - $topicTypeString = $this->getStringFromOsidType($topic->getGenusType()); - $topicParams['topic'] = $topicIdString; - print "\n\t\t\tpathAsAbsoluteUrl($this->url($topicParams))."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -foreach ($this->departmentTopics as $topic) { - $topicIdString = $this->getStringFromOsidId($topic->getId()); - $topicTypeString = $this->getStringFromOsidType($topic->getGenusType()); - $topicParams['topic'] = $topicIdString; - print "\n\t\t\tpathAsAbsoluteUrl($this->url($topicParams))."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -foreach ($this->requirementTopics as $topic) { - $topicIdString = $this->getStringFromOsidId($topic->getId()); - $topicTypeString = $this->getStringFromOsidType($topic->getGenusType()); - $topicParams['topic'] = $topicIdString; - print "\n\t\t\tpathAsAbsoluteUrl($this->url($topicParams))."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} - -if (isset($this->alternates)) { - $alternateType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); - while ($this->alternates->hasNext()) { - try { - $alternate = $this->alternates->getNextCourse(); - $alternateIdString = $this->getStringFromOsidId($alternate->getId()); - $altParams['course'] = $alternateIdString; - print "\n\t\t\thasRecordType($alternateType)) { - $alternateRecord = $alternate->getCourseRecord($alternateType); - if ($alternateRecord->isPrimary()) { - print ' is_primary="true"'; - } else { - print ' is_primary="false"'; - } - } - print '>'; - print $this->escape($alternate->getDisplayName()); - print ""; - } catch(osid_NotFoundException $e) { - } - } -} - -print $this->render('offeringsxml.phtml'); - -print "\n\t\t"; - - -?> - - - diff --git a/application/views/scripts/offeringsxml.phtml b/application/views/scripts/offeringsxml.phtml deleted file mode 100755 index d8dced08..00000000 --- a/application/views/scripts/offeringsxml.phtml +++ /dev/null @@ -1,64 +0,0 @@ -"; -$offeringParams = array( - 'controller' => 'offerings', - 'action' => 'view', - 'course' => null, - 'topic' => null, - 'resource' => null - ); -while ($this->offerings->hasNext()) { - $offering = $this->offerings->getNextCourseOffering(); - $offeringIdString =$this->getStringFromOsidId($offering->getId()); - if (!isset($currentTerm) || $currentTerm->getId() != $offering->getTermId()) { - if (isset($currentTerm)) - print "\n\t\t\t\t"; - - $currentTerm = $offering->getTerm(); - print "\n\t\t\t\tgetStringFromOsidId($currentTerm->getId())."\" name=\"".$this->escape($currentTerm->getDisplayName())."\">"; - } - - $offeringParams['offering'] = $offeringIdString; - - print "\n\t\t\t\t\t"; - print "\n\t\t\t\t\t\t".$this->escape($offering->getDisplayName()).""; - print "\n\t\t\t\t\t\t".$this->escape($offering->getTitle()).""; - print "\n\t\t\t\t\t\tgetDescription()."]]>"; - $type = $offering->getGenusType(); - print "\n\t\t\t\t\t\tgetStringFromOsidType($type)."\">".$this->escape($type->getDisplayName()).""; - $term = $offering->getTerm(); - print "\n\t\t\t\t\t\tgetStringFromOsidId($term->getId())."\">".$this->escape($term->getDisplayName()).""; - print "\n\t\t\t\t\t\tgetStringFromOsidId($offering->getLocationId())."\">".$this->escape($offering->getLocationInfo()).""; - print "\n\t\t\t\t\t\t".$this->escape($offering->getScheduleInfo()).""; - - if (!isset($this->hideOfferingInstructors) || !$this->hideOfferingInstructors) { - if ($offering->hasRecordType($instructorsType)) { - $instructorsRecord = $offering->getCourseOfferingRecord($instructorsType); - $instructors = $instructorsRecord->getInstructors(); - if ($instructors->hasNext()) { - $instNames = array(); - while ($instructors->hasNext()) { - $instructor = $instructors->getNextResource(); - print "\n\t\t\t\t\t\tgetStringFromOsidId($instructor->getId())."\">"; - if ($instructor->hasRecordType($namesType)) { - $namesRecord = $instructor->getResourceRecord($namesType); - print "\n\t\t\t\t\t\t\t".$this->escape($namesRecord->getGivenName()).""; print "\n\t\t\t\t\t\t\t".$this->escape($namesRecord->getSurname()).""; - } - print "\n\t\t\t\t\t\t\t".$this->escape($instructor->getDisplayName()).""; - - print "\n\t\t\t\t\t\t"; - } - } - } - } - print "\n\t\t\t\t\t"; -} -print "\n\t\t\t\t"; -print "\n\t\t\t"; diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 1df9fe86..04713179 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -13,6 +13,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; /** * A controller for working with courses. @@ -113,6 +114,20 @@ public function view($course, $term = NULL) } + #[Route('/courses/viewxml/{course}/{term}', name: 'view_course_xml')] + public function viewxml($course, $term = NULL) + { + $data = []; + $data['courses'] = [$this->getCourseDataByIdString($course, $term)]; + + $data['title'] = $data['courses'][0]['course']->getDisplayName(); + $data['feedLink'] = $this->generateUrl('view_course', ['course' => $course], UrlGeneratorInterface::ABSOLUTE_URL); + + $response = new Response($this->renderView('courses/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; + } + protected function getCourseDataByIdString($idString, $termIdString = NULL) { $id = $this->osidIdMap->fromString($idString); @@ -182,16 +197,24 @@ protected function getCourseData(\osid_course_Course $course, \osid_course_Term| $instructorsRecord = $offering->getCourseOfferingRecord($this->instructorsType); $instructors = $instructorsRecord->getInstructors(); $offering->instructors = []; + $offering->instructorNames = []; if ($instructors->hasNext()) { - $instNames = array(); while ($instructors->hasNext()) { $instructor = $instructors->getNextResource(); + $instructorData = [ + 'resource' => $instructor, + 'givename' => NULL, + 'surname' => NULL, + ]; if ($instructor->hasRecordType($this->namesType)) { $namesRecord = $instructor->getResourceRecord($this->namesType); - $offering->instructors[] = $namesRecord->getSurname(); + $instructorData['givename'] = $namesRecord->getGivenName(); + $instructorData['surname'] = $namesRecord->getSurname(); + $offering->instructorNames[] = $namesRecord->getSurname(); } else { - $offering->instructors[] = $instructor->getDisplayName(); + $offering->instructorNames[] = $instructor->getDisplayName(); } + $offering->instructors[] = $instructorData; } } } @@ -202,19 +225,6 @@ protected function getCourseData(\osid_course_Course $course, \osid_course_Term| return $data; } - /** - * Get an XML view of a course. - * - * @return void - */ - public function viewxmlAction() - { - $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text.xml'); - - $this->viewAction(); - } - /** * Search for courses. * diff --git a/templates/courses/list.xml.twig b/templates/courses/list.xml.twig new file mode 100755 index 00000000..0a5b11da --- /dev/null +++ b/templates/courses/list.xml.twig @@ -0,0 +1,15 @@ + + + + {{ title }} + {{ feedLink }} + + {{ 'now' | date('r') }} + Course Catalog + http://blogs.law.harvard.edu/tech/rss +{% for course_data in courses %} +{{ include('partials/course.xml.twig', course_data, with_context = FALSE) }} +{% endfor %} + + + diff --git a/templates/partials/course.xml.twig b/templates/partials/course.xml.twig new file mode 100644 index 00000000..1987121d --- /dev/null +++ b/templates/partials/course.xml.twig @@ -0,0 +1,39 @@ + + {{ course.displayname }} + {{ url('view_course', {'course': osidIdToString(course.id)}) }} + + {{ course.title }} + {{ osidIdToString(course.id) }} +{%~ if is_primary is not null %} + {{ is_primary ? 'true':'false' }} +{% endif ~%} +{%- if alternates is not empty %} +{%- for alternate in alternates %} + {{ alternate.displayname }} +{% endfor ~%} +{% endif %} + {{ course.genustype.displayname }} +{% for topic in subjectTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in departmentTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in divisionTopics %} + {{ topic.displayname }} +{% endfor %} +{%- for topic in requirementTopics %} + {{ topic.displayname }} +{% endfor %} +{%- if blockTopics is not empty %} +{%- for topic in blockTopics %} + {{ topic.displayname }} +{% endfor %} +{% endif %} +{%- if levelTopics is not empty %} +{%- for topic in levelTopics %} + {{ topic.displayname }} +{% endfor ~%} +{% endif %} +{{ include('partials/offering_list.xml.twig', {offerings: offerings}, with_context = false) }} + diff --git a/templates/partials/offering_list.xml.twig b/templates/partials/offering_list.xml.twig new file mode 100755 index 00000000..3feaeb8f --- /dev/null +++ b/templates/partials/offering_list.xml.twig @@ -0,0 +1,29 @@ + +{% set currentTerm = null %} +{% for offering in offerings %} +{% if currentTerm is null or currentTerm.id != offering.termid %} +{% if currentTerm is not null %} + +{% endif %} +{% set currentTerm = offering.term %} + +{% endif %} + + {{ offering.displayname }} + {{ offering.title }} + + {{ offering.genustype.displayname }} + {{ offering.term.displayname }} + {{ offering.locationInfo }} + {{ offering.scheduleinfo }} +{% for instructor in offering.instructors %} + + {{ instructor.givename }} + {{ instructor.surname }} + {{ instructor.resource.displayname }} + +{% endfor %} + +{% endfor %} + + diff --git a/templates/partials/offerings.html.twig b/templates/partials/offerings.html.twig index 60e62e6d..638bfb0a 100755 --- a/templates/partials/offerings.html.twig +++ b/templates/partials/offerings.html.twig @@ -19,8 +19,8 @@ {% endif %} {{offering.displayname}} {{ offering.genustype.displayname }} - {% if offering.instructors %} - ({{ offering.instructors|join(', ') }}) + {% if offering.instructorNames %} + ({{ offering.instructorNames|join(', ') }}) {% endif %}
{% endfor %} From c4da8cf9d2ce9f9de99d2e6171b5a326b97208ff Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 9 Oct 2024 15:30:42 -0400 Subject: [PATCH 029/173] #47: Add course list action. --- application/views/scripts/courses/list.phtml | 10 ------ src/Controller/Courses.php | 34 ++++++++++---------- templates/courses/list.html.twig | 4 +++ 3 files changed, 21 insertions(+), 27 deletions(-) delete mode 100755 application/views/scripts/courses/list.phtml create mode 100755 templates/courses/list.html.twig diff --git a/application/views/scripts/courses/list.phtml b/application/views/scripts/courses/list.phtml deleted file mode 100755 index d333a5dd..00000000 --- a/application/views/scripts/courses/list.phtml +++ /dev/null @@ -1,10 +0,0 @@ - 'view' - ); - -while ($this->courses->hasNext()) { - $course = $this->courses->getNextCourse(); - $params['course'] = $this->getStringFromOsidId($course->getId()); - print "\n\t

".$course->getDisplayName()."

"; - print "\n\t
".$course->getDescription()."
"; -} diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 04713179..3d9a06c0 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -66,31 +66,31 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $ $this->namesType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:person_names'); } - /** - * Print out a list of all courses. - * - * @return void - * - * @since 4/21/09 - */ - public function listAction() + #[Route('/courses/list/{catalog}', name: 'list_courses')] + public function listAction($catalog = NULL) { - if ($this->_getParam('catalog')) { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $data = [ + 'courses' => [], + ]; + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); - $this->view->title = 'Courses in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['title'] = 'Courses in '.$lookupSession->getCourseCatalog()->getDisplayName(); } else { $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); - $this->view->title = 'Courses in All Catalogs'; + $data['title'] = 'Courses in All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); - $this->view->courses = $lookupSession->getCourses(); - - $this->setSelectedCatalogId($lookupSession->getCourseCatalogId()); - $this->view->headTitle($this->view->title); + $courses = $lookupSession->getCourses(); + while ($courses->hasNext()) { + $data['courses'][] = $courses->getNextCourse(); + } + // $this->setSelectedCatalogId($lookupSession->getCourseCatalogId()); + // $this->view->headTitle($this->view->title); + // $this->view->menuIsCourses = true; - $this->view->menuIsCourses = true; + return $this->render('courses/list.html.twig', $data); } #[Route('/courses/view/{course}/{term}', name: 'view_course')] diff --git a/templates/courses/list.html.twig b/templates/courses/list.html.twig new file mode 100755 index 00000000..f56ddca3 --- /dev/null +++ b/templates/courses/list.html.twig @@ -0,0 +1,4 @@ +{% for course in courses %} +

{{ course.displayname }} - {{ course.title }}

+
{{ course.description | raw }}
+{% endfor %} From bfc3eb21c6bbc70ea6616e0d75aa0e36e4944ddd Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 9 Oct 2024 17:07:57 -0400 Subject: [PATCH 030/173] #47: Migrate courses by id XML action. --- src/Controller/Courses.php | 127 ++++++++++++------ .../Helper/RecentCourses/All.php | 26 ++-- .../Helper/RecentCourses/Department.php | 18 ++- .../Helper/RecentCourses/Instructor.php | 53 ++++---- .../RecentCourses/RecentCoursesAbstract.php | 72 ++++------ .../RecentCourses/RecentCoursesInterface.php | 18 ++- templates/partials/course.xml.twig | 5 + templates/partials/offering_list.xml.twig | 2 + 8 files changed, 181 insertions(+), 140 deletions(-) rename {application/library => src}/Helper/RecentCourses/All.php (63%) rename {application/library => src}/Helper/RecentCourses/Department.php (79%) rename {application/library => src}/Helper/RecentCourses/Instructor.php (74%) rename application/library/Helper/RecentCourses/Abstract.php => src/Helper/RecentCourses/RecentCoursesAbstract.php (81%) rename application/library/Helper/RecentCourses/Interface.php => src/Helper/RecentCourses/RecentCoursesInterface.php (64%) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 3d9a06c0..6e1d8da7 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -6,11 +6,14 @@ namespace App\Controller; +use App\Helper\RecentCourses\Department as DepartmentRecentCourses; +use App\Helper\RecentCourses\RecentCoursesInterface; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; use App\Service\Osid\TermHelper; use App\Service\Osid\TopicHelper; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -118,7 +121,9 @@ public function view($course, $term = NULL) public function viewxml($course, $term = NULL) { $data = []; - $data['courses'] = [$this->getCourseDataByIdString($course, $term)]; + $courseData = $this->getCourseDataByIdString($course, $term); + $courseData['offerings'] = $this->getCourseOfferingsData($courseData['course'], $courseData['term']); + $data['courses'] = [$courseData]; $data['title'] = $data['courses'][0]['course']->getDisplayName(); $data['feedLink'] = $this->generateUrl('view_course', ['course' => $course], UrlGeneratorInterface::ABSOLUTE_URL); @@ -148,7 +153,11 @@ protected function getCourseDataByIdString($idString, $termIdString = NULL) } protected function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + $data = []; $data['course'] = $course; + // Optional add-on data that can be populated by other methods. + $data['offerings'] = []; + $data['terms'] = []; // Load the topics into our view $data = array_merge($data, $this->getTopics($course->getTopics())); @@ -178,8 +187,11 @@ protected function getCourseData(\osid_course_Course $course, \osid_course_Term| // Term $data['term'] = $term; - // offerings. - $data['offerings'] = []; + return $data; + } + + protected function getCourseOfferingsData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + $data = []; $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $offeringLookupSession->useFederatedCourseCatalogView(); if ($term) { @@ -219,7 +231,7 @@ protected function getCourseData(\osid_course_Course $course, \osid_course_Term| } } - $data['offerings'][] = $offering; + $data[] = $offering; } return $data; @@ -407,75 +419,86 @@ public function topicxmlAction() $topicLookup->useFederatedCourseCatalogView(); $topic = $topicLookup->getTopic($topicId); - $recentCourses = new Helper_RecentCourses_Department($courses); - if ($this->_getParam('cutoff')) { - $recentCourses->setRecentInterval(new DateInterval($this->_getParam('cutoff'))); + $recentCourses = new DepartmentRecentCourses($this->osidIdMap, $courses); + if ($request->get('cutoff')) { + $recentCourses->setRecentInterval(new \DateInterval($request->get('cutoff'))); } $this->outputCourseFeed($recentCourses, htmlentities('Courses in '.$topic->getDisplayName()), $searchUrl); } - /** - * Search for courses. - * - * @return void - * - * @since 6/15/09 - */ - public function byidxmlAction() + #[Route('/courses/byidxml/{catalog}', name: 'list_courses_by_ids')] + public function byidxmlAction(Request $request, $catalog) { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - if (!$this->_getParam('catalog')) { + if (!$catalog) { header('HTTP/1.1 400 Bad Request'); echo 'A catalog must be specified.'; exit; } try { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - } catch (osid_InvalidArgumentException $e) { + } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; exit; - } catch (osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { header('HTTP/1.1 404 Not Found'); echo 'The catalog id specified was not found.'; exit; } - - if (!$this->_getParam('id')) { + $ids = $request->get('id', []); + if (!$ids) { header('HTTP/1.1 400 Bad Request'); echo "'id[]' must be specified."; exit; } $courseIds = []; - if (is_array($this->_getParam('id'))) { - foreach ($this->_getParam('id') as $idString) { + if (is_array($ids)) { + foreach ($ids as $idString) { $courseIds[] = $this->osidIdMap->fromString($idString); } } else { - $courseIds[] = $this->osidIdMap->fromString($this->_getParam('id')); + $courseIds[] = $this->osidIdMap->fromString($ids); } - // Use Comparative view to include any found courses, ignoring missing ids. $lookupSession->useComparativeCourseView(); - $courses = $lookupSession->getCoursesByIds(new phpkit_id_ArrayIdList($courseIds)); + $courses = $lookupSession->getCoursesByIds(new \phpkit_id_ArrayIdList($courseIds)); - $recentCourses = new Helper_RecentCourses_Department($courses); - if ($this->_getParam('cutoff')) { - $recentCourses->setRecentInterval(new DateInterval($this->_getParam('cutoff'))); + $recentCourses = new DepartmentRecentCourses($this->osidIdMap, $courses); + if ($request->get('cutoff')) { + $recentCourses->setRecentInterval(new \DateInterval($request->get('cutoff'))); + } + + // Set the next and previous terms. + $currentTermId = $this->osidTermHelper->getCurrentTermId($this->termLookupSession->getCourseCatalogId()); + $currentTerm = $this->termLookupSession->getTerm($currentTermId); + + $data = [ + 'courses' => [], + ]; + foreach ($recentCourses->getPrimaryCourses() as $course) { + $courseData = $this->getCourseData($course); + $courseData['terms'] = $this->getRecentTermData($currentTerm, $recentCourses, $course); + $courseData['offerings'] = []; + $data['courses'][] = $courseData; } + $data['title'] = 'Courses by Id'; + $data['feedLink'] = $this->generateUrl( + 'list_courses_by_ids', + [ + 'catalog' => $catalog, + 'id' => $request->get('id'), + 'cutoff' => $request->get('cutoff'), + ], + UrlGeneratorInterface::ABSOLUTE_URL + ); - $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('byidxml', 'courses', null, [ - 'catalog' => $this->_getParam('catalog'), - 'id' => $this->_getParam('id'), - 'cuttoff' => $this->_getParam('cutoff'), - ])); - $this->outputCourseFeed($recentCourses, 'Courses by Id', $searchUrl); + $response = new Response($this->renderView('courses/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } /** @@ -733,10 +756,36 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse exit; } + protected function getRecentTermData(\osid_course_Term $currentTerm, RecentCoursesInterface $recentCourses, \osid_course_Course $course) { + $now = $this->DateTime_getTimestamp(new \DateTime()); + $currentTermId = $currentTerm->getId(); + $currentEndTime = $this->DateTime_getTimestamp($currentTerm->getEndTime()); + $recentTerms = $recentCourses->getTermsForCourse($course); + $data = []; + if (count($recentTerms)) { + foreach ($recentTerms as $term) { + if ($term->getId()->isEqual($currentTermId)) { + $type = 'current'; + } elseif ($currentEndTime < $this->DateTime_getTimestamp($term->getEndTime())) { + $type = 'future'; + } elseif ($now > $this->DateTime_getTimestamp($term->getStartTime()) && $now < $this->DateTime_getTimestamp($term->getEndTime())) { + $type = 'current'; + } else { + $type = 'past'; + } + $data[] = [ + 'term' => $term, + 'type' => $type, + ]; + } + } + return $data; + } + public function DateTime_getTimestamp($dt) { $dtz_original = $dt->getTimezone(); - $dtz_utc = new DateTimeZone('UTC'); + $dtz_utc = new \DateTimeZone('UTC'); $dt->setTimezone($dtz_utc); $year = (int) $dt->format('Y'); $month = (int) $dt->format('n'); diff --git a/application/library/Helper/RecentCourses/All.php b/src/Helper/RecentCourses/All.php similarity index 63% rename from application/library/Helper/RecentCourses/All.php rename to src/Helper/RecentCourses/All.php index 39b34542..5f3a04dd 100755 --- a/application/library/Helper/RecentCourses/All.php +++ b/src/Helper/RecentCourses/All.php @@ -1,20 +1,20 @@ termsCache = []; - parent::__construct($courses); + parent::__construct($osidIdMap, $courses); } /** @@ -38,12 +38,12 @@ public function __construct(osid_course_CourseList $courses) * * @since 11/16/09 */ - protected function fetchCourseTerms(osid_course_Course $course) + protected function fetchCourseTerms(\osid_course_Course $course) { - $cacheKey = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($course->getId()); + $cacheKey = $this->osidIdMap->toString($course->getId()); if (!isset($this->termsCache[$cacheKey])) { - $termsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); + $termsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); $allTerms = []; if ($course->hasRecordType($termsType)) { $termsRecord = $course->getCourseRecord($termsType); @@ -52,7 +52,7 @@ protected function fetchCourseTerms(osid_course_Course $course) while ($terms->hasNext()) { $allTerms[] = $terms->getNextTerm(); } - } catch (osid_OperationFailedException $e) { + } catch (\osid_OperationFailedException $e) { } } $this->termsCache[$cacheKey] = $allTerms; diff --git a/application/library/Helper/RecentCourses/Department.php b/src/Helper/RecentCourses/Department.php similarity index 79% rename from application/library/Helper/RecentCourses/Department.php rename to src/Helper/RecentCourses/Department.php index 35a94971..3f7aaafa 100755 --- a/application/library/Helper/RecentCourses/Department.php +++ b/src/Helper/RecentCourses/Department.php @@ -1,20 +1,18 @@ hasNext()) { $course = $courses->getNextCourse(); - $courseIdString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($course->getId()); + $courseIdString = $this->osidIdMap->toString($course->getId()); $groupId = $courseIdString; @@ -50,7 +48,7 @@ protected function groupAlternates(osid_course_CourseList $courses) $term = $this->getMostRecentTermForCourse($course); $dates[] = $this->DateTime_getTimestamp($term->getEndTime()); $names[] = $course->getDisplayName(); - } catch (osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { unset($group[$key]); } } diff --git a/application/library/Helper/RecentCourses/Instructor.php b/src/Helper/RecentCourses/Instructor.php similarity index 74% rename from application/library/Helper/RecentCourses/Instructor.php rename to src/Helper/RecentCourses/Instructor.php index f6639a91..62ddebe8 100755 --- a/application/library/Helper/RecentCourses/Instructor.php +++ b/src/Helper/RecentCourses/Instructor.php @@ -1,21 +1,23 @@ recentInterval = new DateInterval('P4Y'); - $this->alternatesType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); + $this->osidIdMap = $osidIdMap; + $this->recentInterval = new \DateInterval('P4Y'); + $this->alternatesType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->groupCourseOfferings($offerings); $this->courseLookupSession = $courseLookupSession; } @@ -39,7 +42,7 @@ public function __construct(osid_course_CourseOfferingSearchResults $offerings, * * @return null */ - public function setRecentInterval(DateInterval $interval) + public function setRecentInterval(\DateInterval $interval) { $this->recentInterval = $interval; } @@ -64,11 +67,11 @@ public function getPrimaryCourses() * * @return array */ - public function getAlternatesForCourse(osid_course_Course $course) + public function getAlternatesForCourse(\osid_course_Course $course) { - $idString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($course->getId()); + $idString = $this->osidIdMap->toString($course->getId()); if (!isset($this->groups[$idString])) { - throw new osid_NotFoundException('The course specified is not one of our primary courses.'); + throw new \osid_NotFoundException('The course specified is not one of our primary courses.'); } if (!isset($this->groups[$idString]['alternate_courses'])) { $this->groups[$idString]['alternate_courses'] = []; @@ -85,11 +88,11 @@ public function getAlternatesForCourse(osid_course_Course $course) * * @return array */ - public function getTermsForCourse(osid_course_Course $course) + public function getTermsForCourse(\osid_course_Course $course) { - $idString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($course->getId()); + $idString = $this->osidIdMap->toString($course->getId()); if (!isset($this->groups[$idString])) { - throw new osid_NotFoundException('The course specified is not one of our primary courses.'); + throw new \osid_NotFoundException('The course specified is not one of our primary courses.'); } ksort($this->groups[$idString]['terms']); @@ -105,14 +108,14 @@ public function getTermsForCourse(osid_course_Course $course) * * @return null */ - protected function groupCourseOfferings(osid_course_CourseOfferingSearchResults $offerings) + protected function groupCourseOfferings(\osid_course_CourseOfferingSearchResults $offerings) { while ($offerings->hasNext()) { $offering = $offerings->getNextCourseOffering(); if ($this->termIsRecent($offering->getTerm())) { $courseId = $offering->getCourseId(); - $courseIdString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($courseId); - $termIdString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($offering->getTermId()); + $courseIdString = $this->osidIdMap->toString($courseId); + $termIdString = $this->osidIdMap->toString($offering->getTermId()); $groupAlternateCourseIds = []; $groupTerms = [$termIdString => $offering->getTerm()]; @@ -126,7 +129,7 @@ protected function groupCourseOfferings(osid_course_CourseOfferingSearchResults while ($alternates->hasNext()) { $alternate = $alternates->getNextCourseOffering(); $alternateCourseId = $alternate->getCourseId(); - $alternateCourseIdString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($alternateCourseId); + $alternateCourseIdString = $this->osidIdMap->toString($alternateCourseId); $groupAlternateCourseIds[$alternateCourseIdString] = $alternateCourseId; // Reset the group key if the primary alternate is later in the search results. if ($alternate->hasRecordType($this->alternatesType)) { @@ -139,7 +142,7 @@ protected function groupCourseOfferings(osid_course_CourseOfferingSearchResults } } - $groupKey = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($groupPrimaryCourseId); + $groupKey = $this->osidIdMap->toString($groupPrimaryCourseId); // Add our group to our result list. if (!isset($this->groups[$groupKey])) { $this->groups[$groupKey] = [ @@ -159,11 +162,11 @@ protected function groupCourseOfferings(osid_course_CourseOfferingSearchResults * * @return bool */ - protected function termIsRecent(osid_course_Term $term) + protected function termIsRecent(\osid_course_Term $term) { // Define a cutoff date after which courses will be included in the feed. // Default is 4 years. - $now = new DateTime(); + $now = new \DateTime(); $cutOff = $this->DateTime_getTimestamp($now->sub($this->recentInterval)); $termEnd = $this->DateTime_getTimestamp($term->getEndTime()); @@ -173,7 +176,7 @@ protected function termIsRecent(osid_course_Term $term) public function DateTime_getTimestamp($dt) { $dtz_original = $dt->getTimezone(); - $dtz_utc = new DateTimeZone('UTC'); + $dtz_utc = new \DateTimeZone('UTC'); $dt->setTimezone($dtz_utc); $year = (int) $dt->format('Y'); $month = (int) $dt->format('n'); diff --git a/application/library/Helper/RecentCourses/Abstract.php b/src/Helper/RecentCourses/RecentCoursesAbstract.php similarity index 81% rename from application/library/Helper/RecentCourses/Abstract.php rename to src/Helper/RecentCourses/RecentCoursesAbstract.php index 59ba4372..e8116438 100755 --- a/application/library/Helper/RecentCourses/Abstract.php +++ b/src/Helper/RecentCourses/RecentCoursesAbstract.php @@ -1,21 +1,23 @@ alternateType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); + $this->osidIdMap = $osidIdMap; + $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->groups = []; $this->terms = []; - $this->recentInterval = new DateInterval('P4Y'); + $this->recentInterval = new \DateInterval('P4Y'); $this->courses = $courses; } @@ -47,7 +47,7 @@ public function __construct(osid_course_CourseList $courses) * * @since 9/19/14 */ - public function setRecentInterval(DateInterval $interval) + public function setRecentInterval(\DateInterval $interval) { $this->recentInterval = $interval; } @@ -56,8 +56,6 @@ public function setRecentInterval(DateInterval $interval) * Answer an array of primary courses. * * @return array - * - * @since 11/16/09 */ public function getPrimaryCourses() { @@ -79,10 +77,8 @@ public function getPrimaryCourses() * Answer an array of alternate courses for a primary course. * * @return array - * - * @since 11/16/09 */ - public function getAlternatesForCourse(osid_course_Course $course) + public function getAlternatesForCourse(\osid_course_Course $course) { $this->initialize(); @@ -99,17 +95,15 @@ public function getAlternatesForCourse(osid_course_Course $course) return $alternates; } } - throw new osid_NotFoundException('No primary matches the id given.'); + throw new \osid_NotFoundException('No primary matches the id given.'); } /** * Answer an array of terms from primary or alternate courses given a primary id. * * @return array - * - * @since 11/16/09 */ - public function getTermsForCourse(osid_course_Course $course) + public function getTermsForCourse(\osid_course_Course $course) { $this->initialize(); @@ -124,10 +118,8 @@ public function getTermsForCourse(osid_course_Course $course) * Answer the terms for a course. These may be all terms or terms taught. * * @return array - * - * @since 11/16/09 */ - abstract protected function fetchCourseTerms(osid_course_Course $course); + abstract protected function fetchCourseTerms(\osid_course_Course $course); /********************************************************* * Internal methods @@ -156,13 +148,13 @@ protected function initialize() * * @since 11/13/09 */ - protected function groupAlternates(osid_course_CourseList $courses) + protected function groupAlternates(\osid_course_CourseList $courses) { while ($courses->hasNext()) { $groupId = false; $course = $courses->getNextCourse(); - $courseIdString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($course->getId()); + $courseIdString = $this->osidIdMap->toString($course->getId()); // print "\n

Grouping $courseIdString

\n"; // print "\n

Current Groups:

\n"; @@ -223,16 +215,14 @@ protected function groupAlternates(osid_course_CourseList $courses) } /** - * return the id of a group that matches or false. - * - * @since 11/13/09 + * Return the id of a group that matches or false. */ - private function findGroupIdMatchingAlternates(osid_id_IdList $altIds) + private function findGroupIdMatchingAlternates(\osid_id_IdList $altIds) { // print "\n

Alternates:

\n"; while ($altIds->hasNext()) { $altId = $altIds->getNextId(); - $altIdString = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId')->toString($altId); + $altIdString = $this->osidIdMap->toString($altId); // var_dump($altIdString); foreach ($this->groups as $groupId => $group) { @@ -253,10 +243,8 @@ private function findGroupIdMatchingAlternates(osid_id_IdList $altIds) * @param optional $includeAlternates * * @return array - * - * @since 11/16/09 */ - private function getRecentTermsForCourse(osid_course_Course $course, $includeAlternates = false) + private function getRecentTermsForCourse(\osid_course_Course $course, $includeAlternates = false) { $recentTerms = $this->filterRecentTerms($this->fetchCourseTerms($course)); @@ -282,15 +270,13 @@ private function getRecentTermsForCourse(osid_course_Course $course, $includeAlt * Answer the most recent term for a course. * * @return osid_course_Term - * - * @since 11/16/09 */ - protected function getMostRecentTermForCourse(osid_course_Course $course) + protected function getMostRecentTermForCourse(\osid_course_Course $course) { $terms = $this->getRecentTermsForCourse($course); if (!count($terms)) { - throw new osid_NotFoundException('No terms available.'); + throw new \osid_NotFoundException('No terms available.'); } foreach ($terms as $term) { @@ -318,10 +304,10 @@ private function filterRecentTerms(array $allTerms) { // Define a cutoff date after which courses will be included in the feed. // Currently set to 4 years. Would be good to have as a configurable time. - $now = new DateTime(); + $now = new \DateTime(); $cutOff = $this->DateTime_getTimestamp($now->sub($this->recentInterval)); $recentTerms = []; - $osidIdHelper = Zend_Controller_Action_HelperBroker::getStaticHelper('OsidId'); + $osidIdHelper = $this->osidIdMap; foreach ($allTerms as $term) { if ($this->DateTime_getTimestamp($term->getEndTime()) > $cutOff) { $termIdString = $osidIdHelper->toString($term->getId()); @@ -335,7 +321,7 @@ private function filterRecentTerms(array $allTerms) public function DateTime_getTimestamp($dt) { $dtz_original = $dt->getTimezone(); - $dtz_utc = new DateTimeZone('UTC'); + $dtz_utc = new \DateTimeZone('UTC'); $dt->setTimezone($dtz_utc); $year = (int) $dt->format('Y'); $month = (int) $dt->format('n'); diff --git a/application/library/Helper/RecentCourses/Interface.php b/src/Helper/RecentCourses/RecentCoursesInterface.php similarity index 64% rename from application/library/Helper/RecentCourses/Interface.php rename to src/Helper/RecentCourses/RecentCoursesInterface.php index c03a36e8..0adb330b 100644 --- a/application/library/Helper/RecentCourses/Interface.php +++ b/src/Helper/RecentCourses/RecentCoursesInterface.php @@ -1,27 +1,25 @@ {{ alternate.displayname }} {% endfor ~%} +{% endif %} +{%- if terms is not empty %} +{%- for termData in terms %} + {{ termData.term.displayname }} +{% endfor ~%} {% endif %} {{ course.genustype.displayname }} {% for topic in subjectTopics %} diff --git a/templates/partials/offering_list.xml.twig b/templates/partials/offering_list.xml.twig index 3feaeb8f..c560bbd9 100755 --- a/templates/partials/offering_list.xml.twig +++ b/templates/partials/offering_list.xml.twig @@ -1,3 +1,4 @@ +{% if offerings is not empty %} {% set currentTerm = null %} {% for offering in offerings %} @@ -27,3 +28,4 @@ {% endfor %} +{% endif %} From 7d03296d310add31c9cbdfc8b09f1637cf840271 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 11:21:57 -0400 Subject: [PATCH 031/173] #47: Update courses by id XML action to match values currently in output. --- templates/partials/course.xml.twig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/templates/partials/course.xml.twig b/templates/partials/course.xml.twig index 0c4270b9..1c1f95c8 100644 --- a/templates/partials/course.xml.twig +++ b/templates/partials/course.xml.twig @@ -1,9 +1,11 @@ - {{ course.displayname }} + {{ course.displayname }} - {{ course.title }} {{ url('view_course', {'course': osidIdToString(course.id)}) }} + {{ url('view_course', {'course': osidIdToString(course.id)}) }} - {{ course.title }} {{ osidIdToString(course.id) }} + {{ course.displayname }} + {{ course.title }} {%~ if is_primary is not null %} {{ is_primary ? 'true':'false' }} {% endif ~%} @@ -17,7 +19,6 @@ {{ termData.term.displayname }} {% endfor ~%} {% endif %} - {{ course.genustype.displayname }} {% for topic in subjectTopics %} {{ topic.displayname }} {% endfor %} From f987c566b2f8d5e82cac48a79790dd84e6c2426f Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 11:59:58 -0400 Subject: [PATCH 032/173] #47: Port courses by topic xml action. --- src/Controller/Courses.php | 81 ++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 6e1d8da7..94e3a8a3 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -339,55 +339,44 @@ public function searchxmlAction() exit; } - /** - * Search for courses. - * - * @return void - * - * @since 6/15/09 - */ - public function topicxmlAction() + #[Route('/courses/topicxml/{catalog}', name: 'list_courses_by_topic')] + public function topicxmlAction(Request $request, $catalog) { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - if (!$this->_getParam('catalog')) { + if (!$catalog) { header('HTTP/1.1 400 Bad Request'); echo 'A catalog must be specified.'; exit; } try { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $catalogId = $this->osidIdMap->fromString($catalog); $searchSession = $this->osidRuntime->getCourseManager()->getCourseSearchSessionForCatalog($catalogId); $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - } catch (osid_InvalidArgumentException $e) { + } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; exit; - } catch (osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { header('HTTP/1.1 404 Not Found'); echo 'The catalog id specified was not found.'; exit; } - if (!$this->_getParam('topic')) { + if (!$request->get('topic')) { header('HTTP/1.1 400 Bad Request'); echo 'A topic must be specified.'; exit; } $topicsIds = []; - if (is_array($this->_getParam('topic'))) { - foreach ($this->_getParam('topic') as $idString) { + if (is_array($request->get('topic'))) { + foreach ($request->get('topic') as $idString) { $topicIds[] = $this->osidIdMap->fromString($idString); } } else { - $topicIds[] = $this->osidIdMap->fromString($this->_getParam('topic')); + $topicIds[] = $this->osidIdMap->fromString($request->get('topic')); } - $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('search', 'offerings', null, [])); - // Fetch courses $query = $searchSession->getCourseQuery(); @@ -398,12 +387,12 @@ public function topicxmlAction() // Limit by location $locationIds = []; - if (is_array($this->_getParam('location'))) { - foreach ($this->_getParam('location') as $idString) { + if (is_array($request->get('location'))) { + foreach ($request->get('location') as $idString) { $locationIds[] = $this->osidIdMap->fromString($idString); } - } elseif ($this->_getParam('location')) { - $locationIds[] = $this->osidIdMap->fromString($this->_getParam('location')); + } elseif ($request->get('location')) { + $locationIds[] = $this->osidIdMap->fromString($request->get('location')); } $locationRecord = $query->getCourseQueryRecord(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:location')); foreach ($locationIds as $locationId) { @@ -415,15 +404,47 @@ public function topicxmlAction() $courses = $searchSession->getCoursesByQuery($query)->getCourses(); - $topicLookup = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $topicLookup->useFederatedCourseCatalogView(); - $topic = $topicLookup->getTopic($topicId); - $recentCourses = new DepartmentRecentCourses($this->osidIdMap, $courses); if ($request->get('cutoff')) { $recentCourses->setRecentInterval(new \DateInterval($request->get('cutoff'))); } - $this->outputCourseFeed($recentCourses, htmlentities('Courses in '.$topic->getDisplayName()), $searchUrl); + + // Set the next and previous terms. + $currentTermId = $this->osidTermHelper->getCurrentTermId($this->termLookupSession->getCourseCatalogId()); + $currentTerm = $this->termLookupSession->getTerm($currentTermId); + + $data = [ + 'courses' => [], + ]; + foreach ($recentCourses->getPrimaryCourses() as $course) { + $courseData = $this->getCourseData($course); + $courseData['terms'] = $this->getRecentTermData($currentTerm, $recentCourses, $course); + $courseData['offerings'] = []; + $data['courses'][] = $courseData; + } + + $topicLookup = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); + $topicLookup->useFederatedCourseCatalogView(); + $topicNames = []; + foreach ($topicIds as $topicId) { + $topic = $topicLookup->getTopic($topicId); + $topicNames[] = $topic->getDisplayName(); + } + $data['title'] = 'Courses in ' . implode(', ', $topicNames); + $data['feedLink'] = $this->generateUrl( + 'list_courses_by_topic', + [ + 'catalog' => $catalog, + 'topic' => $request->get('topic'), + 'cutoff' => $request->get('cutoff'), + 'location' => $request->get('location'), + ], + UrlGeneratorInterface::ABSOLUTE_URL + ); + + $response = new Response($this->renderView('courses/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/courses/byidxml/{catalog}', name: 'list_courses_by_ids')] From 3b53795ceb14e3f1abda64f1596a3f750ca99f5c Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 12:05:43 -0400 Subject: [PATCH 033/173] #47: Ensure that unknown topics don't fully crash the courses-by-topic feed --- .../library/banner/course/Topic/Lookup/Session.php | 2 +- src/Controller/Courses.php | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/application/library/banner/course/Topic/Lookup/Session.php b/application/library/banner/course/Topic/Lookup/Session.php index 07e79b77..bc9a5763 100755 --- a/application/library/banner/course/Topic/Lookup/Session.php +++ b/application/library/banner/course/Topic/Lookup/Session.php @@ -395,7 +395,7 @@ private function getDepartmentTopic(osid_id_Id $topicId) $row = self::$getDepartmentTopic_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getDepartmentTopic_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVDEPT_CODE']) { + if (empty($row) || !$row['STVDEPT_CODE']) { throw new osid_NotFoundException('Could not find a topic matching the department code '.$this->getDatabaseIdString($topicId, 'topic.department.').'.'); } diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 94e3a8a3..d2702fd3 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -427,8 +427,13 @@ public function topicxmlAction(Request $request, $catalog) $topicLookup->useFederatedCourseCatalogView(); $topicNames = []; foreach ($topicIds as $topicId) { - $topic = $topicLookup->getTopic($topicId); - $topicNames[] = $topic->getDisplayName(); + try { + $topic = $topicLookup->getTopic($topicId); + $topicNames[] = $topic->getDisplayName(); + } + catch (\osid_NotFoundException $e) { + $topicNames[] = $this->osidIdMap->toString($topicId); + } } $data['title'] = 'Courses in ' . implode(', ', $topicNames); $data['feedLink'] = $this->generateUrl( From 9ac780cbddbeaf813a558912a154fbafdea26159 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 15:16:05 -0400 Subject: [PATCH 034/173] #47: Port the courses/instructorxml endpoint. --- src/Controller/Courses.php | 139 +++++++++++++++++++++-------- templates/partials/course.xml.twig | 8 +- 2 files changed, 109 insertions(+), 38 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index d2702fd3..99d8ea65 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -7,6 +7,7 @@ namespace App\Controller; use App\Helper\RecentCourses\Department as DepartmentRecentCourses; +use App\Helper\RecentCourses\Instructor as InstructorRecentCourses; use App\Helper\RecentCourses\RecentCoursesInterface; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; @@ -123,6 +124,7 @@ public function viewxml($course, $term = NULL) $data = []; $courseData = $this->getCourseDataByIdString($course, $term); $courseData['offerings'] = $this->getCourseOfferingsData($courseData['course'], $courseData['term']); + $courseData['alternates'] = $this->getAllAlternates($courseData['course']); $data['courses'] = [$courseData]; $data['title'] = $data['courses'][0]['course']->getDisplayName(); @@ -155,20 +157,39 @@ protected function getCourseDataByIdString($idString, $termIdString = NULL) protected function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { $data = []; $data['course'] = $course; + $data['term'] = $term; // Optional add-on data that can be populated by other methods. + $data['is_primary'] = TRUE; + $data['alternates'] = NULL; $data['offerings'] = []; $data['terms'] = []; + $data['include_alternates_in_title'] = TRUE; // Load the topics into our view $data = array_merge($data, $this->getTopics($course->getTopics())); - - // Alternates + // Alternate status. $data['is_primary'] = TRUE; - $data['alternates'] = NULL; if ($course->hasRecordType($this->alternateType)) { $record = $course->getCourseRecord($this->alternateType); $data['is_primary'] = $record->isPrimary(); + } + return $data; + } + + /** + * Answer a list of all alternates for a course. + * + * @param \osid_course_Course $course + * The course to get alternates for. + * + * @return osid_course_Course[] + * The courses, annotated with additional is_primary values. + */ + protected function getAllAlternates(\osid_course_Course $course) { + $data = NULL; + if ($course->hasRecordType($this->alternateType)) { + $record = $course->getCourseRecord($this->alternateType); + $data = []; if ($record->hasAlternates()) { - $data['alternates'] = []; $alternates = $record->getAlternates(); while ($alternates->hasNext()) { $alternate = $alternates->getNextCourse(); @@ -179,14 +200,36 @@ protected function getCourseData(\osid_course_Course $course, \osid_course_Term| $alternate->is_primary = TRUE; } } - $data['alternates'][] = $alternate; + $data[] = $alternate; } } } + return $data; + } - // Term - $data['term'] = $term; - + /** + * Answer a list of alternates for a course filtered to recent ones. + * + * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses + * The helper used to filter to recent courses. + * @param \osid_course_Course $course + * The course to get alternates for. + * + * @return osid_course_Course[] + * The courses, annotated with additional is_primary values. + */ + protected function getRecentAlternates(RecentCoursesInterface $recentCourses, $course) { + $data = NULL; + foreach ($recentCourses->getAlternatesForCourse($course) as $alternate) { + $alternate->is_primary = FALSE; + if ($alternate->hasRecordType($this->alternateType)) { + $alternateRecord = $alternate->getCourseRecord($this->alternateType); + if ($alternateRecord->isPrimary()) { + $alternate->is_primary = TRUE; + } + } + $data[] = $alternate; + } return $data; } @@ -249,13 +292,13 @@ public function searchxmlAction() $this->_helper->layout->disableLayout(); $this->_helper->viewRenderer->setNoRender(); - if (!$this->_getParam('catalog')) { + if (!$catalog) { header('HTTP/1.1 400 Bad Request'); echo 'A catalog must be specified.'; exit; } try { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $catalogId = $this->osidIdMap->fromString($catalog); $searchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); } catch (osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); @@ -267,8 +310,8 @@ public function searchxmlAction() exit; } - $keywords = trim($this->_getParam('keywords')); - $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('search', 'offerings', null, ['catalog' => $this->_getParam('catalog'), 'keywords' => $keywords, 'submit' => 'Search'])); + $keywords = trim($request->get('keywords')); + $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('search', 'offerings', null, ['catalog' => $catalog, 'keywords' => $keywords, 'submit' => 'Search'])); header('Content-Type: text/xml'); echo ' @@ -317,11 +360,11 @@ public function searchxmlAction() echo ''; echo "\n\t\t\t"; - echo $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'courses', null, ['catalog' => $this->_getParam('catalog'), 'course' => $courseIdString])); + echo $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'courses', null, ['catalog' => $catalog, 'course' => $courseIdString])); echo ''; echo "\n\t\t\t"; - echo $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'courses', null, ['catalog' => $this->_getParam('catalog'), 'course' => $courseIdString])); + echo $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'courses', null, ['catalog' => $catalog, 'course' => $courseIdString])); echo ''; echo "\n\t\t\tgetPrimaryCourses() as $course) { $courseData = $this->getCourseData($course); $courseData['terms'] = $this->getRecentTermData($currentTerm, $recentCourses, $course); + $courseData['alternates'] = $this->getRecentAlternates($recentCourses, $course); $courseData['offerings'] = []; $data['courses'][] = $courseData; } @@ -508,6 +552,7 @@ public function byidxmlAction(Request $request, $catalog) foreach ($recentCourses->getPrimaryCourses() as $course) { $courseData = $this->getCourseData($course); $courseData['terms'] = $this->getRecentTermData($currentTerm, $recentCourses, $course); + $courseData['alternates'] = $this->getRecentAlternates($recentCourses, $course); $courseData['offerings'] = []; $data['courses'][] = $courseData; } @@ -537,24 +582,19 @@ public function byidxmlAction(Request $request, $catalog) * b. Take the section plus its cross-listed sections, get their course * entries and merge them into a single result. * - * @return void - * - * @since 6/15/09 */ - public function instructorxmlAction() + #[Route('/courses/instructorxml/{instructor}/{catalog}', name: 'list_courses_by_instructor')] + public function instructorxmlAction(Request $request, $instructor, $catalog = NULL) { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - - if (!$this->_getParam('catalog')) { + if (!$catalog) { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringSearchSession->useFederatedCourseCatalogView(); $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $courseLookupSession->useFederatedCourseCatalogView(); // Allow term current/past to be limited to a certain catalog while courses are fetched from many - if ($this->_getParam('term_catalog')) { - $catalogId = $this->osidIdMap->fromString($this->_getParam('term_catalog')); + if ($request->get('term_catalog')) { + $catalogId = $this->osidIdMap->fromString($request->get('term_catalog')); $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } // fall back to terms from any catalog. @@ -564,36 +604,34 @@ public function instructorxmlAction() } } else { try { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $catalogId = $this->osidIdMap->fromString($catalog); $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - } catch (osid_InvalidArgumentException $e) { + } catch (\osid_InvalidArgumentException $e) { throw new osid_InvalidArgumentException('The catalog id specified was not of the correct format.'); - } catch (osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { throw new osid_NotFoundException('The catalog id specified was not found.'); exit; } } - $instructor = trim($this->_getParam('instructor')); + $instructor = trim($instructor); if (!$instructor || !strlen($instructor)) { // Make sure that this error response is cacheable. $this->setCacheControlHeaders(); $this->getResponse()->sendHeaders(); - throw new InvalidArgumentException('An instructor must be specified.'); + throw new \InvalidArgumentException('An instructor must be specified.'); } $instructorId = $this->osidIdMap->fromString('resource.person.'.$instructor); - $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'resources', null, ['catalog' => $this->_getParam('catalog'), 'resource' => 'resouce.person.'.$instructor])); - $resourceLookup = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); try { $instructorResource = $resourceLookup->getResource($instructorId); - } catch (osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { // Make sure that this error response is cacheable. $this->setCacheControlHeaders(); $this->getResponse()->sendHeaders(); @@ -614,11 +652,40 @@ public function instructorxmlAction() $courseOfferings = $offeringSearchSession->getCourseOfferingsBySearch($query, $search); - $recentCourses = new Helper_RecentCourses_Instructor($courseOfferings, $courseLookupSession); - if ($this->_getParam('cutoff')) { - $recentCourses->setRecentInterval(new DateInterval($this->_getParam('cutoff'))); + $recentCourses = new InstructorRecentCourses($this->osidIdMap, $courseOfferings, $courseLookupSession); + if ($request->get('cutoff')) { + $recentCourses->setRecentInterval(new DateInterval($request->get('cutoff'))); } - $this->outputCourseFeed($recentCourses, 'Courses taught by '.$instructorResource->getDisplayName(), $searchUrl); + + // Set the next and previous terms. + $currentTermId = $this->osidTermHelper->getCurrentTermId($this->termLookupSession->getCourseCatalogId()); + $currentTerm = $this->termLookupSession->getTerm($currentTermId); + + $data = [ + 'courses' => [], + ]; + foreach ($recentCourses->getPrimaryCourses() as $course) { + $courseData = $this->getCourseData($course); + $courseData['include_alternates_in_title'] = TRUE; + $courseData['terms'] = $this->getRecentTermData($currentTerm, $recentCourses, $course); + $courseData['alternates'] = $this->getRecentAlternates($recentCourses, $course); + $courseData['offerings'] = []; + $data['courses'][] = $courseData; + } + $data['title'] = 'Courses taught by '.$instructorResource->getDisplayName(); + $data['feedLink'] = $this->generateUrl( + 'list_courses_by_instructor', + [ + 'instructor' => $instructor, + 'catalog' => $catalog, + 'term_catalog' => $request->get('term_catalog'), + ], + UrlGeneratorInterface::ABSOLUTE_URL + ); + + $response = new Response($this->renderView('courses/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } /** diff --git a/templates/partials/course.xml.twig b/templates/partials/course.xml.twig index 1c1f95c8..3677efd5 100644 --- a/templates/partials/course.xml.twig +++ b/templates/partials/course.xml.twig @@ -1,5 +1,5 @@ - {{ course.displayname }} - {{ course.title }} + {{ course.displayname }}{% if include_alternates_in_title and alternates is not empty %}{% for alternate in alternates %} / {{ alternate.displayname }}{% endfor %}{% endif %} - {{ course.title }} {{ url('view_course', {'course': osidIdToString(course.id)}) }} {{ url('view_course', {'course': osidIdToString(course.id)}) }} @@ -11,7 +11,11 @@ {% endif ~%} {%- if alternates is not empty %} {%- for alternate in alternates %} - {{ alternate.displayname }} + + {{ osidIdToString(alternate.id) }} + {{ alternate.displayname }} + {{ alternate.title }} + {% endfor ~%} {% endif %} {%- if terms is not empty %} From 72146b26587a40a6fc3afbd45bceddf99160c17f Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 15:16:24 -0400 Subject: [PATCH 035/173] #47: Improve method documentation. --- src/Controller/Courses.php | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 99d8ea65..b2117463 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -135,6 +135,18 @@ public function viewxml($course, $term = NULL) return $response; } + /** + * Answer an array of course data suitable for templating. + * + * @param string $idString + * The course id string. + * @param string $termIdString + * A reference term's id string if one is being used for filtering + * offerings. + * + * @return array + * An array of data about the course. + */ protected function getCourseDataByIdString($idString, $termIdString = NULL) { $id = $this->osidIdMap->fromString($idString); @@ -154,6 +166,17 @@ protected function getCourseDataByIdString($idString, $termIdString = NULL) return $this->getCourseData($lookupSession->getCourse($id), $term); } + /** + * Answer an array of course data suitable for templating. + * + * @param \osid_course_Course $course + * The course. + * @param \osid_course_Term $term + * A reference term if one is being used for filtering offerings. + * + * @return array + * An array of data about the course. + */ protected function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { $data = []; $data['course'] = $course; @@ -233,6 +256,17 @@ protected function getRecentAlternates(RecentCoursesInterface $recentCourses, $c return $data; } + /** + * Answer an array of course offering data suitable for templating. + * + * @param \osid_course_Course $course + * The course offerings are associated with. + * @param \osid_course_Term $term + * A reference term if one is being used for filtering offerings. + * + * @return array + * An array of course offering data. + */ protected function getCourseOfferingsData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { $data = []; $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); @@ -849,6 +883,20 @@ protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourse exit; } + /** + * Answer an array of data that includes the term and past/current/future. + * + * @param \osid_course_Term $currentTerm + * The current term to compare against. + * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses + * The helper used to filter to recent courses. + * @param \osid_course_Course $course + * The course to get alternates for. + * + * @return array + * An array of term data. Sub-keys are 'term' (the Term object) and + * 'type' (current/future/past). + */ protected function getRecentTermData(\osid_course_Term $currentTerm, RecentCoursesInterface $recentCourses, \osid_course_Course $course) { $now = $this->DateTime_getTimestamp(new \DateTime()); $currentTermId = $currentTerm->getId(); From 4d1e7b93f50a9fcae3fff4490af0825f2c3e9ee1 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 15:50:05 -0400 Subject: [PATCH 036/173] #47: Port the course/searchxml endpoint. --- src/Controller/Courses.php | 75 +++++++++++--------------------------- 1 file changed, 21 insertions(+), 54 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index b2117463..85c8e485 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -314,18 +314,9 @@ protected function getCourseOfferingsData(\osid_course_Course $course, \osid_cou return $data; } - /** - * Search for courses. - * - * @return void - * - * @since 6/15/09 - */ - public function searchxmlAction() + #[Route('/courses/searchxml/{catalog}', name: 'search_courses_xml')] + public function searchxmlAction(Request $request, $catalog) { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(); - if (!$catalog) { header('HTTP/1.1 400 Bad Request'); echo 'A catalog must be specified.'; @@ -334,31 +325,18 @@ public function searchxmlAction() try { $catalogId = $this->osidIdMap->fromString($catalog); $searchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); - } catch (osid_InvalidArgumentException $e) { + } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; exit; - } catch (osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { header('HTTP/1.1 404 Not Found'); echo 'The catalog id specified was not found.'; exit; } $keywords = trim($request->get('keywords')); - $searchUrl = $this->_helper->pathAsAbsoluteUrl($this->_helper->url('search', 'offerings', null, ['catalog' => $catalog, 'keywords' => $keywords, 'submit' => 'Search'])); - - header('Content-Type: text/xml'); - echo ' - - - Course Search: "'.htmlspecialchars($keywords).'" - '.$searchUrl.' - - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss -'; $courses = []; // Fetch courses if (strlen($keywords)) { @@ -378,42 +356,31 @@ public function searchxmlAction() if (!isset($courses[$courseIdString])) { try { $courses[$courseIdString] = $offering->getCourse(); - } catch (osid_OperationFailedException $e) { - // print "\nFailure on ".$offering->getDisplayName()."OfferingId:\n".print_r($offering->getId(), true)."\n\nCourseId:\n".print_r($offering->getCourseId(), true)."]]>"; + } catch (\osid_OperationFailedException $e) { } } } } - // Print out courses as items. + $data = [ + 'courses' => [], + ]; foreach ($courses as $courseIdString => $course) { - echo "\n\t\t"; - - echo "\n\t\t\t"; - echo htmlspecialchars($course->getDisplayName().' - '.$course->getTitle()); - echo ''; - - echo "\n\t\t\t"; - echo $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'courses', null, ['catalog' => $catalog, 'course' => $courseIdString])); - echo ''; - - echo "\n\t\t\t"; - echo $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'courses', null, ['catalog' => $catalog, 'course' => $courseIdString])); - echo ''; - - echo "\n\t\t\tgetDescription(); - echo ']]>'; - echo "\n\t\t\t".$courseIdString.''; - - echo "\n\t\t"; + $data['courses'][] = $this->getCourseData($course); } + $data['title'] = 'Course Search: "' . $keywords . '"'; + $data['feedLink'] = $this->generateUrl( + 'search_courses_xml', + [ + 'catalog' => $catalog, + 'keywords' => $request->get('keywords'), + ], + UrlGeneratorInterface::ABSOLUTE_URL + ); - echo ' - -'; - - exit; + $response = new Response($this->renderView('courses/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/courses/topicxml/{catalog}', name: 'list_courses_by_topic')] From 1a2c3900073a0e7b3d124d33fcb264b56d6e8809 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 15:50:56 -0400 Subject: [PATCH 037/173] #47: Ensure classes in the global namespace are referenced properly. --- src/Controller/Courses.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 85c8e485..816fa4b0 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -204,7 +204,7 @@ protected function getCourseData(\osid_course_Course $course, \osid_course_Term| * @param \osid_course_Course $course * The course to get alternates for. * - * @return osid_course_Course[] + * @return \osid_course_Course[] * The courses, annotated with additional is_primary values. */ protected function getAllAlternates(\osid_course_Course $course) { @@ -238,7 +238,7 @@ protected function getAllAlternates(\osid_course_Course $course) { * @param \osid_course_Course $course * The course to get alternates for. * - * @return osid_course_Course[] + * @return \osid_course_Course[] * The courses, annotated with additional is_primary values. */ protected function getRecentAlternates(RecentCoursesInterface $recentCourses, $course) { @@ -611,9 +611,9 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = NU $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } catch (\osid_InvalidArgumentException $e) { - throw new osid_InvalidArgumentException('The catalog id specified was not of the correct format.'); + throw new \osid_InvalidArgumentException('The catalog id specified was not of the correct format.'); } catch (\osid_NotFoundException $e) { - throw new osid_NotFoundException('The catalog id specified was not found.'); + throw new \osid_NotFoundException('The catalog id specified was not found.'); exit; } } @@ -909,7 +909,7 @@ public function DateTime_getTimestamp($dt) /** * Load topics into our view. * - * @param osid_course_TopicList + * @param \osid_course_TopicList * * @return void * From fe5769a4ffca1fd8172b77efd9f58fd7ae76fa88 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 15:56:30 -0400 Subject: [PATCH 038/173] #47: Reorganize methods to put routes together. Remove old XML printer. --- src/Controller/Courses.php | 473 ++++++++++++------------------------- 1 file changed, 156 insertions(+), 317 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 816fa4b0..1b629921 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -135,185 +135,6 @@ public function viewxml($course, $term = NULL) return $response; } - /** - * Answer an array of course data suitable for templating. - * - * @param string $idString - * The course id string. - * @param string $termIdString - * A reference term's id string if one is being used for filtering - * offerings. - * - * @return array - * An array of data about the course. - */ - protected function getCourseDataByIdString($idString, $termIdString = NULL) - { - $id = $this->osidIdMap->fromString($idString); - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - - if ($termIdString) { - $termId = $this->osidIdMap->fromString($termIdString); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - $term = $termLookupSession->getTerm($termId); - } - else { - $term = NULL; - } - - return $this->getCourseData($lookupSession->getCourse($id), $term); - } - - /** - * Answer an array of course data suitable for templating. - * - * @param \osid_course_Course $course - * The course. - * @param \osid_course_Term $term - * A reference term if one is being used for filtering offerings. - * - * @return array - * An array of data about the course. - */ - protected function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { - $data = []; - $data['course'] = $course; - $data['term'] = $term; - // Optional add-on data that can be populated by other methods. - $data['is_primary'] = TRUE; - $data['alternates'] = NULL; - $data['offerings'] = []; - $data['terms'] = []; - $data['include_alternates_in_title'] = TRUE; - // Load the topics into our view - $data = array_merge($data, $this->getTopics($course->getTopics())); - // Alternate status. - $data['is_primary'] = TRUE; - if ($course->hasRecordType($this->alternateType)) { - $record = $course->getCourseRecord($this->alternateType); - $data['is_primary'] = $record->isPrimary(); - } - return $data; - } - - /** - * Answer a list of all alternates for a course. - * - * @param \osid_course_Course $course - * The course to get alternates for. - * - * @return \osid_course_Course[] - * The courses, annotated with additional is_primary values. - */ - protected function getAllAlternates(\osid_course_Course $course) { - $data = NULL; - if ($course->hasRecordType($this->alternateType)) { - $record = $course->getCourseRecord($this->alternateType); - $data = []; - if ($record->hasAlternates()) { - $alternates = $record->getAlternates(); - while ($alternates->hasNext()) { - $alternate = $alternates->getNextCourse(); - $alternate->is_primary = FALSE; - if ($alternate->hasRecordType($this->alternateType)) { - $alternateRecord = $alternate->getCourseRecord($this->alternateType); - if ($alternateRecord->isPrimary()) { - $alternate->is_primary = TRUE; - } - } - $data[] = $alternate; - } - } - } - return $data; - } - - /** - * Answer a list of alternates for a course filtered to recent ones. - * - * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses - * The helper used to filter to recent courses. - * @param \osid_course_Course $course - * The course to get alternates for. - * - * @return \osid_course_Course[] - * The courses, annotated with additional is_primary values. - */ - protected function getRecentAlternates(RecentCoursesInterface $recentCourses, $course) { - $data = NULL; - foreach ($recentCourses->getAlternatesForCourse($course) as $alternate) { - $alternate->is_primary = FALSE; - if ($alternate->hasRecordType($this->alternateType)) { - $alternateRecord = $alternate->getCourseRecord($this->alternateType); - if ($alternateRecord->isPrimary()) { - $alternate->is_primary = TRUE; - } - } - $data[] = $alternate; - } - return $data; - } - - /** - * Answer an array of course offering data suitable for templating. - * - * @param \osid_course_Course $course - * The course offerings are associated with. - * @param \osid_course_Term $term - * A reference term if one is being used for filtering offerings. - * - * @return array - * An array of course offering data. - */ - protected function getCourseOfferingsData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { - $data = []; - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $offeringLookupSession->useFederatedCourseCatalogView(); - if ($term) { - $offerings = $offeringLookupSession->getCourseOfferingsByTermForCourse( - $term->getId(), - $course->getId(), - ); - } else { - $offerings = $offeringLookupSession->getCourseOfferingsForCourse($course->getId()); - } - while ($offerings->hasNext()) { - $offering = $offerings->getNextCourseOffering(); - - if ($offering->hasRecordType($this->instructorsType)) { - $instructorsRecord = $offering->getCourseOfferingRecord($this->instructorsType); - $instructors = $instructorsRecord->getInstructors(); - $offering->instructors = []; - $offering->instructorNames = []; - if ($instructors->hasNext()) { - while ($instructors->hasNext()) { - $instructor = $instructors->getNextResource(); - $instructorData = [ - 'resource' => $instructor, - 'givename' => NULL, - 'surname' => NULL, - ]; - if ($instructor->hasRecordType($this->namesType)) { - $namesRecord = $instructor->getResourceRecord($this->namesType); - $instructorData['givename'] = $namesRecord->getGivenName(); - $instructorData['surname'] = $namesRecord->getSurname(); - $offering->instructorNames[] = $namesRecord->getSurname(); - } else { - $offering->instructorNames[] = $instructor->getDisplayName(); - } - $offering->instructors[] = $instructorData; - } - } - } - - $data[] = $offering; - } - - return $data; - } - #[Route('/courses/searchxml/{catalog}', name: 'search_courses_xml')] public function searchxmlAction(Request $request, $catalog) { @@ -690,164 +511,182 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = NU } /** - * Output an RSS feed of courses from results. - * - * @param Helper_RecentCourses_Abstract $recentCourses - * @param string $title - * @param string $url + * Answer an array of course data suitable for templating. * - * @return void + * @param string $idString + * The course id string. + * @param string $termIdString + * A reference term's id string if one is being used for filtering + * offerings. * - * @since 10/19/09 + * @return array + * An array of data about the course. */ - protected function outputCourseFeed(Helper_RecentCourses_Interface $recentCourses, $title, $url) + protected function getCourseDataByIdString($idString, $termIdString = NULL) { - // Set our cache-control headers since we will be flushing content soon. - $this->setCacheControlHeaders(); - $this->getResponse()->sendHeaders(); - - $now = $this->DateTime_getTimestamp(new DateTime()); - - // Close the session before we send headers and content. - session_write_close(); - - header('Content-Type: text/xml'); - echo ' - - - '.htmlspecialchars($title).' - '.$url.' - - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss - -'; + $id = $this->osidIdMap->fromString($idString); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); + $lookupSession->useFederatedCourseCatalogView(); - while (ob_get_level()) { - ob_end_flush(); + if ($termIdString) { + $termId = $this->osidIdMap->fromString($termIdString); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $term = $termLookupSession->getTerm($termId); + } + else { + $term = NULL; } - flush(); - - // Set the next and previous terms - $currentTermId = $this->osidTermHelper->getCurrentTermId($this->termLookupSession->getCourseCatalogId()); - $currentTerm = $this->termLookupSession->getTerm($currentTermId); - $currentEndTime = $this->DateTime_getTimestamp($currentTerm->getEndTime()); - - // print "debug()); - // print "]]>"; - - $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); - $termsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:terms'); - - // foreach ($groups as $key => $group) { - // print "\n$key"; - // foreach ($group as $course) { - // print "\n\t".$this->osidIdMap->toString($course->getId()); - // } - // } - - foreach ($recentCourses->getPrimaryCourses() as $course) { - $courseIdString = $this->osidIdMap->toString($course->getId()); - echo "\n\t\t"; + return $this->getCourseData($lookupSession->getCourse($id), $term); + } - echo "\n\t\t\t"; - $alternates = $recentCourses->getAlternatesForCourse($course); - $name = $course->getDisplayName(); - foreach ($alternates as $alt) { - $name .= ' / '.$alt->getDisplayName(); - } - echo htmlspecialchars($name.' - '.$course->getTitle()); - echo ''; - - echo "\n\t\t\t"; - $catalog = $catalogSession->getCatalogIdsByCourse($course->getId()); - if ($catalog->hasNext()) { - $catalogIdString = $this->osidIdMap->toString($catalog->getNextId()); - } else { - $catalogIdString = null; - } - echo $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'courses', null, ['catalog' => $catalogIdString, 'course' => $courseIdString])); - echo ''; - - echo "\n\t\t\t"; - echo $this->_helper->pathAsAbsoluteUrl($this->_helper->url('view', 'courses', null, ['catalog' => $catalogIdString, 'course' => $courseIdString])); - echo ''; - - echo "\n\t\t\tgetDescription(); - echo ']]>'; - echo "\n\t\t\t".$courseIdString.''; - echo "\n\t\t\t".htmlspecialchars($course->getDisplayName()).''; - echo "\n\t\t\t".htmlspecialchars($course->getTitle()).''; - - foreach ($alternates as $alt) { - echo "\n\t\t\t"; - echo "\n\t\t\t\t".$this->osidIdMap->toString($alt->getId()).''; - echo "\n\t\t\t\t".htmlspecialchars($alt->getDisplayName()).''; - echo "\n\t\t\t\t".htmlspecialchars($alt->getTitle()).''; - echo "\n\t\t\t"; - } + /** + * Answer an array of course data suitable for templating. + * + * @param \osid_course_Course $course + * The course. + * @param \osid_course_Term $term + * A reference term if one is being used for filtering offerings. + * + * @return array + * An array of data about the course. + */ + protected function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + $data = []; + $data['course'] = $course; + $data['term'] = $term; + // Optional add-on data that can be populated by other methods. + $data['is_primary'] = TRUE; + $data['alternates'] = NULL; + $data['offerings'] = []; + $data['terms'] = []; + $data['include_alternates_in_title'] = TRUE; + // Load the topics into our view + $data = array_merge($data, $this->getTopics($course->getTopics())); + // Alternate status. + $data['is_primary'] = TRUE; + if ($course->hasRecordType($this->alternateType)) { + $record = $course->getCourseRecord($this->alternateType); + $data['is_primary'] = $record->isPrimary(); + } + return $data; + } - $recentTerms = $recentCourses->getTermsForCourse($course); - if (count($recentTerms)) { - $termStrings = []; - foreach ($recentTerms as $term) { - echo "\n\t\t\tosidIdMap->toString($term->getId()).'"'; - if ($term->getId()->isEqual($currentTermId)) { - echo ' type="current"'; - } elseif ($currentEndTime < $this->DateTime_getTimestamp($term->getEndTime())) { - echo ' type="future"'; - } elseif ($now > $this->DateTime_getTimestamp($term->getStartTime()) && $now < $this->DateTime_getTimestamp($term->getEndTime())) { - echo ' type="current"'; - } else { - echo ' type="past"'; + /** + * Answer a list of all alternates for a course. + * + * @param \osid_course_Course $course + * The course to get alternates for. + * + * @return \osid_course_Course[] + * The courses, annotated with additional is_primary values. + */ + protected function getAllAlternates(\osid_course_Course $course) { + $data = NULL; + if ($course->hasRecordType($this->alternateType)) { + $record = $course->getCourseRecord($this->alternateType); + $data = []; + if ($record->hasAlternates()) { + $alternates = $record->getAlternates(); + while ($alternates->hasNext()) { + $alternate = $alternates->getNextCourse(); + $alternate->is_primary = FALSE; + if ($alternate->hasRecordType($this->alternateType)) { + $alternateRecord = $alternate->getCourseRecord($this->alternateType); + if ($alternateRecord->isPrimary()) { + $alternate->is_primary = TRUE; + } } - echo '>'.$term->getDisplayName().''; + $data[] = $alternate; } } + } + return $data; + } - $allTopics = $this->osidTopicHelper->topicListAsArray($course->getTopics()); - $topicType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); - $topicTypeString = $this->_helper->osidType->toString($topicType); - $topics = $this->osidTopicHelper->filterTopicsByType($allTopics, $topicType); - foreach ($topics as $topic) { - $topicParams['topic'] = $this->osidIdMap->toString($topic->getId()); - echo "\n\t\t\t'; - echo $this->view->escape($topic->getDisplayName()); - echo ' '; + /** + * Answer a list of alternates for a course filtered to recent ones. + * + * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses + * The helper used to filter to recent courses. + * @param \osid_course_Course $course + * The course to get alternates for. + * + * @return \osid_course_Course[] + * The courses, annotated with additional is_primary values. + */ + protected function getRecentAlternates(RecentCoursesInterface $recentCourses, $course) { + $data = NULL; + foreach ($recentCourses->getAlternatesForCourse($course) as $alternate) { + $alternate->is_primary = FALSE; + if ($alternate->hasRecordType($this->alternateType)) { + $alternateRecord = $alternate->getCourseRecord($this->alternateType); + if ($alternateRecord->isPrimary()) { + $alternate->is_primary = TRUE; + } } + $data[] = $alternate; + } + return $data; + } - $topicType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'); - $topicTypeString = $this->_helper->osidType->toString($topicType); - $topics = $this->osidTopicHelper->filterTopicsByType($allTopics, $topicType); - foreach ($topics as $topic) { - $topicParams['topic'] = $this->osidIdMap->toString($topic->getId()); - echo "\n\t\t\t'; - echo $this->view->escape($topic->getDisplayName()); - echo ' '; - } + /** + * Answer an array of course offering data suitable for templating. + * + * @param \osid_course_Course $course + * The course offerings are associated with. + * @param \osid_course_Term $term + * A reference term if one is being used for filtering offerings. + * + * @return array + * An array of course offering data. + */ + protected function getCourseOfferingsData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + $data = []; + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $offeringLookupSession->useFederatedCourseCatalogView(); + if ($term) { + $offerings = $offeringLookupSession->getCourseOfferingsByTermForCourse( + $term->getId(), + $course->getId(), + ); + } else { + $offerings = $offeringLookupSession->getCourseOfferingsForCourse($course->getId()); + } + while ($offerings->hasNext()) { + $offering = $offerings->getNextCourseOffering(); - $topicType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'); - $topicTypeString = $this->_helper->osidType->toString($topicType); - $topics = $this->osidTopicHelper->filterTopicsByType($allTopics, $topicType); - foreach ($topics as $topic) { - $topicParams['topic'] = $this->osidIdMap->toString($topic->getId()); - echo "\n\t\t\t'; - echo $this->view->escape($topic->getDisplayName()); - echo ' '; + if ($offering->hasRecordType($this->instructorsType)) { + $instructorsRecord = $offering->getCourseOfferingRecord($this->instructorsType); + $instructors = $instructorsRecord->getInstructors(); + $offering->instructors = []; + $offering->instructorNames = []; + if ($instructors->hasNext()) { + while ($instructors->hasNext()) { + $instructor = $instructors->getNextResource(); + $instructorData = [ + 'resource' => $instructor, + 'givename' => NULL, + 'surname' => NULL, + ]; + if ($instructor->hasRecordType($this->namesType)) { + $namesRecord = $instructor->getResourceRecord($this->namesType); + $instructorData['givename'] = $namesRecord->getGivenName(); + $instructorData['surname'] = $namesRecord->getSurname(); + $offering->instructorNames[] = $namesRecord->getSurname(); + } else { + $offering->instructorNames[] = $instructor->getDisplayName(); + } + $offering->instructors[] = $instructorData; + } + } } - echo "\n\t\t"; - flush(); + $data[] = $offering; } - echo ' - -'; - exit; + return $data; } /** From 376a1f8033b33c5515e8d97950fa369728579c76 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 15:56:46 -0400 Subject: [PATCH 039/173] #47: Complete method documentation. --- src/Controller/Courses.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 1b629921..f4785a92 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -729,7 +729,16 @@ protected function getRecentTermData(\osid_course_Term $currentTerm, RecentCours return $data; } - public function DateTime_getTimestamp($dt) + /** + * Answer a timestamp in GMT give a DateTime. + * + * @param \DateTime $dt + * The DateTime to get a timestamp for. + * + * @return int + * The GMT timestamp. + */ + public function DateTime_getTimestamp(\DateTime $dt) { $dtz_original = $dt->getTimezone(); $dtz_utc = new \DateTimeZone('UTC'); From b86f16a65a5403708030675a7fc2248aab7cbe30 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 16:04:27 -0400 Subject: [PATCH 040/173] #47: Initialize all of the types used by offering search in the constructor --- src/Controller/Offerings.php | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 9e9b3a9d..893658aa 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -61,17 +61,7 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $ $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; $this->osidTopicHelper = $osidTopicHelper; - } - /** - * Initialize object. - * - * Called from {@link __construct()} as final step of object instantiation. - * - * @return void - */ - public function init() - { $this->wildcardStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); $this->booleanStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:boolean'); $this->instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); @@ -80,8 +70,6 @@ public function init() $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->weeklyScheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); - parent::init(); - $this->subjectType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); $this->departmentType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'); $this->divisionType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division'); @@ -747,8 +735,8 @@ protected function getOfferingData(\osid_course_CourseOffering $offering) { // Alternates. $data['is_primary'] = TRUE; $data['alternates'] = NULL; - if ($offering->hasRecordType($this->getAlternateType())) { - $record = $offering->getCourseOfferingRecord($this->getAlternateType()); + if ($offering->hasRecordType($this->alternateType)) { + $record = $offering->getCourseOfferingRecord($this->alternateType); $data['is_primary'] = $record->isPrimary(); if ($record->hasAlternates()) { $data['alternates'] = []; @@ -756,8 +744,8 @@ protected function getOfferingData(\osid_course_CourseOffering $offering) { while ($alternates->hasNext()) { $alternate = $alternates->getNextCourseOffering(); $alternate->is_primary = FALSE; - if ($alternate->hasRecordType($this->getAlternateType())) { - $alternateRecord = $alternate->getCourseOfferingRecord($this->getAlternateType()); + if ($alternate->hasRecordType($this->alternateType)) { + $alternateRecord = $alternate->getCourseOfferingRecord($this->alternateType); if ($alternateRecord->isPrimary()) { $alternate->is_primary = TRUE; } @@ -790,7 +778,4 @@ protected function getOfferingData(\osid_course_CourseOffering $offering) { return $data; } - protected function getAlternateType() { - return new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); - } } From b9e1adf8350deac9e7e4c8b814c952fb15ea0166 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 16:04:55 -0400 Subject: [PATCH 041/173] #47: Improve helper method documentation for Offerings controller. --- src/Controller/Offerings.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 893658aa..f2f50073 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -143,7 +143,7 @@ public function listAction() * * @since 10/21/09 */ - #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings')] + #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings_xml')] public function searchxml(string $catalog = NULL, $term = NULL) { $this->_helper->layout->disableLayout(); @@ -689,6 +689,15 @@ public function viewxmlAction($id) return $response; } + /** + * Answer an array of course offering data suitable for templating. + * + * @param string $idString + * The course offering id string. + * + * @return array + * An array of data about the course offering. + */ protected function getOfferingDataByIdString($idString) { $id = $this->osidIdMap->fromString($idString); @@ -697,6 +706,15 @@ protected function getOfferingDataByIdString($idString) return $this->getOfferingData($lookupSession->getCourseOffering($id)); } + /** + * Answer an array of course offering data suitable for templating. + * + * @param \osid_course_CourseOffering $offering + * The course. + * + * @return array + * An array of data about the course offering. + */ protected function getOfferingData(\osid_course_CourseOffering $offering) { $id = $offering->getId(); From d759801ffcc02021f213cf24185a8436ec997764 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 10 Oct 2024 17:26:24 -0400 Subject: [PATCH 042/173] #47: Port offering searchxml endpoint. --- .../Catalog/Action/Helper/OsidTypes.php | 36 -- config/services.yaml | 7 + src/Controller/Offerings.php | 396 ++++++++++-------- .../Osid/AbstractOsidIdentifierMap.php | 2 +- src/Service/Osid/TypeHelper.php | 47 +++ templates/offerings/search.xml.twig | 4 +- 6 files changed, 278 insertions(+), 214 deletions(-) delete mode 100755 application/resources/Catalog/Action/Helper/OsidTypes.php create mode 100755 src/Service/Osid/TypeHelper.php diff --git a/application/resources/Catalog/Action/Helper/OsidTypes.php b/application/resources/Catalog/Action/Helper/OsidTypes.php deleted file mode 100755 index 0abfce3a..00000000 --- a/application/resources/Catalog/Action/Helper/OsidTypes.php +++ /dev/null @@ -1,36 +0,0 @@ -config; - $typeStrings = $config->catalog->default_offering_genus_types_to_search; - if (!$typeStrings) { - return []; - } - - foreach ($typeStrings as $typeString) { - $types[] = new phpkit_type_URNInetType($typeString); - } - - return $types; - } -} diff --git a/config/services.yaml b/config/services.yaml index 7e46208b..e9d3d9a7 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -37,6 +37,13 @@ services: App\Service\Osid\TypeMap: arguments: $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' + App\Service\Osid\TypeHelper: + arguments: + $defaultOfferingGenusTypesToSearch: + - 'urn:inet:middlebury.edu:genera:offering.LCT' + - 'urn:inet:middlebury.edu:genera:offering.SEM' + - 'urn:inet:middlebury.edu:genera:offering.PRC' + - 'urn:inet:middlebury.edu:genera:offering.WKS' App\Twig\OsidIdExtension: tags: diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index f2f50073..a23ab209 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -10,7 +10,9 @@ use App\Service\Osid\Runtime; use App\Service\Osid\TermHelper; use App\Service\Osid\TopicHelper; +use App\Service\Osid\TypeHelper; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -44,6 +46,11 @@ class Offerings extends AbstractController */ private $osidTopicHelper; + /** + * @var \App\Service\Osid\TypeHelper + */ + private $osidTypeHelper; + /** * Construct a new Catalogs controller. * @@ -56,11 +63,12 @@ class Offerings extends AbstractController * @param \App\Service\Osid\TopicHelper $osidTopicHelper * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, TopicHelper $osidTopicHelper) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, TopicHelper $osidTopicHelper, TypeHelper $osidTypeHelper) { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; $this->osidTopicHelper = $osidTopicHelper; + $this->osidTypeHelper = $osidTypeHelper; $this->wildcardStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); $this->booleanStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:boolean'); @@ -92,45 +100,45 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $ */ public function listAction() { + $data = []; if ($catalog) { - $catalogId = $this->osidRuntimeId->fromString($catalog); + $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); - $this->view->title = $lookupSession->getCourseCatalog()->getDisplayName(); + $data['title'] = $lookupSession->getCourseCatalog()->getDisplayName(); } else { $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $this->view->title = 'All Catalogs'; + $data['title'] = 'All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); // Add our parameters to the search query if ($term) { if ('CURRENT' == $term) { - $termId = $this->osidRuntimeTerms->getNextOrLatestTermId(); + $termId = $this->osidTermHelper->getNextOrLatestTermId(); } else { - $termId = $this->osidRuntimeId->fromString($term); + $termId = $this->osidIdMap->fromString($term); } $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $this->view->term = $termLookupSession->getTerm($termId); + $data['term'] = $termLookupSession->getTerm($termId); - $this->view->offerings = $lookupSession->getCourseOfferingsByTerm($this->view->term->getId()); + $data['offerings'] = $lookupSession->getCourseOfferingsByTerm($data['term']->getId()); } else { - $this->view->offerings = $lookupSession->getCourseOfferings(); + $data['offerings'] = $lookupSession->getCourseOfferings(); } $this->setSelectedCatalogId($lookupSession->getCourseCatalogId()); - $this->view->headTitle($this->view->title); - $this->view->menuIsOfferings = true; + $data['menuIsOfferings'] = true; - $this->view->offeringsTitle = 'Sections'; + $data['offeringsTitle'] = 'Sections'; // Don't do the work to display instructors if we have a very large number of // offerings. - if ($this->view->offerings->available() > 200) { - $this->view->hideOfferingInstructors = true; + if ($data['offerings']->available() > 200) { + $data['hideOfferingInstructors'] = true; } $this->render('offerings', null, true); @@ -144,25 +152,28 @@ public function listAction() * @since 10/21/09 */ #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings_xml')] - public function searchxml(string $catalog = NULL, $term = NULL) + public function searchxml(Request $request, string $catalog = NULL, string $term = NULL) { - $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); - - $this->search($catalog, $term); - $this->view->sections = $this->searchSession->getCourseOfferingsByQuery($this->query); + [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog, $term); + // Actually run the query. + $offerings = $searchSession->getCourseOfferingsByQuery($query); + $data['offerings'] = []; + while ($offerings->hasNext()) { + $offering = $offerings->getNextCourseOffering(); + $data['offerings'][] = $this->getOfferingData($offering); + } // Set the next and previous terms - if (isset($this->view->term)) { - $terms = $this->termLookupSession->getTerms(); + if (isset($data['term'])) { + $terms = $termLookupSession->getTerms(); while ($terms->hasNext()) { $term = $terms->getNextTerm(); - if ($term->getId()->isEqual($this->view->term->getId())) { + if ($term->getId()->isEqual($data['term']->getId())) { if (isset($lastTerm)) { - $this->view->nextTerm = $lastTerm; + $data['nextTerm'] = $lastTerm; } if ($terms->hasNext()) { - $this->view->previousTerm = $terms->getNextTerm(); + $data['previousTerm'] = $terms->getNextTerm(); } break; } @@ -176,16 +187,63 @@ public function searchxml(string $catalog = NULL, $term = NULL) // has been closed or not. See: // // http://stackoverflow.com/questions/1608427/how-can-i-determine-if-a-pdo-statement-cursor-is-closed - $this->view->terms = $this->termLookupSession->getTerms(); + $data['terms'] = []; + $terms = $termLookupSession->getTerms(); + while ($terms->hasNext()) { + $term = $terms->getNextTerm(); + $data['terms'][] = $term; + } + + $data['title'] = 'Course Offering Results'; + $data['feedLink'] = $this->generateUrl( + 'search_courses_xml', + $data['searchParams'], + UrlGeneratorInterface::ABSOLUTE_URL + ); - $this->view->feedTitle = 'Course Offering Results'; - $this->view->feedLink = $this->_helper->pathAsAbsoluteUrl($this->view->url($this->view->searchParams)); - $this->postDispatch(); + $response = new Response($this->renderView('offerings/search.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/offerings/search/{catalog}/{term}', name: 'search_offerings')] - public function search(string $catalog = NULL, $term = NULL) + public function search(Request $request, string $catalog = NULL, string $term = NULL) + { + $data = $this->prepareSearch($request, $catalog, $term); + + // Run the query if submitted. + if ($request->get('search')) { + $data['searchParams']['search'] = $request->get('search'); + $data['paginator'] = new Zend_Paginator(new Paginator_Adaptor_CourseOfferingSearch($offeringSearchSession, $query)); + $data['paginator']->setCurrentPageNumber($request->get('page')); + } + + /********************************************************* + * Data for layouts rendering. + *********************************************************/ + $data['selectedCatalogId'] = $offeringSearchSession->getCourseCatalogId(); + $data['menuIsSearch'] = true; + + throw new \Exception('todo'); + } + + /** + * Run a search query and provide the data suitable for templating. + * + * @param \Symfony\Component\HttpFoundation\Request $request + * The request that contains the search parameters. + * @param string|NULL $catalog + * The catalog to search in or NULL for all catalogs. + * @param string|NULL $term + * The term to search in or NULL for all catalogs. + * + * @return array + * The parts of the search preparation in an array: data, searchSession, + * and query. + */ + protected function prepareSearch(Request $request, string $catalog = NULL, string $term = NULL) { + $data = []; if ($catalog) { $catalogId = $catalogId = $this->osidIdMap->fromString($catalog); $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); @@ -193,14 +251,14 @@ public function search(string $catalog = NULL, $term = NULL) $topicSearchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); - $this->view->title = 'Search in '.$offeringSearchSession->getCourseCatalog()->getDisplayName(); + $data['title'] = 'Search in '.$offeringSearchSession->getCourseCatalog()->getDisplayName(); } else { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $topicSearchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSession(); $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); - $this->view->title = 'Search in All Catalogs'; + $data['title'] = 'Search in All Catalogs'; } $termLookupSession->useFederatedCourseCatalogView(); $offeringSearchSession->useFederatedCourseCatalogView(); @@ -215,13 +273,13 @@ public function search(string $catalog = NULL, $term = NULL) } elseif (!$term || 'CURRENT' == $term) { // When accessing the "current" term via xml, use the term we are in. // When displaying the search interface, use the next upcoming term. - if ('searchxml' == $this->_getParam('action')) { - $termId = $this->osidRuntimeTerms->getCurrentTermId($offeringSearchSession->getCourseCatalogId()); + if ('searchxml' == $request->get('action')) { + $termId = $this->osidTermHelper->getCurrentTermId($offeringSearchSession->getCourseCatalogId()); } else { - $termId = $this->osidRuntimeTerms->getNextOrLatestTermId($offeringSearchSession->getCourseCatalogId()); + $termId = $this->osidTermHelper->getNextOrLatestTermId($offeringSearchSession->getCourseCatalogId()); } } else { - $termId = $this->osidRuntimeId->fromString($term); + $termId = $this->osidIdMap->fromString($term); } // Topics @@ -236,7 +294,7 @@ public function search(string $catalog = NULL, $term = NULL) $order->orderByDisplayName(); $search->orderTopicResults($order); $searchResults = $topicSearchSession->getTopicsBySearch($topicQuery, $search); - $this->view->departments = $searchResults->getTopics(); + $data['departments'] = $searchResults->getTopics(); $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->subjectType, true); @@ -249,7 +307,7 @@ public function search(string $catalog = NULL, $term = NULL) $order->orderByDisplayName(); $search->orderTopicResults($order); $searchResults = $topicSearchSession->getTopicsBySearch($topicQuery, $search); - $this->view->subjects = $searchResults->getTopics(); + $data['subjects'] = $searchResults->getTopics(); $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->divisionType, true); @@ -257,7 +315,7 @@ public function search(string $catalog = NULL, $term = NULL) $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $this->view->divisions = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['divisions'] = $topicSearchSession->getTopicsByQuery($topicQuery); $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->requirementType, true); @@ -265,7 +323,7 @@ public function search(string $catalog = NULL, $term = NULL) $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $this->view->requirements = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['requirements'] = $topicSearchSession->getTopicsByQuery($topicQuery); $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->levelType, true); @@ -273,7 +331,7 @@ public function search(string $catalog = NULL, $term = NULL) $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $this->view->levels = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['levels'] = $topicSearchSession->getTopicsByQuery($topicQuery); $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->blockType, true); @@ -281,7 +339,7 @@ public function search(string $catalog = NULL, $term = NULL) $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $this->view->blocks = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['blocks'] = $topicSearchSession->getTopicsByQuery($topicQuery); $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->instructionMethodType, true); @@ -289,14 +347,14 @@ public function search(string $catalog = NULL, $term = NULL) $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $this->view->instructionMethods = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['instructionMethods'] = $topicSearchSession->getTopicsByQuery($topicQuery); - $this->view->genusTypes = $offeringLookupSession->getCourseOfferingGenusTypes(); + $data['genusTypes'] = $offeringLookupSession->getCourseOfferingGenusTypes(); // Campuses -- only include if we have more than one. $campuses = $resourceLookupSession->getResourcesByGenusType($this->campusType); if ($campuses->hasNext() && $campuses->getNextResource() && $campuses->hasNext()) { - $this->view->campuses = $resourceLookupSession->getResourcesByGenusType($this->campusType); + $data['campuses'] = $resourceLookupSession->getResourcesByGenusType($this->campusType); } /********************************************************* @@ -305,215 +363,216 @@ public function search(string $catalog = NULL, $term = NULL) $query = $offeringSearchSession->getCourseOfferingQuery(); $search = $offeringSearchSession->getCourseOfferingSearch(); - $this->view->searchParams = []; + $data['searchParams'] = [ + 'catalog' => $catalog, + 'term' => $term, + ]; - // Make our session and query available to the XML version of this action. - $this->termLookupSession = $termLookupSession; - $this->view->terms = $termLookupSession->getTerms(); + $data['terms'] = $termLookupSession->getTerms(); // Add our parameters to the search query if ($term) { - $this->view->searchParams['term'] = $term; + $data['searchParams']['term'] = $term; if (isset($termId)) { $query->matchTermId($termId, true); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - $this->view->term = $termLookupSession->getTerm($termId); - $this->view->selectedTermId = $termId; + $federatedTermLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $federatedTermLookupSession->useFederatedCourseCatalogView(); + $data['term'] = $federatedTermLookupSession->getTerm($termId); + $data['selectedTermId'] = $termId; - $this->view->title .= ' '.$this->view->term->getDisplayName(); + $data['title'] .= ' '.$data['term']->getDisplayName(); } } - if ($this->_getParam('department')) { - if (is_array($this->_getParam('department'))) { - $departments = $this->_getParam('department'); + if ($request->get('department')) { + if (is_array($request->get('department'))) { + $departments = $request->get('department'); } else { - $departments = [$this->_getParam('department')]; + $departments = [$request->get('department')]; } if (count($departments)) { foreach ($departments as $idString) { - $id = $this->osidRuntimeId->fromString($idString); + $id = $this->osidIdMap->fromString($idString); $query->matchTopicId($id, true); // set the first as the selected one if multiple. - if (!isset($this->view->selectedDepartmentId)) { - $this->view->selectedDepartmentId = $id; + if (!isset($data['selectedDepartmentId'])) { + $data['selectedDepartmentId'] = $id; } } - $this->view->searchParams['department'] = $departments; + $data['searchParams']['department'] = $departments; } } - if ($this->_getParam('subject')) { - if (is_array($this->_getParam('subject'))) { - $subjects = $this->_getParam('subject'); + if ($request->get('subject')) { + if (is_array($request->get('subject'))) { + $subjects = $request->get('subject'); } else { - $subjects = [$this->_getParam('subject')]; + $subjects = [$request->get('subject')]; } if (count($subjects)) { foreach ($subjects as $idString) { - $id = $this->osidRuntimeId->fromString($idString); + $id = $this->osidIdMap->fromString($idString); $query->matchTopicId($id, true); // set the first as the selected one if multiple. - if (!isset($this->view->selectedSubjectId)) { - $this->view->selectedSubjectId = $id; + if (!isset($data['selectedSubjectId'])) { + $data['selectedSubjectId'] = $id; } } - $this->view->searchParams['subject'] = $subjects; + $data['searchParams']['subject'] = $subjects; } } - if ($this->_getParam('division')) { - if (is_array($this->_getParam('division'))) { - $divisions = $this->_getParam('division'); + if ($request->get('division')) { + if (is_array($request->get('division'))) { + $divisions = $request->get('division'); } else { - $divisions = [$this->_getParam('division')]; + $divisions = [$request->get('division')]; } if (count($divisions)) { foreach ($divisions as $idString) { - $id = $this->osidRuntimeId->fromString($idString); + $id = $this->osidIdMap->fromString($idString); $query->matchTopicId($id, true); // set the first as the selected one if multiple. - if (!isset($this->view->selectedDivisionId)) { - $this->view->selectedDivisionId = $id; + if (!isset($data['selectedDivisionId'])) { + $data['selectedDivisionId'] = $id; } } - $this->view->searchParams['division'] = $divisions; + $data['searchParams']['division'] = $divisions; } } - $this->view->selectedRequirementIds = []; - if ($this->_getParam('requirement')) { - if (is_array($this->_getParam('requirement'))) { - $requirements = $this->_getParam('requirement'); + $data['selectedRequirementIds'] = []; + if ($request->get('requirement')) { + if (is_array($request->get('requirement'))) { + $requirements = $request->get('requirement'); } else { - $requirements = [$this->_getParam('requirement')]; + $requirements = [$request->get('requirement')]; } if (count($requirements)) { foreach ($requirements as $idString) { - $id = $this->osidRuntimeId->fromString($idString); + $id = $this->osidIdMap->fromString($idString); $query->matchTopicId($id, true); - $this->view->selectedRequirementIds[] = $id; + $data['selectedRequirementIds'][] = $id; } - $this->view->searchParams['requirement'] = $requirements; + $data['searchParams']['requirement'] = $requirements; } } - $this->view->selectedLevelIds = []; - if ($this->_getParam('level')) { - if (is_array($this->_getParam('level'))) { - $levels = $this->_getParam('level'); + $data['selectedLevelIds'] = []; + if ($request->get('level')) { + if (is_array($request->get('level'))) { + $levels = $request->get('level'); } else { - $levels = [$this->_getParam('level')]; + $levels = [$request->get('level')]; } if (count($levels)) { foreach ($levels as $idString) { - $id = $this->osidRuntimeId->fromString($idString); + $id = $this->osidIdMap->fromString($idString); $query->matchTopicId($id, true); - $this->view->selectedLevelIds[] = $id; + $data['selectedLevelIds'][] = $id; } - $this->view->searchParams['level'] = $levels; + $data['searchParams']['level'] = $levels; } } - $this->view->selectedBlockIds = []; - if ($this->_getParam('block')) { - if (is_array($this->_getParam('block'))) { - $blocks = $this->_getParam('block'); + $data['selectedBlockIds'] = []; + if ($request->get('block')) { + if (is_array($request->get('block'))) { + $blocks = $request->get('block'); } else { - $blocks = [$this->_getParam('block')]; + $blocks = [$request->get('block')]; } if (count($blocks)) { foreach ($blocks as $idString) { - $id = $this->osidRuntimeId->fromString($idString); + $id = $this->osidIdMap->fromString($idString); $query->matchTopicId($id, true); - $this->view->selectedBlockIds[] = $id; + $data['selectedBlockIds'][] = $id; } - $this->view->searchParams['block'] = $blocks; + $data['searchParams']['block'] = $blocks; } } - $this->view->selectedInstructionMethodIds = []; - if ($this->_getParam('instruction_method')) { - if (is_array($this->_getParam('instruction_method'))) { - $instructionMethods = $this->_getParam('instruction_method'); + $data['selectedInstructionMethodIds'] = []; + if ($request->get('instruction_method')) { + if (is_array($request->get('instruction_method'))) { + $instructionMethods = $request->get('instruction_method'); } else { - $instructionMethods = [$this->_getParam('instruction_method')]; + $instructionMethods = [$request->get('instruction_method')]; } if (count($instructionMethods)) { foreach ($instructionMethods as $idString) { - $id = $this->osidRuntimeId->fromString($idString); + $id = $this->osidIdMap->fromString($idString); $query->matchTopicId($id, true); - $this->view->selectedInstructionMethodIds[] = $id; + $data['selectedInstructionMethodIds'][] = $id; } - $this->view->searchParams['instruction_method'] = $instructionMethods; + $data['searchParams']['instruction_method'] = $instructionMethods; } } - $this->view->selectedGenusTypes = []; - if ($this->_getParam('type')) { - if (is_array($this->_getParam('type'))) { - $genusTypes = $this->_getParam('type'); + $data['selectedGenusTypes'] = []; + if ($request->get('type')) { + if (is_array($request->get('type'))) { + $genusTypes = $request->get('type'); } else { - $genusTypes = [$this->_getParam('type')]; + $genusTypes = [$request->get('type')]; } if (count($genusTypes)) { foreach ($genusTypes as $typeString) { $genusType = $this->osidRuntimeType->fromString($typeString); $query->matchGenusType($genusType, true); - $this->view->selectedGenusTypes[] = $genusType; + $data['selectedGenusTypes'][] = $genusType; } - $this->view->searchParams['type'] = $genusTypes; + $data['searchParams']['type'] = $genusTypes; } } // Campuses - $this->view->selectedCampusIds = []; - if ($this->_getParam('location')) { - if (is_array($this->_getParam('location'))) { - $campuses = $this->_getParam('location'); + $data['selectedCampusIds'] = []; + if ($request->get('location')) { + if (is_array($request->get('location'))) { + $campuses = $request->get('location'); } else { - $campuses = [$this->_getParam('location')]; + $campuses = [$request->get('location')]; } if (count($campuses)) { foreach ($campuses as $idString) { - $id = $this->osidRuntimeId->fromString($idString); + $id = $this->osidIdMap->fromString($idString); $query->matchLocationId($id, true); - $this->view->selectedCampusIds[] = $id; + $data['selectedCampusIds'][] = $id; } - $this->view->searchParams['location'] = $campuses; + $data['searchParams']['location'] = $campuses; } } // Set the default selection to lecture/seminar if the is a new search - if (!$this->_getParam('search') && !count($this->view->selectedGenusTypes)) { - $this->view->selectedGenusTypes = $this->osidRuntimeTypes->getDefaultGenusTypes(); + if (!$request->get('search') && !count($data['selectedGenusTypes'])) { + $data['selectedGenusTypes'] = $this->osidTypeHelper->getDefaultGenusTypes(); } if ($query->hasRecordType($this->weeklyScheduleType)) { $queryRecord = $query->getCourseOfferingQueryRecord($this->weeklyScheduleType); - if ($this->_getParam('days')) { - if (is_array($this->_getParam('days'))) { - $days = $this->_getParam('days'); + if ($request->get('days')) { + if (is_array($request->get('days'))) { + $days = $request->get('days'); } else { - $days = [$this->_getParam('days')]; + $days = [$request->get('days')]; } if (count($days)) { - if ('exclusive' == $this->_getParam('days_mode')) { - $this->view->searchParams['days_mode'] = 'exclusive'; + if ('exclusive' == $request->get('days_mode')) { + $data['searchParams']['days_mode'] = 'exclusive'; if (!in_array('sunday', $days)) { $queryRecord->matchMeetsSunday(false); @@ -545,7 +604,7 @@ public function search(string $catalog = NULL, $term = NULL) } // Inclusive search. else { - $this->view->searchParams['days_mode'] = 'inclusive'; + $data['searchParams']['days_mode'] = 'inclusive'; if (in_array('sunday', $days)) { $queryRecord->matchMeetsSunday(true); @@ -576,15 +635,15 @@ public function search(string $catalog = NULL, $term = NULL) } } - $this->view->searchParams['days'] = $days; + $data['searchParams']['days'] = $days; } } else { - $this->view->searchParams['days'] = []; + $data['searchParams']['days'] = []; } - if ($this->_getParam('time_start') || $this->_getParam('time_end')) { - $start = (int) $this->_getParam('time_start'); - $end = (int) $this->_getParam('time_end'); + if ($request->get('time_start') || $request->get('time_end')) { + $start = (int) $request->get('time_start'); + $end = (int) $request->get('time_end'); if (!$end) { $end = 86400; } @@ -592,59 +651,46 @@ public function search(string $catalog = NULL, $term = NULL) $queryRecord->matchMeetingTime($start, $end, true); } - $this->view->timeStart = $start; - $this->view->timeEnd = $end; - $this->view->searchParams['time_start'] = $start; - $this->view->searchParams['time_end'] = $end; + $data['timeStart'] = $start; + $data['timeEnd'] = $end; + $data['searchParams']['time_start'] = $start; + $data['searchParams']['time_end'] = $end; } else { - $this->view->timeStart = 0; - $this->view->timeEnd = 86400; + $data['timeStart'] = 0; + $data['timeEnd'] = 86400; } } - if ($this->_getParam('keywords')) { - $query->matchKeyword($this->_getParam('keywords'), $this->booleanStringMatchType, true); - $this->view->keywords = $this->_getParam('keywords'); - $this->view->searchParams['keywords'] = $this->_getParam('keywords'); + if ($request->get('keywords')) { + $query->matchKeyword($request->get('keywords'), $this->booleanStringMatchType, true); + $data['keywords'] = $request->get('keywords'); + $data['searchParams']['keywords'] = $request->get('keywords'); } else { - $this->view->keywords = ''; + $data['keywords'] = ''; } - if ($this->_getParam('instructor')) { + if ($request->get('instructor')) { if ($query->hasRecordType($this->instructorType)) { $queryRecord = $query->getCourseOfferingQueryRecord($this->instructorType); - $queryRecord->matchInstructorId($this->osidRuntimeId->fromString($this->_getParam('instructor')), true); + $queryRecord->matchInstructorId($this->osidIdMap->fromString($request->get('instructor')), true); } - $this->view->searchParams['instructor'] = $this->_getParam('instructor'); + $data['searchParams']['instructor'] = $request->get('instructor'); } - if ($this->_getParam('enrollable')) { + if ($request->get('enrollable')) { if ($query->hasRecordType($this->enrollmentType)) { $queryRecord = $query->getCourseOfferingQueryRecord($this->enrollmentType); $queryRecord->matchEnrollable(true); } - $this->view->searchParams['enrollable'] = $this->_getParam('enrollable'); + $data['searchParams']['enrollable'] = $request->get('enrollable'); } - // Make our session and query available to the XML version of this action. - $this->searchSession = $offeringSearchSession; - $this->query = $query; - - // Run the query if submitted. - if ($this->_getParam('search')) { - $this->view->searchParams['search'] = $this->_getParam('search'); - $this->view->paginator = new Zend_Paginator(new Paginator_Adaptor_CourseOfferingSearch($offeringSearchSession, $query)); - $this->view->paginator->setCurrentPageNumber($this->_getParam('page')); - } - - /********************************************************* - * Options for output - *********************************************************/ - - $this->setSelectedCatalogId($offeringSearchSession->getCourseCatalogId()); - $this->view->headTitle($this->view->title); - - $this->view->menuIsSearch = true; + return [ + $data, + $offeringSearchSession, + $query, + $termLookupSession, + ]; } #[Route('/offerings/view/{id}', name: 'view_offering')] diff --git a/src/Service/Osid/AbstractOsidIdentifierMap.php b/src/Service/Osid/AbstractOsidIdentifierMap.php index 6c273191..57ebe8db 100755 --- a/src/Service/Osid/AbstractOsidIdentifierMap.php +++ b/src/Service/Osid/AbstractOsidIdentifierMap.php @@ -21,7 +21,7 @@ abstract class AbstractOsidIdentifierMap /** * Set up the mapping service. * - * @string $idAuthorityToShorten + * @param string $idAuthorityToShorten * The Identifier authority to shorten. */ public function __construct(string $idAuthorityToShorten) { diff --git a/src/Service/Osid/TypeHelper.php b/src/Service/Osid/TypeHelper.php new file mode 100755 index 00000000..d7135922 --- /dev/null +++ b/src/Service/Osid/TypeHelper.php @@ -0,0 +1,47 @@ +defaultOfferingGenusTypesToSearch = $defaultOfferingGenusTypesToSearch; + } + + /** + * Answer the course offering genus types that should be searched by default + * for a catalog. + * + * @return array of osid_type_Types + * + * @since 6/16/09 + */ + public function getDefaultGenusTypes() + { + $types = []; + foreach ($this->defaultOfferingGenusTypesToSearch as $typeString) { + $types[] = new \phpkit_type_URNInetType($typeString); + } + return $types; + } +} diff --git a/templates/offerings/search.xml.twig b/templates/offerings/search.xml.twig index 4dc74c5f..01e76541 100755 --- a/templates/offerings/search.xml.twig +++ b/templates/offerings/search.xml.twig @@ -12,8 +12,8 @@ {% if nextTerm %}{{ include('partials/term.xml.twig', {term: nextTerm, key: 'next_term'}) }}{% endif %} {% if terms %} - {% for t in terms %} - {{ include('partials/term.xml.twig', {term: t, key: 'term'}) }} + {%~ for t in terms %} + {{ include('partials/term.xml.twig', {term: t, key: 'term'}) -}} {% endfor %} {% endif %} From 7866336b20ef15a9900aee294c3c182292740517 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 11 Oct 2024 15:57:44 -0400 Subject: [PATCH 043/173] #47: Port course offering search form. Result printing still to do. --- .../views/scripts/offerings/search.phtml | 601 ------------------ config/services.yaml | 4 + src/Controller/Offerings.php | 93 ++- src/Twig/OsidIdExtension.php | 28 + .../Twig/TimeHelper.php | 30 +- templates/offerings/search.html.twig | 488 ++++++++++++++ 6 files changed, 608 insertions(+), 636 deletions(-) delete mode 100755 application/views/scripts/offerings/search.phtml rename application/views/helpers/GetTimeString.php => src/Twig/TimeHelper.php (61%) create mode 100755 templates/offerings/search.html.twig diff --git a/application/views/scripts/offerings/search.phtml b/application/views/scripts/offerings/search.phtml deleted file mode 100755 index bb6153ff..00000000 --- a/application/views/scripts/offerings/search.phtml +++ /dev/null @@ -1,601 +0,0 @@ -headScript()->appendFile( - $this->url(array(), null, true).'javascript/jquery.expander.js', - 'text/javascript' -); -$this->headScript()->appendScript( - " - $('document').ready(function() { - $('div.description').expander({ - slicePoint: 140, // default is 100 - expandPrefix: '... ', // text to come before the expand link - expandText: 'read more', // default is 'read more...' - userCollapseText: '[collapse]' // default is '[collapse expanded text]' - }); - }); - ", - 'text/javascript' -); - - $formParams = array( - 'controller' => 'offerings', - 'action' => 'search', - 'term' => null, - 'department' => null, - 'subject' => null, - 'division' => null, - 'requirement' => null, - 'level' => null, - 'days' => null, - 'time_start' => null, - 'time_end' => null, - 'keywords' => null, - 'page' => null, - 'submit' => null - ); -?> - -
- - - - - - - - - - - - - - -requirements->hasNext()) { ?> - - - - - - - - - - -searchParams['days'])) { ?> - - - - - - - - - - - - - - - -blocks->hasNext()) { ?> - - - - - - -instructionMethods->hasNext()) { ?> - - - - - - - - - - - -campuses) && $this->campuses->hasNext()) { -?> - - - - - - - - - - - - -
By Term: - -
By Subject/Department: - -
Satisfies Requirements: -
(Leave all blank for no preference)
-
-requirements->hasNext()) { - if (!($i % 5)) - print "\n\t\t\t
\n\t\t\t
"; - - $topic = $this->requirements->getNextTopic(); - print "\n\t\t\t\tselectedRequirementIds as $selectedId) { - if ($topic->getId()->isEqual($selectedId)) { - print " checked='checked'"; - break; - } - } - print "/>
"; - - $i++; -} -?> -
-
Keywords: - -
By default results only have to match one of the supplied keywords. Use a plus (+) before a word to require it or a minus (-) to exclude it. Use an asterisk (*) as a wildcard.
-
Days of the week: - - - - - - - - -
Leave all unchecked if no preference.
-
- -
- -
Time: - - - -
Type: -
(Leave all blank for no preference)
-
-genusTypes->hasNext()) { - if (!($i % 5)) - print "\n\t\t\t
\n\t\t\t
"; - - $type = $this->genusTypes->getNextType(); - print "\n\t\t\t\tselectedGenusTypes as $selectedType) { - if ($type->isEqual($selectedType)) { - print " checked='checked'"; - break; - } - } - print "/>
"; - - $i++; -} -?> -
-
Additional Details: -
(Leave all blank for no preference)
-
-blocks->hasNext()) { - if (!($i % 5)) - print "\n\t\t\t
\n\t\t\t
"; - - $topic = $this->blocks->getNextTopic(); - print "\n\t\t\t\tselectedBlockIds as $selectedId) { - if ($topic->getId()->isEqual($selectedId)) { - print " checked='checked'"; - break; - } - } - print "/>
"; - - $i++; -} -?> -
-
Course Modality: -
(Leave all blank for no preference)
-
-instructionMethods->hasNext()) { - if (!($i % 5)) - print "\n\t\t\t
\n\t\t\t
"; - - $topic = $this->instructionMethods->getNextTopic(); - print "\n\t\t\t\tselectedInstructionMethodIds as $selectedId) { - if ($topic->getId()->isEqual($selectedId)) { - print " checked='checked'"; - break; - } - } - print "/>
"; - - $i++; -} -?> -
-
Level: -
(Leave all blank for no preference)
-
-levels->hasNext()) { - if (!($i % 5)) - print "\n\t\t\t
\n\t\t\t
"; - - $topic = $this->levels->getNextTopic(); - print "\n\t\t\t\tselectedLevelIds as $selectedId) { - if ($topic->getId()->isEqual($selectedId)) { - print " checked='checked'"; - break; - } - } - print "/>
"; - - $i++; -} -?> -
-
Campus: -
(Leave all blank for no preference)
-
-campuses->hasNext()) { - if (!($i % 5)) - print "\n\t\t\t
\n\t\t\t
"; - - $campus = $this->campuses->getNextResource(); - print "\n\t\t\t\tselectedCampusIds as $selectedId) { - if ($campus->getId()->isEqual($selectedId)) { - print " checked='checked'"; - break; - } - } - print "/>
"; - - $i++; -} -?> -
-
-
- -paginator)) { - -?> -

Results

- -paginator)) { - print "
No Matches
"; -} - -print $this->paginationControl($this->paginator, 'Sliding', 'ItemPaginationControl.phtml', array('search_params' => $this->searchParams)); ?> - - - -paginator as $section) { - $offeringParams = array( - 'controller' => 'offerings', - 'action' => 'view', - 'offering' => $this->getStringFromOsidId($section->getId()) - ); - $resourceParams = array( - 'controller' => 'resources', - 'action' => 'view', - 'term' => $this->getStringFromOsidId($term->getId()), - 'offering' => null - ); - - $term = $section->getTerm(); - $termUrl = $this->url(array( - 'controller' => 'terms', - 'action' => 'view', - 'term' => $this->getStringFromOsidId($term->getId()), - 'offering' => null - )); - $topicParams = array( - 'controller' => 'topics', - 'action' => 'view', - 'offering' => null, - 'term' => $this->getStringFromOsidId($term->getId()) - ); - - // Topics - $allTopics = $this->topicListAsArray($section->getTopics()); -?> - - - - - - -
- escape($section->getDisplayName()); ?> -hasRecordType($alternateType)) { - $record = $section->getCourseOfferingRecord($alternateType); - if ($record->hasAlternates()) { - if ($record->isPrimary()) { - print " * "; - } - - $alternates = $record->getAlternates(); - print "\n\t\t\t\t
Cross-Listed As:"; - while ($alternates->hasNext()) { - print "\n\t\t\t\t
"; - $alternate = $alternates->getNextCourseOffering(); - $offeringParams['offering'] = $this->getStringFromOsidId($alternate->getId()); - print "url($offeringParams)."\">"; - print $this->escape($alternate->getDisplayName()); - print " "; - if ($alternate->hasRecordType($alternateType)) { - $alternateRecord = $alternate->getCourseOfferingRecord($alternateType); - if ($alternateRecord->isPrimary()) { - print " * "; - } - } - } - } -} - -print "\n\t
"; - -print "\n\t\t
Type:
"; -print "\n\t\t
".$this->escape($section->getGenusType()->getDisplayName())."
"; - -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.instruction_method")); -if (!empty($topics)) { - print "\n\t\t
Course Modality:
"; - print "\n\t\t
"; - foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; - } - print "
"; -} - -print "\n\t\t
Term:
"; -+print "\n\t\t
"; -+// print "\n\t\t\t"; -+print $this->escape($term->getDisplayName()); -+// print ""; -+print "\n\t\t
"; -print "\n\t\t
Department:
"; -print "\n\t\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.department")); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -print "\n\t\t
Requirements Fulfilled:
"; -print "\n\t\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.requirement")); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -print "\n\t
"; - -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.block")); -if (!empty($topics)) { - print "\n\t\t
Additional Details:
"; - print "\n\t\t
"; - foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; - } - print "
"; -} - -?> - - - 		- bookmarks_CourseId = $section->getCourseId(); - $this->bookmarks_IsCourseSaved = false; - print $this->render('schedules/bookmark_control.phtml'); - ?> -
escape($section->getTitle())); ?>
-
getDescription(); ?>
-"; - -$instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); -if ($section->hasRecordType($instructorsType)) { - $instructorsRecord = $section->getCourseOfferingRecord($instructorsType); - print "\n\t\t
Instructors:
"; - print "\n\t\t
"; - $instructors = $instructorsRecord->getInstructors(); - while ($instructors->hasNext()) { - $instructor = $instructors->getNextResource(); - $resourceParams['resource'] = $this->getStringFromOsidId($instructor->getId()); - print "url($resourceParams)."\">"; - print $this->escape($instructor->getDisplayName()); - print " "; - } - print "
"; -} - -if ($section->hasLocation()) { - print "\n\t\t
Location:
"; - try { - $locationResource = $section->getLocation(); - print "\n\t\t
"; -// $resourceParams['resource'] = $this->getStringFromOsidId($locationResource->getId()); -// print "url($resourceParams)."\">"; - print $this->escape($locationResource->getDisplayName()); -// print " "; - if ($locationResource->getDescription()) - print " (".$this->escape($locationResource->getDescription()).")"; - print "\n\t\t
"; - } catch (osid_OperationFailedException $e) { - print "\n\t\t
".$this->escape($section->getLocationInfo())."
"; - } -} else if ($section->getLocationInfo()) { - print "\n\t\t
Location:
"; - print "\n\t\t
".$this->escape($section->getLocationInfo())."
"; -} - -$scheduleInfo = $section->getScheduleInfo(); -if (!empty($scheduleInfo)) { - print "\n\t\t
Schedule:
"; - print "\n\t\t
".$this->formatScheduleInfo($scheduleInfo)."
"; -} - -$availabilityLink = $this->getAvailabilityLink($section); -if (!empty($availabilityLink)) { - print "\n\t\t
Availability:
"; - print "\n\t\t
"; - print $availabilityLink; - print "\n\t\t
"; -} - -// print "\n\t
Subject:
"; -// print "\n\t\t
"; -// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.subject")); -// foreach ($topics as $topic) { -// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); -// print "url($topicParams)."\">"; -// print $this->escape($topic->getDisplayName()); -// print " "; -// } -// print "
"; - -// print "\n\t\t
Division:
"; -// print "\n\t\t
"; -// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.division")); -// foreach ($topics as $topic) { -// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); -// print "url($topicParams)."\">"; -// print $this->escape($topic->getDisplayName()); -// print " "; -// } -// print "
"; - -print "\n\t"; - - -?> -
- -paginationControl($this->paginator, 'Sliding', 'SearchPaginationControl.phtml', array('search_params' => $this->searchParams)); ?> - - diff --git a/config/services.yaml b/config/services.yaml index e9d3d9a7..45a4855e 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -57,6 +57,10 @@ services: tags: - { name: 'twig.extension' } + App\Twig\TimeHelper: + tags: + - { name: 'twig.extension' } + # Service aliases. osid.runtime: class: App\Service\Osid\Runtime diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index a23ab209..4aef7d22 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -180,19 +180,6 @@ public function searchxml(Request $request, string $catalog = NULL, string $term $lastTerm = $term; } } - // Reset the terms list as due to caching, we will have just wiped out the statement above. - // - // It would be better to fix this in the banner_course_CachingPdoQueryList, but - // I haven't yet figured out how to determine if a result cursor - // has been closed or not. See: - // - // http://stackoverflow.com/questions/1608427/how-can-i-determine-if-a-pdo-statement-cursor-is-closed - $data['terms'] = []; - $terms = $termLookupSession->getTerms(); - while ($terms->hasNext()) { - $term = $terms->getNextTerm(); - $data['terms'][] = $term; - } $data['title'] = 'Course Offering Results'; $data['feedLink'] = $this->generateUrl( @@ -209,22 +196,26 @@ public function searchxml(Request $request, string $catalog = NULL, string $term #[Route('/offerings/search/{catalog}/{term}', name: 'search_offerings')] public function search(Request $request, string $catalog = NULL, string $term = NULL) { - $data = $this->prepareSearch($request, $catalog, $term); + [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog, $term); + + $data['form_action'] = $this->generateUrl('search_offerings', ['catalog' => $catalog]); // Run the query if submitted. if ($request->get('search')) { $data['searchParams']['search'] = $request->get('search'); - $data['paginator'] = new Zend_Paginator(new Paginator_Adaptor_CourseOfferingSearch($offeringSearchSession, $query)); + throw new \Exception('Todo: implement pagination'); + $data['paginator'] = new Zend_Paginator(new Paginator_Adaptor_CourseOfferingSearch($searchSession, $query)); $data['paginator']->setCurrentPageNumber($request->get('page')); } /********************************************************* * Data for layouts rendering. *********************************************************/ - $data['selectedCatalogId'] = $offeringSearchSession->getCourseCatalogId(); + $data['selectedCatalogId'] = $searchSession->getCourseCatalogId(); $data['menuIsSearch'] = true; - throw new \Exception('todo'); + + return $this->render('offerings/search.html.twig', $data); } /** @@ -294,7 +285,11 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $order->orderByDisplayName(); $search->orderTopicResults($order); $searchResults = $topicSearchSession->getTopicsBySearch($topicQuery, $search); - $data['departments'] = $searchResults->getTopics(); + $topics = $searchResults->getTopics(); + $data['departments'] = []; + while ($topics->hasNext()) { + $data['departments'][] = $topics->getNextTopic(); + } $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->subjectType, true); @@ -307,7 +302,11 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $order->orderByDisplayName(); $search->orderTopicResults($order); $searchResults = $topicSearchSession->getTopicsBySearch($topicQuery, $search); - $data['subjects'] = $searchResults->getTopics(); + $topics = $searchResults->getTopics(); + $data['subjects'] = []; + while ($topics->hasNext()) { + $data['subjects'][] = $topics->getNextTopic(); + } $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->divisionType, true); @@ -315,7 +314,11 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $data['divisions'] = $topicSearchSession->getTopicsByQuery($topicQuery); + $topics = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['divisions'] = []; + while ($topics->hasNext()) { + $data['divisions'][] = $topics->getNextTopic(); + } $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->requirementType, true); @@ -323,7 +326,11 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $data['requirements'] = $topicSearchSession->getTopicsByQuery($topicQuery); + $topics = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['requirements'] = []; + while ($topics->hasNext()) { + $data['requirements'][] = $topics->getNextTopic(); + } $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->levelType, true); @@ -331,7 +338,11 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $data['levels'] = $topicSearchSession->getTopicsByQuery($topicQuery); + $topics = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['levels'] = []; + while ($topics->hasNext()) { + $data['levels'][] = $topics->getNextTopic(); + } $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->blockType, true); @@ -339,7 +350,11 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $data['blocks'] = $topicSearchSession->getTopicsByQuery($topicQuery); + $topics = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['blocks'] = []; + while ($topics->hasNext()) { + $data['blocks'][] = $topics->getNextTopic(); + } $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->instructionMethodType, true); @@ -347,14 +362,26 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $record = $topicQuery->getTopicQueryRecord($this->termType); $record->matchTermId($termId, true); } - $data['instructionMethods'] = $topicSearchSession->getTopicsByQuery($topicQuery); + $topics = $topicSearchSession->getTopicsByQuery($topicQuery); + $data['instructionMethods'] = []; + while ($topics->hasNext()) { + $data['instructionMethods'][] = $topics->getNextTopic(); + } - $data['genusTypes'] = $offeringLookupSession->getCourseOfferingGenusTypes(); + $genusTypes = $offeringLookupSession->getCourseOfferingGenusTypes(); + $data['genusTypes'] = []; + while ($genusTypes->hasNext()) { + $data['genusTypes'][] = $genusTypes->getNextType(); + }; // Campuses -- only include if we have more than one. $campuses = $resourceLookupSession->getResourcesByGenusType($this->campusType); if ($campuses->hasNext() && $campuses->getNextResource() && $campuses->hasNext()) { - $data['campuses'] = $resourceLookupSession->getResourcesByGenusType($this->campusType); + $campuses = $resourceLookupSession->getResourcesByGenusType($this->campusType); + $data['campuses'] = []; + while ($campuses->hasNext()) { + $data['campuses'][] = $campuses->getNextResource(); + } } /********************************************************* @@ -368,7 +395,12 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin 'term' => $term, ]; - $data['terms'] = $termLookupSession->getTerms(); + $data['terms'] = []; + $terms = $termLookupSession->getTerms(); + while ($terms->hasNext()) { + $term = $terms->getNextTerm(); + $data['terms'][] = $term; + } // Add our parameters to the search query if ($term) { @@ -528,7 +560,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin if (count($genusTypes)) { foreach ($genusTypes as $typeString) { - $genusType = $this->osidRuntimeType->fromString($typeString); + $genusType = $this->osidIdMap->typeFromString($typeString); $query->matchGenusType($genusType, true); $data['selectedGenusTypes'][] = $genusType; } @@ -563,6 +595,9 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin if ($query->hasRecordType($this->weeklyScheduleType)) { $queryRecord = $query->getCourseOfferingQueryRecord($this->weeklyScheduleType); + $data['searchParams']['days'] = []; + $data['searchParams']['days_mode'] = 'inclusive'; + if ($request->get('days')) { if (is_array($request->get('days'))) { $days = $request->get('days'); @@ -637,8 +672,6 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $data['searchParams']['days'] = $days; } - } else { - $data['searchParams']['days'] = []; } if ($request->get('time_start') || $request->get('time_end')) { diff --git a/src/Twig/OsidIdExtension.php b/src/Twig/OsidIdExtension.php index 0b9bcb69..5c5da835 100644 --- a/src/Twig/OsidIdExtension.php +++ b/src/Twig/OsidIdExtension.php @@ -31,6 +31,9 @@ public function getFunctions(): array return [ new TwigFunction('osidIdToString', [$this, 'osidIdToString']), new TwigFunction('osidTypeToString', [$this, 'osidTypeToString']), + new TwigFunction('osidIdsEqual', [$this, 'osidIdsEqual']), + new TwigFunction('osidIdInArray', [$this, 'osidIdInArray']), + new TwigFunction('osidTypeInArray', [$this, 'osidTypeInArray']), ]; } @@ -43,4 +46,29 @@ public function osidTypeToString(\osid_type_Type $type): string { return $this->idMap->typeToString($type); } + + public function osidIdsEqual(\osid_id_Id $id1, \osid_id_Id $id2): bool + { + return $id1->isEqual($id2); + } + + public function osidIdInArray(\osid_id_Id $id, iterable $ids): bool + { + foreach ($ids as $comparison) { + if ($id->isEqual($comparison)) { + return TRUE; + } + } + return FALSE; + } + + public function osidTypeInArray(\osid_type_Type $type, iterable $types): bool + { + foreach ($types as $comparison) { + if ($type->isEqual($comparison)) { + return TRUE; + } + } + return FALSE; + } } diff --git a/application/views/helpers/GetTimeString.php b/src/Twig/TimeHelper.php similarity index 61% rename from application/views/helpers/GetTimeString.php rename to src/Twig/TimeHelper.php index aeede4e2..72b389fa 100755 --- a/application/views/helpers/GetTimeString.php +++ b/src/Twig/TimeHelper.php @@ -1,5 +1,11 @@ + + + + + + + + + + + + + + +{% if requirements is not empty %} + + + + +{% endif %} + + + + + + +{% if searchParams.days is iterable %} + + + + + + + + + +{% endif %} + + + + + + +{% if blocks is not empty %} + + + + +{% endif %} + +{% if instructionMethods is not empty %} + + + + +{% endif %} + + + + + + +{% if campuses is not empty %} + + + + +{% endif %} + + + + + +
By Term: + +
By Subject/Department: + +
Satisfies Requirements: +
(Leave all blank for no preference)
+
+{% for topic in requirements %} +{% if loop.index is divisible by(5) %} +
+
+{% endif %} +
+{% endfor %} +
+
Keywords: + +
By default results only have to match one of the supplied keywords. Use a plus (+) before a word to require it or a minus (-) to exclude it. Use an asterisk (*) as a wildcard.
+
Days of the week: + + + + + + + + +
Leave all unchecked if no preference.
+
+ +
+ +
Time: + + + + + + +
Type: +
(Leave all blank for no preference)
+
+{% for type in genusTypes %} +{% if loop.index is divisible by(5) %} +
+
+{% endif %} +
+{% endfor %} +
+
Additional Details: +
(Leave all blank for no preference)
+
+{% for topic in blocks %} +{% if loop.index is divisible by(5) %} +
+
+{% endif %} +
+{% endfor %} +
+
Course Modality: +
(Leave all blank for no preference)
+
+{% for topic in instructionMethods %} +{% if loop.index is divisible by(5) %} +
+
+{% endif %} +
+{% endfor %} +
+
Level: +
(Leave all blank for no preference)
+
+{% for topic in levels %} +{% if loop.index is divisible by(5) %} +
+
+{% endif %} +
+{% endfor %} +
+
Campus: +
(Leave all blank for no preference)
+
+{% for resource in campuses %} +{% if loop.index is divisible by(5) %} +
+
+{% endif %} +
+{% endfor %} +
+
+ + + + + +
+ +$this->headScript()->appendFile( + $this->url(array(), null, true).'javascript/jquery.expander.js', + 'text/javascript' +); +$this->headScript()->appendScript( + " + $('document').ready(function() { + $('div.description').expander({ + slicePoint: 140, // default is 100 + expandPrefix: '... ', // text to come before the expand link + expandText: 'read more', // default is 'read more...' + userCollapseText: '[collapse]' // default is '[collapse expanded text]' + }); + }); + ", + 'text/javascript' +); + + $formParams = array( + 'controller' => 'offerings', + 'action' => 'search', + 'term' => null, + 'department' => null, + 'subject' => null, + 'division' => null, + 'requirement' => null, + 'level' => null, + 'days' => null, + 'time_start' => null, + 'time_end' => null, + 'keywords' => null, + 'page' => null, + 'submit' => null + ); +?> + + + + + + + +paginator)) { + +?> +

Results

+ +paginator)) { + print "
No Matches
"; +} + +print $this->paginationControl($this->paginator, 'Sliding', 'ItemPaginationControl.phtml', array('search_params' => $this->searchParams)); ?> + + + +paginator as $section) { + $offeringParams = array( + 'controller' => 'offerings', + 'action' => 'view', + 'offering' => $this->getStringFromOsidId($section->getId()) + ); + $resourceParams = array( + 'controller' => 'resources', + 'action' => 'view', + 'term' => $this->getStringFromOsidId($term->getId()), + 'offering' => null + ); + + $term = $section->getTerm(); + $termUrl = $this->url(array( + 'controller' => 'terms', + 'action' => 'view', + 'term' => $this->getStringFromOsidId($term->getId()), + 'offering' => null + )); + $topicParams = array( + 'controller' => 'topics', + 'action' => 'view', + 'offering' => null, + 'term' => $this->getStringFromOsidId($term->getId()) + ); + + // Topics + $allTopics = $this->topicListAsArray($section->getTopics()); +?> + + + + + + +
+ escape($section->getDisplayName()); ?> +hasRecordType($alternateType)) { + $record = $section->getCourseOfferingRecord($alternateType); + if ($record->hasAlternates()) { + if ($record->isPrimary()) { + print " * "; + } + + $alternates = $record->getAlternates(); + print "\n\t\t\t\t
Cross-Listed As:"; + while ($alternates->hasNext()) { + print "\n\t\t\t\t
"; + $alternate = $alternates->getNextCourseOffering(); + $offeringParams['offering'] = $this->getStringFromOsidId($alternate->getId()); + print "url($offeringParams)."\">"; + print $this->escape($alternate->getDisplayName()); + print " "; + if ($alternate->hasRecordType($alternateType)) { + $alternateRecord = $alternate->getCourseOfferingRecord($alternateType); + if ($alternateRecord->isPrimary()) { + print " * "; + } + } + } + } +} + +print "\n\t
"; + +print "\n\t\t
Type:
"; +print "\n\t\t
".$this->escape($section->getGenusType()->getDisplayName())."
"; + +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.instruction_method")); +if (!empty($topics)) { + print "\n\t\t
Course Modality:
"; + print "\n\t\t
"; + foreach ($topics as $topic) { + $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); + print "url($topicParams)."\">"; + print $this->escape($topic->getDisplayName()); + print " "; + } + print "
"; +} + +print "\n\t\t
Term:
"; ++print "\n\t\t
"; ++// print "\n\t\t\t"; ++print $this->escape($term->getDisplayName()); ++// print ""; ++print "\n\t\t
"; +print "\n\t\t
Department:
"; +print "\n\t\t
"; +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.department")); +foreach ($topics as $topic) { + $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); + print "url($topicParams)."\">"; + print $this->escape($topic->getDisplayName()); + print " "; +} +print "
"; + +print "\n\t\t
Requirements Fulfilled:
"; +print "\n\t\t
"; +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.requirement")); +foreach ($topics as $topic) { + $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); + print "url($topicParams)."\">"; + print $this->escape($topic->getDisplayName()); + print " "; +} +print "
"; + +print "\n\t
"; + +$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.block")); +if (!empty($topics)) { + print "\n\t\t
Additional Details:
"; + print "\n\t\t
"; + foreach ($topics as $topic) { + $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); + print "url($topicParams)."\">"; + print $this->escape($topic->getDisplayName()); + print " "; + } + print "
"; +} + +?> + + + 		+ bookmarks_CourseId = $section->getCourseId(); + $this->bookmarks_IsCourseSaved = false; + print $this->render('schedules/bookmark_control.phtml'); + ?> +
escape($section->getTitle())); ?>
+
getDescription(); ?>
+"; + +$instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); +if ($section->hasRecordType($instructorsType)) { + $instructorsRecord = $section->getCourseOfferingRecord($instructorsType); + print "\n\t\t
Instructors:
"; + print "\n\t\t
"; + $instructors = $instructorsRecord->getInstructors(); + while ($instructors->hasNext()) { + $instructor = $instructors->getNextResource(); + $resourceParams['resource'] = $this->getStringFromOsidId($instructor->getId()); + print "url($resourceParams)."\">"; + print $this->escape($instructor->getDisplayName()); + print " "; + } + print "
"; +} + +if ($section->hasLocation()) { + print "\n\t\t
Location:
"; + try { + $locationResource = $section->getLocation(); + print "\n\t\t
"; +// $resourceParams['resource'] = $this->getStringFromOsidId($locationResource->getId()); +// print "url($resourceParams)."\">"; + print $this->escape($locationResource->getDisplayName()); +// print " "; + if ($locationResource->getDescription()) + print " (".$this->escape($locationResource->getDescription()).")"; + print "\n\t\t
"; + } catch (osid_OperationFailedException $e) { + print "\n\t\t
".$this->escape($section->getLocationInfo())."
"; + } +} else if ($section->getLocationInfo()) { + print "\n\t\t
Location:
"; + print "\n\t\t
".$this->escape($section->getLocationInfo())."
"; +} + +$scheduleInfo = $section->getScheduleInfo(); +if (!empty($scheduleInfo)) { + print "\n\t\t
Schedule:
"; + print "\n\t\t
".$this->formatScheduleInfo($scheduleInfo)."
"; +} + +$availabilityLink = $this->getAvailabilityLink($section); +if (!empty($availabilityLink)) { + print "\n\t\t
Availability:
"; + print "\n\t\t
"; + print $availabilityLink; + print "\n\t\t
"; +} + +// print "\n\t
Subject:
"; +// print "\n\t\t
"; +// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.subject")); +// foreach ($topics as $topic) { +// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); +// print "url($topicParams)."\">"; +// print $this->escape($topic->getDisplayName()); +// print " "; +// } +// print "
"; + +// print "\n\t\t
Division:
"; +// print "\n\t\t
"; +// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.division")); +// foreach ($topics as $topic) { +// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); +// print "url($topicParams)."\">"; +// print $this->escape($topic->getDisplayName()); +// print " "; +// } +// print "
"; + +print "\n\t"; + + +?> +
+ +paginationControl($this->paginator, 'Sliding', 'SearchPaginationControl.phtml', array('search_params' => $this->searchParams)); ?> + + From 05149d34505a22f5dbd15c9f6739ee026c27fa8c Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 15 Oct 2024 12:20:08 -0400 Subject: [PATCH 044/173] #47: Port the CourseOffering search page. --- composer.json | 1 + composer.lock | 260 +++++++++++- config/bundles.php | 1 + config/packages/translation.yaml | 7 + config/services.yaml | 10 +- src/Controller/Offerings.php | 50 ++- .../Paginator/CourseOfferingSearchAdaptor.php | 49 ++- src/Paginator/OfferingSearchSubscriber.php | 30 ++ symfony.lock | 16 + templates/offerings/search.html.twig | 380 +++++------------- translations/.gitignore | 0 11 files changed, 482 insertions(+), 322 deletions(-) create mode 100644 config/packages/translation.yaml rename application/library/Paginator/Adaptor/CourseOfferingSearch.php => src/Paginator/CourseOfferingSearchAdaptor.php (50%) create mode 100644 src/Paginator/OfferingSearchSubscriber.php create mode 100644 translations/.gitignore diff --git a/composer.json b/composer.json index c3dcdc4b..d24c870e 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,7 @@ "php": ">=8.1", "ext-ctype": "*", "ext-iconv": "*", + "knplabs/knp-paginator-bundle": "^6.6", "microsoft/microsoft-graph": "^2.12", "onelogin/php-saml": "^4.2", "symfony/apache-pack": "^1.0", diff --git a/composer.lock b/composer.lock index fd9f847d..8bef2e98 100644 --- a/composer.lock +++ b/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": "9bd5f77b184c4d6a6ff281752fa68768", + "content-hash": "72de8ce57b2dd6e265261aeac148baa3", "packages": [ { "name": "brick/math", @@ -607,6 +607,167 @@ ], "time": "2024-07-18T11:15:46+00:00" }, + { + "name": "knplabs/knp-components", + "version": "v5.1.0", + "source": { + "type": "git", + "url": "https://github.com/KnpLabs/knp-components.git", + "reference": "a1ccc001fd243670ca1e970356027a53d6fca2af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/KnpLabs/knp-components/zipball/a1ccc001fd243670ca1e970356027a53d6fca2af", + "reference": "a1ccc001fd243670ca1e970356027a53d6fca2af", + "shasum": "" + }, + "require": { + "php": "^8.1", + "symfony/event-dispatcher-contracts": "^3.0" + }, + "conflict": { + "doctrine/dbal": "<3.8" + }, + "require-dev": { + "doctrine/dbal": "^3.8 || ^4.0", + "doctrine/mongodb-odm": "^2.5.5", + "doctrine/orm": "^2.13 || ^3.0", + "doctrine/phpcr-odm": "^1.8 || ^2.0", + "ext-pdo_sqlite": "*", + "jackalope/jackalope-doctrine-dbal": "^1.12 || ^2.0", + "phpunit/phpunit": "^10.5 || ^11.3", + "propel/propel1": "^1.7", + "ruflin/elastica": "^7.0", + "solarium/solarium": "^6.0", + "symfony/http-foundation": "^5.4.38 || ^6.4.4 || ^7.0", + "symfony/http-kernel": "^5.4.38 || ^6.4.4 || ^7.0", + "symfony/property-access": "^5.4.38 || ^6.4.4 || ^7.0" + }, + "suggest": { + "doctrine/common": "to allow usage pagination with Doctrine ArrayCollection", + "doctrine/mongodb-odm": "to allow usage pagination with Doctrine ODM MongoDB", + "doctrine/orm": "to allow usage pagination with Doctrine ORM", + "doctrine/phpcr-odm": "to allow usage pagination with Doctrine ODM PHPCR", + "propel/propel1": "to allow usage pagination with Propel ORM", + "ruflin/elastica": "to allow usage pagination with ElasticSearch Client", + "solarium/solarium": "to allow usage pagination with Solarium Client", + "symfony/http-foundation": "to retrieve arguments from Request", + "symfony/property-access": "to allow sorting arrays" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.x-dev" + } + }, + "autoload": { + "psr-4": { + "Knp\\Component\\": "src/Knp/Component" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KnpLabs Team", + "homepage": "https://knplabs.com" + }, + { + "name": "Symfony Community", + "homepage": "https://github.com/KnpLabs/knp-components/contributors" + } + ], + "description": "Knplabs component library", + "homepage": "https://github.com/KnpLabs/knp-components", + "keywords": [ + "components", + "knp", + "knplabs", + "pager", + "paginator" + ], + "support": { + "issues": "https://github.com/KnpLabs/knp-components/issues", + "source": "https://github.com/KnpLabs/knp-components/tree/v5.1.0" + }, + "time": "2024-09-20T12:03:01+00:00" + }, + { + "name": "knplabs/knp-paginator-bundle", + "version": "v6.6.1", + "source": { + "type": "git", + "url": "https://github.com/KnpLabs/KnpPaginatorBundle.git", + "reference": "1a00f88149d25418bd99d8954eba951f04cc3acf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/KnpLabs/KnpPaginatorBundle/zipball/1a00f88149d25418bd99d8954eba951f04cc3acf", + "reference": "1a00f88149d25418bd99d8954eba951f04cc3acf", + "shasum": "" + }, + "require": { + "knplabs/knp-components": "^4.4 || ^5.0", + "php": "^8.1", + "symfony/config": "^6.4 || ^7.0", + "symfony/dependency-injection": "^6.4 || ^7.0", + "symfony/event-dispatcher": "^6.4 || ^7.0", + "symfony/http-foundation": "^6.4 || ^7.0", + "symfony/http-kernel": "^6.4 || ^7.0", + "symfony/routing": "^6.4 || ^7.0", + "symfony/translation": "^6.4 || ^7.0", + "twig/twig": "^3.0" + }, + "require-dev": { + "phpstan/phpstan": "^1.11", + "phpunit/phpunit": "^10.5 || ^11.3", + "symfony/expression-language": "^6.4 || ^7.0", + "symfony/templating": "^6.4 || ^7.0" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Knp\\Bundle\\PaginatorBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "KnpLabs Team", + "homepage": "https://knplabs.com" + }, + { + "name": "Symfony Community", + "homepage": "https://github.com/KnpLabs/KnpPaginatorBundle/contributors" + } + ], + "description": "Paginator bundle for Symfony to automate pagination and simplify sorting and other features", + "homepage": "https://github.com/KnpLabs/KnpPaginatorBundle", + "keywords": [ + "bundle", + "knp", + "knplabs", + "pager", + "pagination", + "paginator", + "symfony" + ], + "support": { + "issues": "https://github.com/KnpLabs/KnpPaginatorBundle/issues", + "source": "https://github.com/KnpLabs/KnpPaginatorBundle/tree/v6.6.1" + }, + "time": "2024-10-07T16:11:50+00:00" + }, { "name": "league/oauth2-client", "version": "2.7.0", @@ -4377,6 +4538,101 @@ ], "time": "2024-09-20T08:15:52+00:00" }, + { + "name": "symfony/translation", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation.git", + "reference": "cf8360b8352b086be620fae8342c4d96e391a489" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation/zipball/cf8360b8352b086be620fae8342c4d96e391a489", + "reference": "cf8360b8352b086be620fae8342c4d96e391a489", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^2.5|^3.0" + }, + "conflict": { + "symfony/config": "<5.4", + "symfony/console": "<5.4", + "symfony/dependency-injection": "<5.4", + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<5.4", + "symfony/service-contracts": "<2.5", + "symfony/twig-bundle": "<5.4", + "symfony/yaml": "<5.4" + }, + "provide": { + "symfony/translation-implementation": "2.3|3.0" + }, + "require-dev": { + "nikic/php-parser": "^4.18|^5.0", + "psr/log": "^1|^2|^3", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/http-client-contracts": "^2.5|^3.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/intl": "^5.4|^6.0|^7.0", + "symfony/polyfill-intl-icu": "^1.21", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3", + "symfony/yaml": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/functions.php" + ], + "psr-4": { + "Symfony\\Component\\Translation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to internationalize your application", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/translation/tree/v6.4.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-16T06:02:54+00:00" + }, { "name": "symfony/translation-contracts", "version": "v3.5.0", @@ -7065,5 +7321,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/config/bundles.php b/config/bundles.php index bdd37acd..c9725351 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -3,4 +3,5 @@ return [ Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], + Knp\Bundle\PaginatorBundle\KnpPaginatorBundle::class => ['all' => true], ]; diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml new file mode 100644 index 00000000..b3f8f9cf --- /dev/null +++ b/config/packages/translation.yaml @@ -0,0 +1,7 @@ +framework: + default_locale: en + translator: + default_path: '%kernel.project_dir%/translations' + fallbacks: + - en + providers: diff --git a/config/services.yaml b/config/services.yaml index 45a4855e..9531e2ac 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -29,11 +29,9 @@ services: arguments: $configPath: '../configuration.plist' $courseImpl: '%app.osid.runtime.courseimpl%' - App\Service\Osid\IdMap: arguments: $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' - App\Service\Osid\TypeMap: arguments: $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' @@ -44,22 +42,22 @@ services: - 'urn:inet:middlebury.edu:genera:offering.SEM' - 'urn:inet:middlebury.edu:genera:offering.PRC' - 'urn:inet:middlebury.edu:genera:offering.WKS' - App\Twig\OsidIdExtension: tags: - { name: 'twig.extension' } - App\Twig\NoWrapParentheticals: tags: - { name: 'twig.extension' } - App\Twig\DateRangeFormatter: tags: - { name: 'twig.extension' } - App\Twig\TimeHelper: tags: - { name: 'twig.extension' } + App\Paginator\OfferingSearchSubscriber: + tags: + - { name: 'kernel.event_subscriber' } + # Service aliases. osid.runtime: diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 4aef7d22..d3e51a58 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -6,11 +6,13 @@ namespace App\Controller; +use App\Paginator\CourseOfferingSearchAdaptor; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; use App\Service\Osid\TermHelper; use App\Service\Osid\TopicHelper; use App\Service\Osid\TypeHelper; +use Knp\Component\Pager\PaginatorInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -193,19 +195,27 @@ public function searchxml(Request $request, string $catalog = NULL, string $term return $response; } - #[Route('/offerings/search/{catalog}/{term}', name: 'search_offerings')] - public function search(Request $request, string $catalog = NULL, string $term = NULL) + #[Route('/offerings/search/{catalog}', name: 'search_offerings')] + public function search(Request $request, PaginatorInterface $paginator, string $catalog = NULL) { - [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog, $term); + [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog); $data['form_action'] = $this->generateUrl('search_offerings', ['catalog' => $catalog]); // Run the query if submitted. + $data['paginator'] = NULL; if ($request->get('search')) { $data['searchParams']['search'] = $request->get('search'); - throw new \Exception('Todo: implement pagination'); - $data['paginator'] = new Zend_Paginator(new Paginator_Adaptor_CourseOfferingSearch($searchSession, $query)); - $data['paginator']->setCurrentPageNumber($request->get('page')); + $data['paginator'] = $paginator->paginate( + new CourseOfferingSearchAdaptor( + $searchSession, + $query, + NULL, + [$this, 'getOfferingData'], + ), + $request->query->getInt('page', 1), /* page number */ + 10 /* limit per page */ + ); } /********************************************************* @@ -225,15 +235,14 @@ public function search(Request $request, string $catalog = NULL, string $term = * The request that contains the search parameters. * @param string|NULL $catalog * The catalog to search in or NULL for all catalogs. - * @param string|NULL $term - * The term to search in or NULL for all catalogs. * * @return array * The parts of the search preparation in an array: data, searchSession, * and query. */ - protected function prepareSearch(Request $request, string $catalog = NULL, string $term = NULL) + protected function prepareSearch(Request $request, string $catalog = NULL) { + $term = $request->get('term'); $data = []; if ($catalog) { $catalogId = $catalogId = $this->osidIdMap->fromString($catalog); @@ -272,14 +281,17 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin } else { $termId = $this->osidIdMap->fromString($term); } + if (isset($termId)) { + $data['term'] = $termLookupSession->getTerm($termId); + } // Topics $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->departmentType, true); - // if (isset($termId) && $topicQuery->hasRecordType($this->termType)) { - // $record = $topicQuery->getTopicQueryRecord($this->termType); - // $record->matchTermId($termId, true); - // } + if (isset($termId) && $topicQuery->hasRecordType($this->termType)) { + $record = $topicQuery->getTopicQueryRecord($this->termType); + $record->matchTermId($termId, true); + } $search = $topicSearchSession->getTopicSearch(); $order = $topicSearchSession->getTopicSearchOrder(); $order->orderByDisplayName(); @@ -293,10 +305,10 @@ protected function prepareSearch(Request $request, string $catalog = NULL, strin $topicQuery = $topicSearchSession->getTopicQuery(); $topicQuery->matchGenusType($this->subjectType, true); - // if (isset($termId) && $topicQuery->hasRecordType($this->termType)) { - // $record = $topicQuery->getTopicQueryRecord($this->termType); - // $record->matchTermId($termId, true); - // } + if (isset($termId) && $topicQuery->hasRecordType($this->termType)) { + $record = $topicQuery->getTopicQueryRecord($this->termType); + $record->matchTermId($termId, true); + } $search = $topicSearchSession->getTopicSearch(); $order = $topicSearchSession->getTopicSearchOrder(); $order->orderByDisplayName(); @@ -777,7 +789,7 @@ public function viewxmlAction($id) * @return array * An array of data about the course offering. */ - protected function getOfferingDataByIdString($idString) + public function getOfferingDataByIdString($idString) { $id = $this->osidIdMap->fromString($idString); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); @@ -794,7 +806,7 @@ protected function getOfferingDataByIdString($idString) * @return array * An array of data about the course offering. */ - protected function getOfferingData(\osid_course_CourseOffering $offering) { + public function getOfferingData(\osid_course_CourseOffering $offering) { $id = $offering->getId(); // Templates can access basic getter methods on the offering itself. diff --git a/application/library/Paginator/Adaptor/CourseOfferingSearch.php b/src/Paginator/CourseOfferingSearchAdaptor.php similarity index 50% rename from application/library/Paginator/Adaptor/CourseOfferingSearch.php rename to src/Paginator/CourseOfferingSearchAdaptor.php index bc84f333..105c5e52 100755 --- a/application/library/Paginator/Adaptor/CourseOfferingSearch.php +++ b/src/Paginator/CourseOfferingSearchAdaptor.php @@ -2,36 +2,45 @@ /** * @since 6/2/09 * - * @copyright Copyright © 2009, Middlebury College + * @copyright Copyright © 2024, Middlebury College * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL) */ +namespace App\Paginator; + /** - * This adapter provides a wrapper to allow usage of the Zend_Paginator with + * This adapter provides a wrapper to allow usage of paginators with * CourseOfferingSearchResults. * - * @since 6/2/09 - * - * @copyright Copyright © 2009, Middlebury College + * @copyright Copyright © 2024, Middlebury College * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL) */ -class Paginator_Adaptor_CourseOfferingSearch implements Zend_Paginator_Adapter_Interface +class CourseOfferingSearchAdaptor { /** * Constructor. * - * @param optional osid_course_CourseOfferingSearch $search - * - * @return void - * - * @since 6/2/09 + * @param \osid_course_CourseOfferingSearchSession $session + * The search session to run searches against. + * @param \osid_course_CourseOfferingQuery $query + * The search query to run to find offerings. + * @param \osid_course_CourseOfferingSearch $search + * An optional search criteria (sorting, limits, etc) to apply to the + * query. + * @param callable $itemsCallback + * An optional callback to apply to each item returned by getItems(). */ - public function __construct(osid_course_CourseOfferingSearchSession $session, osid_course_CourseOfferingQuery $query, ?osid_course_CourseOfferingSearch $search = null) - { + public function __construct( + \osid_course_CourseOfferingSearchSession $session, + \osid_course_CourseOfferingQuery $query, + ?\osid_course_CourseOfferingSearch $search = NULL, + ?callable $itemsCallback = NULL, + ) { $this->session = $session; $this->query = $query; + $this->itemsCallback = $itemsCallback; - if (null === $search) { + if (NULL === $search) { $this->search = $this->session->getCourseOfferingSearch(); } else { $this->search = $search; @@ -68,12 +77,18 @@ public function getItems($offset, $itemCountPerPage) $this->search->limitResultSet($start, $end); $this->results = $this->session->getCourseOfferingsBySearch($this->query, $this->search); - $offerings = []; + $items = []; $list = $this->results->getCourseOfferings(); while ($list->hasNext()) { - $offerings[] = $list->getNextCourseOffering(); + $offering = $list->getNextCourseOffering(); + if ($this->itemsCallback) { + $items[] = call_user_func($this->itemsCallback, $offering); + } + else { + $items[] = $offering; + } } - return $offerings; + return $items; } } diff --git a/src/Paginator/OfferingSearchSubscriber.php b/src/Paginator/OfferingSearchSubscriber.php new file mode 100644 index 00000000..f882106c --- /dev/null +++ b/src/Paginator/OfferingSearchSubscriber.php @@ -0,0 +1,30 @@ +target) || !($event->target instanceof CourseOfferingSearchAdaptor)) { + return; + } + + $event->items = $event->target->getItems($event->getOffset(), $event->getLimit()); + $event->count = $event->target->count(); + $event->stopPropagation(); + } + + public static function getSubscribedEvents(): array + { + return [ + 'knp_pager.items' => ['items', 1/* increased priority to override any internal */] + ]; + } +} diff --git a/symfony.lock b/symfony.lock index 5d78d83e..5216b38e 100644 --- a/symfony.lock +++ b/symfony.lock @@ -8,6 +8,9 @@ "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05" } }, + "knplabs/knp-paginator-bundle": { + "version": "v6.6.1" + }, "php-http/discovery": { "version": "1.19", "recipe": { @@ -117,6 +120,19 @@ "config/routes.yaml" ] }, + "symfony/translation": { + "version": "6.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "6.3", + "ref": "e28e27f53663cc34f0be2837aba18e3a1bef8e7b" + }, + "files": [ + "config/packages/translation.yaml", + "translations/.gitignore" + ] + }, "symfony/twig-bundle": { "version": "6.4", "recipe": { diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index e5afc039..dcc91f11 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -196,293 +196,117 @@ - - - -
- -$this->headScript()->appendFile( - $this->url(array(), null, true).'javascript/jquery.expander.js', - 'text/javascript' -); -$this->headScript()->appendScript( - " - $('document').ready(function() { - $('div.description').expander({ - slicePoint: 140, // default is 100 - expandPrefix: '... ', // text to come before the expand link - expandText: 'read more', // default is 'read more...' - userCollapseText: '[collapse]' // default is '[collapse expanded text]' - }); - }); - ", - 'text/javascript' -); - - $formParams = array( - 'controller' => 'offerings', - 'action' => 'search', - 'term' => null, - 'department' => null, - 'subject' => null, - 'division' => null, - 'requirement' => null, - 'level' => null, - 'days' => null, - 'time_start' => null, - 'time_end' => null, - 'keywords' => null, - 'page' => null, - 'submit' => null - ); -?> - - - - - - - -paginator)) { - -?> -

Results

- -paginator)) { - print "
No Matches
"; -} - -print $this->paginationControl($this->paginator, 'Sliding', 'ItemPaginationControl.phtml', array('search_params' => $this->searchParams)); ?> - +{% if paginator is not null %} +

Results ({{ paginator.getTotalItemCount }})

+{% if not paginator.count %} +
No Matches
+{% else %} +{{ knp_pagination_render(paginator) }} -paginator as $section) { - $offeringParams = array( - 'controller' => 'offerings', - 'action' => 'view', - 'offering' => $this->getStringFromOsidId($section->getId()) - ); - $resourceParams = array( - 'controller' => 'resources', - 'action' => 'view', - 'term' => $this->getStringFromOsidId($term->getId()), - 'offering' => null - ); - - $term = $section->getTerm(); - $termUrl = $this->url(array( - 'controller' => 'terms', - 'action' => 'view', - 'term' => $this->getStringFromOsidId($term->getId()), - 'offering' => null - )); - $topicParams = array( - 'controller' => 'topics', - 'action' => 'view', - 'offering' => null, - 'term' => $this->getStringFromOsidId($term->getId()) - ); - - // Topics - $allTopics = $this->topicListAsArray($section->getTopics()); -?> +{% for item in paginator %} + - +{% endfor %}
- escape($section->getDisplayName()); ?> -hasRecordType($alternateType)) { - $record = $section->getCourseOfferingRecord($alternateType); - if ($record->hasAlternates()) { - if ($record->isPrimary()) { - print " * "; - } - - $alternates = $record->getAlternates(); - print "\n\t\t\t\t
Cross-Listed As:"; - while ($alternates->hasNext()) { - print "\n\t\t\t\t
"; - $alternate = $alternates->getNextCourseOffering(); - $offeringParams['offering'] = $this->getStringFromOsidId($alternate->getId()); - print "url($offeringParams)."\">"; - print $this->escape($alternate->getDisplayName()); - print " "; - if ($alternate->hasRecordType($alternateType)) { - $alternateRecord = $alternate->getCourseOfferingRecord($alternateType); - if ($alternateRecord->isPrimary()) { - print " * "; - } - } - } - } -} - -print "\n\t
"; - -print "\n\t\t
Type:
"; -print "\n\t\t
".$this->escape($section->getGenusType()->getDisplayName())."
"; - -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.instruction_method")); -if (!empty($topics)) { - print "\n\t\t
Course Modality:
"; - print "\n\t\t
"; - foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; - } - print "
"; -} - -print "\n\t\t
Term:
"; -+print "\n\t\t
"; -+// print "\n\t\t\t"; -+print $this->escape($term->getDisplayName()); -+// print ""; -+print "\n\t\t
"; -print "\n\t\t
Department:
"; -print "\n\t\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.department")); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -print "\n\t\t
Requirements Fulfilled:
"; -print "\n\t\t
"; -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.requirement")); -foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; -} -print "
"; - -print "\n\t
"; - -$topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.block")); -if (!empty($topics)) { - print "\n\t\t
Additional Details:
"; - print "\n\t\t
"; - foreach ($topics as $topic) { - $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); - print "url($topicParams)."\">"; - print $this->escape($topic->getDisplayName()); - print " "; - } - print "
"; -} - -?> - - + {{ item.offering.displayname }}{{ item.is_primary ? " * " }} + + {% if item.alternates is not empty %} +
Cross-Listed As: + {% for alternate in item.alternates %} +
+ {{ alternate.displayname }} + {{ alternate.is_primary ? ' * ' }} + {% endfor %} + {% endif %} + +
+
Type:
+
{{ item.offering.genustype.displayname }}
+ + {% if item.instructionMethodTopics is not empty %} +
Course Modality:
+
+ {% for topic in item.instructionMethodTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ {% endif %} + +
Term:
+
{{ item.offering.term.displayname }}
+ +
Department:
+
+ {% for topic in item.departmentTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ +
Requirements Fulfilled:
+
+ {% for topic in item.requirementTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ + {% if item.blockTopics is not empty %} +
Additional Details:
+
+ {% for topic in item.blockTopics %} + {{ topic.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ {% endif %} + +
- bookmarks_CourseId = $section->getCourseId(); - $this->bookmarks_IsCourseSaved = false; print $this->render('schedules/bookmark_control.phtml'); - ?> -
escape($section->getTitle())); ?>
-
getDescription(); ?>
-"; - -$instructorsType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); -if ($section->hasRecordType($instructorsType)) { - $instructorsRecord = $section->getCourseOfferingRecord($instructorsType); - print "\n\t\t
Instructors:
"; - print "\n\t\t
"; - $instructors = $instructorsRecord->getInstructors(); - while ($instructors->hasNext()) { - $instructor = $instructors->getNextResource(); - $resourceParams['resource'] = $this->getStringFromOsidId($instructor->getId()); - print "url($resourceParams)."\">"; - print $this->escape($instructor->getDisplayName()); - print " "; - } - print "
"; -} - -if ($section->hasLocation()) { - print "\n\t\t
Location:
"; - try { - $locationResource = $section->getLocation(); - print "\n\t\t
"; -// $resourceParams['resource'] = $this->getStringFromOsidId($locationResource->getId()); -// print "url($resourceParams)."\">"; - print $this->escape($locationResource->getDisplayName()); -// print " "; - if ($locationResource->getDescription()) - print " (".$this->escape($locationResource->getDescription()).")"; - print "\n\t\t
"; - } catch (osid_OperationFailedException $e) { - print "\n\t\t
".$this->escape($section->getLocationInfo())."
"; - } -} else if ($section->getLocationInfo()) { - print "\n\t\t
Location:
"; - print "\n\t\t
".$this->escape($section->getLocationInfo())."
"; -} - -$scheduleInfo = $section->getScheduleInfo(); -if (!empty($scheduleInfo)) { - print "\n\t\t
Schedule:
"; - print "\n\t\t
".$this->formatScheduleInfo($scheduleInfo)."
"; -} - -$availabilityLink = $this->getAvailabilityLink($section); -if (!empty($availabilityLink)) { - print "\n\t\t
Availability:
"; - print "\n\t\t
"; - print $availabilityLink; - print "\n\t\t
"; -} - -// print "\n\t
Subject:
"; -// print "\n\t\t
"; -// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.subject")); -// foreach ($topics as $topic) { -// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); -// print "url($topicParams)."\">"; -// print $this->escape($topic->getDisplayName()); -// print " "; -// } -// print "
"; - -// print "\n\t\t
Division:
"; -// print "\n\t\t
"; -// $topics = $this->filterTopicsByType($allTopics, new phpkit_type_URNInetType("urn:inet:middlebury.edu:genera:topic.division")); -// foreach ($topics as $topic) { -// $topicParams['topic'] = $this->getStringFromOsidId($topic->getId()); -// print "url($topicParams)."\">"; -// print $this->escape($topic->getDisplayName()); -// print " "; -// } -// print "
"; - -print "\n\t"; - - -?> + +
{{ item.offering.title }}
+
{{ item.offering.description | raw }}
+ +
+ + {% if item.instructors is not null %} +
Instructors:
+
+ {% for instructor in item.instructors %} + {{ instructor.displayname }}{{ not loop.last ? ',' }} + {% endfor %} +
+ {% endif %} + + {% if item.location %} +
Location:
+
+ {{ item.location.displayname }} + {% if item.location.description %} + {{ item.location.description }} + {% endif %} +
+ {% elseif item.offering.locationinfo %} +
Location:
+
{{ item.offering.locationinfo }}
+ {% endif %} + + {% if item.offering.scheduleinfo %} +
Schedule:
+
{{ item.offering.scheduleinfo|nl2br|noWrapParentheticals|raw }}
+ {% endif %} + + {% if item.availabilityLink is not empty %} +
Availability:
+
{{ item.availabilityLink|raw }}
+ {% endif %} + +
+{{ knp_pagination_render(paginator) }} +{% endif %} +{% endif %} -paginationControl($this->paginator, 'Sliding', 'SearchPaginationControl.phtml', array('search_params' => $this->searchParams)); ?> - - diff --git a/translations/.gitignore b/translations/.gitignore new file mode 100644 index 00000000..e69de29b From df327e52ba35dda65b6751f8c23adaf36c0b05db Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 15 Oct 2024 12:20:42 -0400 Subject: [PATCH 045/173] #47: HTML pages now extend the base.html.twig template. --- public/favicon.ico | Bin 0 -> 606 bytes templates/base.html.twig | 4 ++-- templates/catalogs/list.html.twig | 12 ++++++++---- templates/courses/list.html.twig | 12 ++++++++---- templates/courses/view.html.twig | 4 ++++ templates/offerings/search.html.twig | 4 ++++ templates/offerings/view.html.twig | 6 +++++- 7 files changed, 31 insertions(+), 11 deletions(-) create mode 100644 public/favicon.ico diff --git a/public/favicon.ico b/public/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..01fae41739d3bb63007538f300352784dfbe47b2 GIT binary patch literal 606 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;x#X;^) z4C~IxyaaL-l0AZa85pWm85kOx85n;42hu?CQUeBtR|yOZRx=nF#PcV`A9Vw&WlQpQ zcVYMsf(!O8p9~b?EbxddW?!f%*% zDy-8GQq-Ri(eaB#XoJ`hCufc&+rFvtsQh49c_|}#;RKC{j>ld8lQ*2% zp_#tJ%cAZf>%1eoncZLL9f?i7wBnIwRtBeP?#ct7m|0Y176^6z{_$O+Dc|C#lGq37 z_~6FK5bvA24Fp`vF3t*y>U*GcZt0sYGhcu2E$lm`YAiQJyx&MqGIJ}aKRQ9IKYk@7#UcZSXdcaY8x0>85n5RaDkEmLPKtTN@iLmZVeHNn|1*;FnGH9xvXcjTA= literal 0 HcmV?d00001 diff --git a/templates/base.html.twig b/templates/base.html.twig index 1069c147..e5c9e461 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -2,8 +2,8 @@ - {% block title %}Welcome!{% endblock %} - + {% block title %}Course Catalog{% endblock %} + {% block stylesheets %} {% endblock %} diff --git a/templates/catalogs/list.html.twig b/templates/catalogs/list.html.twig index 555055cf..70644f79 100755 --- a/templates/catalogs/list.html.twig +++ b/templates/catalogs/list.html.twig @@ -1,4 +1,8 @@ -{% for catalog in catalogs %} -

{{ catalog.display_name }}

-
{{ catalog.description }}
-{% endfor %} +{% extends 'base.html.twig' %} + +{% block body %} + {% for catalog in catalogs %} +

{{ catalog.display_name }}

+
{{ catalog.description }}
+ {% endfor %} +{% endblock %} diff --git a/templates/courses/list.html.twig b/templates/courses/list.html.twig index f56ddca3..8eb0e98f 100755 --- a/templates/courses/list.html.twig +++ b/templates/courses/list.html.twig @@ -1,4 +1,8 @@ -{% for course in courses %} -

{{ course.displayname }} - {{ course.title }}

-
{{ course.description | raw }}
-{% endfor %} +{% extends 'base.html.twig' %} + +{% block body %} + {% for course in courses %} +

{{ course.displayname }} - {{ course.title }}

+
{{ course.description | raw }}
+ {% endfor %} +{% endblock %} diff --git a/templates/courses/view.html.twig b/templates/courses/view.html.twig index 3b9241db..3de68fda 100755 --- a/templates/courses/view.html.twig +++ b/templates/courses/view.html.twig @@ -1,3 +1,6 @@ +{% extends 'base.html.twig' %} + +{% block body %} print $this->render('schedules/bookmark_control.phtml');
{{ course.displayname }}
@@ -76,3 +79,4 @@ print $this->render('schedules/bookmark_control.phtml'); }, with_context = false )}} +{% endblock %} diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index dcc91f11..6d6cc118 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -1,3 +1,6 @@ +{% extends 'base.html.twig' %} + +{% block body %}
@@ -310,3 +313,4 @@ {% endif %} {% endif %} +{% endblock %} diff --git a/templates/offerings/view.html.twig b/templates/offerings/view.html.twig index 235b10ca..1a4123e9 100755 --- a/templates/offerings/view.html.twig +++ b/templates/offerings/view.html.twig @@ -1,3 +1,6 @@ +{% extends 'base.html.twig' %} + +{% block body %} print $this->render('schedules/bookmark_control.phtml');
{{ offering.displayname }}
@@ -32,7 +35,7 @@ print $this->render('schedules/bookmark_control.phtml');
{{ offering.genustype.displayname }}
{% if instructionMethodTopics is not empty %} -
Schedule:
+
Course Modality:
{% for topic in instructionMethodTopics %} {{ topic.displayname }}{{ not loop.last ? ',' }} @@ -126,3 +129,4 @@ print $this->render('schedules/bookmark_control.phtml'); +{% endblock %} From ea239af2fca3674b294c95a08276164de996415e Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 15 Oct 2024 12:25:01 -0400 Subject: [PATCH 046/173] #47: Add the symfony debug pack with profile tools. As recommended in https://symfonycasts.com/screencast/symfony/profiler --- composer.json | 6 +- composer.lock | 481 +++++++++++++++++++++++++++++- config/bundles.php | 3 + config/packages/debug.yaml | 5 + config/packages/monolog.yaml | 62 ++++ config/packages/web_profiler.yaml | 17 ++ config/routes/web_profiler.yaml | 8 + symfony.lock | 37 +++ 8 files changed, 617 insertions(+), 2 deletions(-) create mode 100644 config/packages/debug.yaml create mode 100644 config/packages/monolog.yaml create mode 100644 config/packages/web_profiler.yaml create mode 100644 config/routes/web_profiler.yaml diff --git a/composer.json b/composer.json index d24c870e..2faf9fcf 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,7 @@ "symfony/dotenv": "6.4.*", "symfony/flex": "^2", "symfony/framework-bundle": "6.4.*", + "symfony/monolog-bundle": "^3.0", "symfony/runtime": "6.4.*", "symfony/twig-bundle": "6.4.*", "symfony/yaml": "6.4.*" @@ -81,6 +82,9 @@ "phpunit/phpunit": "^9.5", "symfony/browser-kit": "6.4.*", "symfony/css-selector": "6.4.*", - "symfony/phpunit-bridge": "^7.1" + "symfony/debug-bundle": "6.4.*", + "symfony/phpunit-bridge": "^7.1", + "symfony/stopwatch": "6.4.*", + "symfony/web-profiler-bundle": "6.4.*" } } diff --git a/composer.lock b/composer.lock index 8bef2e98..7436be25 100644 --- a/composer.lock +++ b/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": "72de8ce57b2dd6e265261aeac148baa3", + "content-hash": "75b330ada3d72cd0ef634e4a4495605f", "packages": [ { "name": "brick/math", @@ -1281,6 +1281,107 @@ }, "time": "2024-06-24T15:18:39+00:00" }, + { + "name": "monolog/monolog", + "version": "3.7.0", + "source": { + "type": "git", + "url": "https://github.com/Seldaek/monolog.git", + "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f4393b648b78a5408747de94fca38beb5f7e9ef8", + "reference": "f4393b648b78a5408747de94fca38beb5f7e9ef8", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/log": "^2.0 || ^3.0" + }, + "provide": { + "psr/log-implementation": "3.0.0" + }, + "require-dev": { + "aws/aws-sdk-php": "^3.0", + "doctrine/couchdb": "~1.0@dev", + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", + "graylog2/gelf-php": "^1.4.2 || ^2.0", + "guzzlehttp/guzzle": "^7.4.5", + "guzzlehttp/psr7": "^2.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "phpstan/phpstan": "^1.9", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-strict-rules": "^1.4", + "phpunit/phpunit": "^10.5.17", + "predis/predis": "^1.1 || ^2", + "ruflin/elastica": "^7", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" + }, + "suggest": { + "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", + "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", + "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", + "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", + "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", + "rollbar/rollbar": "Allow sending log messages to Rollbar", + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Monolog\\": "src/Monolog" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "https://seld.be" + } + ], + "description": "Sends your logs to files, sockets, inboxes, databases and various web services", + "homepage": "https://github.com/Seldaek/monolog", + "keywords": [ + "log", + "logging", + "psr-3" + ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/3.7.0" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2024-06-28T09:40:51+00:00" + }, { "name": "onelogin/php-saml", "version": "4.2.0", @@ -3816,6 +3917,166 @@ ], "time": "2024-09-21T06:02:57+00:00" }, + { + "name": "symfony/monolog-bridge", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/monolog-bridge.git", + "reference": "0fbee64913b1c595e7650a1919ba3edba8d49ea7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/0fbee64913b1c595e7650a1919ba3edba8d49ea7", + "reference": "0fbee64913b1c595e7650a1919ba3edba8d49ea7", + "shasum": "" + }, + "require": { + "monolog/monolog": "^1.25.1|^2|^3", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/console": "<5.4", + "symfony/http-foundation": "<5.4", + "symfony/security-core": "<5.4" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/mailer": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/mime": "^5.4|^6.0|^7.0", + "symfony/security-core": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "type": "symfony-bridge", + "autoload": { + "psr-4": { + "Symfony\\Bridge\\Monolog\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides integration for Monolog with various Symfony components", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/monolog-bridge/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, + { + "name": "symfony/monolog-bundle", + "version": "v3.10.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/monolog-bundle.git", + "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181", + "reference": "414f951743f4aa1fd0f5bf6a0e9c16af3fe7f181", + "shasum": "" + }, + "require": { + "monolog/monolog": "^1.25.1 || ^2.0 || ^3.0", + "php": ">=7.2.5", + "symfony/config": "^5.4 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", + "symfony/http-kernel": "^5.4 || ^6.0 || ^7.0", + "symfony/monolog-bridge": "^5.4 || ^6.0 || ^7.0" + }, + "require-dev": { + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/phpunit-bridge": "^6.3 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\MonologBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony MonologBundle", + "homepage": "https://symfony.com", + "keywords": [ + "log", + "logging" + ], + "support": { + "issues": "https://github.com/symfony/monolog-bundle/issues", + "source": "https://github.com/symfony/monolog-bundle/tree/v3.10.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-11-06T17:08:13+00:00" + }, { "name": "symfony/polyfill-intl-grapheme", "version": "v1.31.0", @@ -7110,6 +7371,80 @@ ], "time": "2024-05-31T14:49:08+00:00" }, + { + "name": "symfony/debug-bundle", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug-bundle.git", + "reference": "689f1bcb0bd3b945e3c671cbd06274b127c64dc9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/689f1bcb0bd3b945e3c671cbd06274b127c64dc9", + "reference": "689f1bcb0bd3b945e3c671cbd06274b127c64dc9", + "shasum": "" + }, + "require": { + "ext-xml": "*", + "php": ">=8.1", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/twig-bridge": "^5.4|^6.0|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" + }, + "conflict": { + "symfony/config": "<5.4", + "symfony/dependency-injection": "<5.4" + }, + "require-dev": { + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/web-profiler-bundle": "^5.4|^6.0|^7.0" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Symfony\\Bundle\\DebugBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/debug-bundle/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, { "name": "symfony/dom-crawler", "version": "v6.4.12", @@ -7259,6 +7594,150 @@ ], "time": "2024-08-13T14:28:19+00:00" }, + { + "name": "symfony/stopwatch", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "63e069eb616049632cde9674c46957819454b8aa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/63e069eb616049632cde9674c46957819454b8aa", + "reference": "63e069eb616049632cde9674c46957819454b8aa", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/service-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, + { + "name": "symfony/web-profiler-bundle", + "version": "v6.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/web-profiler-bundle.git", + "reference": "ef4b8b4f9f51260d18abec40ceacc4bc9c5555e3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/ef4b8b4f9f51260d18abec40ceacc4bc9c5555e3", + "reference": "ef4b8b4f9f51260d18abec40ceacc4bc9c5555e3", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/twig-bundle": "^5.4|^6.0", + "twig/twig": "^2.13|^3.0.4" + }, + "conflict": { + "symfony/form": "<5.4", + "symfony/mailer": "<5.4", + "symfony/messenger": "<5.4", + "symfony/twig-bundle": ">=7.0" + }, + "require-dev": { + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Symfony\\Bundle\\WebProfilerBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a development tool that gives detailed information about the execution of any request", + "homepage": "https://symfony.com", + "keywords": [ + "dev" + ], + "support": { + "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-12T09:55:28+00:00" + }, { "name": "theseer/tokenizer", "version": "1.2.3", diff --git a/config/bundles.php b/config/bundles.php index c9725351..d61950f7 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -4,4 +4,7 @@ Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true], Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true], Knp\Bundle\PaginatorBundle\KnpPaginatorBundle::class => ['all' => true], + Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], + Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], + Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true], ]; diff --git a/config/packages/debug.yaml b/config/packages/debug.yaml new file mode 100644 index 00000000..ad874afd --- /dev/null +++ b/config/packages/debug.yaml @@ -0,0 +1,5 @@ +when@dev: + debug: + # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser. + # See the "server:dump" command to start a new server. + dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%" diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml new file mode 100644 index 00000000..9db7d8a7 --- /dev/null +++ b/config/packages/monolog.yaml @@ -0,0 +1,62 @@ +monolog: + channels: + - deprecation # Deprecations are logged in the dedicated "deprecation" channel when it exists + +when@dev: + monolog: + handlers: + main: + type: stream + path: "%kernel.logs_dir%/%kernel.environment%.log" + level: debug + channels: ["!event"] + # uncomment to get logging in your browser + # you may have to allow bigger header sizes in your Web server configuration + #firephp: + # type: firephp + # level: info + #chromephp: + # type: chromephp + # level: info + console: + type: console + process_psr_3_messages: false + channels: ["!event", "!doctrine", "!console"] + +when@test: + monolog: + handlers: + main: + type: fingers_crossed + action_level: error + handler: nested + excluded_http_codes: [404, 405] + channels: ["!event"] + nested: + type: stream + path: "%kernel.logs_dir%/%kernel.environment%.log" + level: debug + +when@prod: + monolog: + handlers: + main: + type: fingers_crossed + action_level: error + handler: nested + excluded_http_codes: [404, 405] + buffer_size: 50 # How many messages should be saved? Prevent memory leaks + nested: + type: stream + path: php://stderr + level: debug + formatter: monolog.formatter.json + console: + type: console + process_psr_3_messages: false + channels: ["!event", "!doctrine"] + deprecation: + type: stream + channels: [deprecation] + path: php://stderr + formatter: monolog.formatter.json diff --git a/config/packages/web_profiler.yaml b/config/packages/web_profiler.yaml new file mode 100644 index 00000000..b9461110 --- /dev/null +++ b/config/packages/web_profiler.yaml @@ -0,0 +1,17 @@ +when@dev: + web_profiler: + toolbar: true + intercept_redirects: false + + framework: + profiler: + only_exceptions: false + collect_serializer_data: true + +when@test: + web_profiler: + toolbar: false + intercept_redirects: false + + framework: + profiler: { collect: false } diff --git a/config/routes/web_profiler.yaml b/config/routes/web_profiler.yaml new file mode 100644 index 00000000..8d85319f --- /dev/null +++ b/config/routes/web_profiler.yaml @@ -0,0 +1,8 @@ +when@dev: + web_profiler_wdt: + resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml' + prefix: /_wdt + + web_profiler_profiler: + resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml' + prefix: /_profiler diff --git a/symfony.lock b/symfony.lock index 5216b38e..f9a157b2 100644 --- a/symfony.lock +++ b/symfony.lock @@ -61,6 +61,18 @@ "bin/console" ] }, + "symfony/debug-bundle": { + "version": "6.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "5.3", + "ref": "5aa8aa48234c8eb6dbdd7b3cd5d791485d2cec4b" + }, + "files": [ + "config/packages/debug.yaml" + ] + }, "symfony/flex": { "version": "2.4", "recipe": { @@ -92,6 +104,18 @@ "src/Kernel.php" ] }, + "symfony/monolog-bundle": { + "version": "3.10", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "3.7", + "ref": "aff23899c4440dd995907613c1dd709b6f59503f" + }, + "files": [ + "config/packages/monolog.yaml" + ] + }, "symfony/phpunit-bridge": { "version": "7.1", "recipe": { @@ -145,5 +169,18 @@ "config/packages/twig.yaml", "templates/base.html.twig" ] + }, + "symfony/web-profiler-bundle": { + "version": "6.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "6.1", + "ref": "e42b3f0177df239add25373083a564e5ead4e13a" + }, + "files": [ + "config/packages/web_profiler.yaml", + "config/routes/web_profiler.yaml" + ] } } From d3cc1133eaf5156a80a219f71cc625889c503af0 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 15 Oct 2024 12:28:07 -0400 Subject: [PATCH 047/173] #47: Make the symfony console executable. --- bin/console | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/console diff --git a/bin/console b/bin/console old mode 100644 new mode 100755 From fe964e3c9caf4ca12965db824c208ae366388d9a Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 15 Oct 2024 14:40:42 -0400 Subject: [PATCH 048/173] #47: Add the symfony/asset-mapper component to reference images/CSS/JS. Recommended in https://symfonycasts.com/screencast/symfony/asset-mapper --- .gitignore | 5 + assets/app.js | 7 + {public => assets}/favicon.ico | Bin assets/styles/app.css | 1 + composer.json | 5 +- composer.lock | 404 +++++++++++++++++++++++++++++- config/packages/asset_mapper.yaml | 5 + importmap.php | 19 ++ symfony.lock | 15 ++ templates/base.html.twig | 3 +- 10 files changed, 460 insertions(+), 4 deletions(-) create mode 100644 assets/app.js rename {public => assets}/favicon.ico (100%) create mode 100644 assets/styles/app.css create mode 100644 config/packages/asset_mapper.yaml create mode 100644 importmap.php diff --git a/.gitignore b/.gitignore index 5b53f395..42dacfc6 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,8 @@ vendor/ /phpunit.xml .phpunit.result.cache ###< phpunit/phpunit ### + +###> symfony/asset-mapper ### +/public/assets/ +/assets/vendor/ +###< symfony/asset-mapper ### diff --git a/assets/app.js b/assets/app.js new file mode 100644 index 00000000..aec61e69 --- /dev/null +++ b/assets/app.js @@ -0,0 +1,7 @@ +/* + * Welcome to your app's main JavaScript file! + * + * This file will be included onto the page via the importmap() Twig function, + * which should already be in your base.html.twig. + */ +import './styles/app.css'; diff --git a/public/favicon.ico b/assets/favicon.ico similarity index 100% rename from public/favicon.ico rename to assets/favicon.ico diff --git a/assets/styles/app.css b/assets/styles/app.css new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/assets/styles/app.css @@ -0,0 +1 @@ + diff --git a/composer.json b/composer.json index 2faf9fcf..9b65c356 100644 --- a/composer.json +++ b/composer.json @@ -12,6 +12,8 @@ "microsoft/microsoft-graph": "^2.12", "onelogin/php-saml": "^4.2", "symfony/apache-pack": "^1.0", + "symfony/asset": "6.4.*", + "symfony/asset-mapper": "6.4.*", "symfony/console": "6.4.*", "symfony/dotenv": "6.4.*", "symfony/flex": "^2", @@ -60,7 +62,8 @@ "scripts": { "auto-scripts": { "cache:clear": "symfony-cmd", - "assets:install %PUBLIC_DIR%": "symfony-cmd" + "assets:install %PUBLIC_DIR%": "symfony-cmd", + "importmap:install": "symfony-cmd" }, "post-install-cmd": [ "@auto-scripts" diff --git a/composer.lock b/composer.lock index 7436be25..c8e693e7 100644 --- a/composer.lock +++ b/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": "75b330ada3d72cd0ef634e4a4495605f", + "content-hash": "c707fbe1f0fcc6a98e67f1167ed963b5", "packages": [ { "name": "brick/math", @@ -66,6 +66,87 @@ ], "time": "2023-11-29T23:19:16+00:00" }, + { + "name": "composer/semver", + "version": "3.4.3", + "source": { + "type": "git", + "url": "https://github.com/composer/semver.git", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" + }, + "dist": { + "type": "zip", + "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.11", + "symfony/phpunit-bridge": "^3 || ^7" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Composer\\Semver\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nils Adermann", + "email": "naderman@naderman.de", + "homepage": "http://www.naderman.de" + }, + { + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + }, + { + "name": "Rob Bast", + "email": "rob.bast@gmail.com", + "homepage": "http://robbast.nl" + } + ], + "description": "Semver library that offers utilities, version constraint parsing and validation.", + "keywords": [ + "semantic", + "semver", + "validation", + "versioning" + ], + "support": { + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/semver/issues", + "source": "https://github.com/composer/semver/tree/3.4.3" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-09-19T14:15:21+00:00" + }, { "name": "doctrine/annotations", "version": "2.0.2", @@ -2589,6 +2670,154 @@ }, "time": "2017-12-12T01:46:35+00:00" }, + { + "name": "symfony/asset", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/asset.git", + "reference": "c668aa320e26b7379540368832b9d1dd43d32603" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/asset/zipball/c668aa320e26b7379540368832b9d1dd43d32603", + "reference": "c668aa320e26b7379540368832b9d1dd43d32603", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "conflict": { + "symfony/http-foundation": "<5.4" + }, + "require-dev": { + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Asset\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/asset/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, + { + "name": "symfony/asset-mapper", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/asset-mapper.git", + "reference": "36495ec868bff515c3e7006eca54a4aa9f8b8fc3" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/asset-mapper/zipball/36495ec868bff515c3e7006eca54a4aa9f8b8fc3", + "reference": "36495ec868bff515c3e7006eca54a4aa9f8b8fc3", + "shasum": "" + }, + "require": { + "composer/semver": "^3.0", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/filesystem": "^5.4|^6.0|^7.0", + "symfony/http-client": "^6.3|^7.0" + }, + "conflict": { + "symfony/framework-bundle": "<6.4" + }, + "require-dev": { + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher-contracts": "^3.0", + "symfony/finder": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^6.4|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/web-link": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\AssetMapper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Maps directories of assets & makes them available in a public directory with versioned filenames.", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/asset-mapper/tree/v6.4.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-19T08:00:44+00:00" + }, { "name": "symfony/cache", "version": "v6.4.12", @@ -3726,6 +3955,177 @@ ], "time": "2024-09-20T13:34:56+00:00" }, + { + "name": "symfony/http-client", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client.git", + "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client/zipball/fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", + "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/log": "^1|^2|^3", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-client-contracts": "^3.4.1", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "php-http/discovery": "<1.15", + "symfony/http-foundation": "<6.3" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "1.0", + "symfony/http-client-implementation": "3.0" + }, + "require-dev": { + "amphp/amp": "^2.5", + "amphp/http-client": "^4.2.1", + "amphp/http-tunnel": "^1.0", + "amphp/socket": "^1.1", + "guzzlehttp/promises": "^1.4|^2.0", + "nyholm/psr7": "^1.0", + "php-http/httplug": "^1.0|^2.0", + "psr/http-client": "^1.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", + "homepage": "https://symfony.com", + "keywords": [ + "http" + ], + "support": { + "source": "https://github.com/symfony/http-client/tree/v6.4.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-20T08:21:33+00:00" + }, + { + "name": "symfony/http-client-contracts", + "version": "v3.5.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client-contracts.git", + "reference": "20414d96f391677bf80078aa55baece78b82647d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d", + "reference": "20414d96f391677bf80078aa55baece78b82647d", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to HTTP clients", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, { "name": "symfony/http-foundation", "version": "v6.4.12", @@ -7800,5 +8200,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.2.0" } diff --git a/config/packages/asset_mapper.yaml b/config/packages/asset_mapper.yaml new file mode 100644 index 00000000..d1ac653b --- /dev/null +++ b/config/packages/asset_mapper.yaml @@ -0,0 +1,5 @@ +framework: + asset_mapper: + # The paths to make available to the asset mapper. + paths: + - assets/ diff --git a/importmap.php b/importmap.php new file mode 100644 index 00000000..70ebf14f --- /dev/null +++ b/importmap.php @@ -0,0 +1,19 @@ + [ + 'path' => './assets/app.js', + 'entrypoint' => true, + ], +]; diff --git a/symfony.lock b/symfony.lock index f9a157b2..0dbf8739 100644 --- a/symfony.lock +++ b/symfony.lock @@ -49,6 +49,21 @@ "public/.htaccess" ] }, + "symfony/asset-mapper": { + "version": "6.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "6.4", + "ref": "6c28c471640cc2c6e60812ebcb961c526ef8997f" + }, + "files": [ + "assets/app.js", + "assets/styles/app.css", + "config/packages/asset_mapper.yaml", + "importmap.php" + ] + }, "symfony/console": { "version": "6.4", "recipe": { diff --git a/templates/base.html.twig b/templates/base.html.twig index e5c9e461..628cad5e 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -3,11 +3,12 @@ {% block title %}Course Catalog{% endblock %} - + {% block stylesheets %} {% endblock %} {% block javascripts %} + {% block importmap %}{{ importmap('app') }}{% endblock %} {% endblock %} From 2b44014d92d2c150c184e6f22d9a8da9279f77ee Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 15 Oct 2024 15:56:08 -0400 Subject: [PATCH 049/173] #47: Add jquery & jquery-expander to search results for long descriptions. As described in https://symfony.com/doc/current/frontend/asset_mapper.html#importing-3rd-party-javascript-packages the library was added to `assets/vendor/` with: bin/console importmap:require jquery-expander --- assets/offering_search.js | 13 +++ assets/styles/offering_search.css | 0 docroot/javascript/jquery.expander.js | 152 -------------------------- importmap.php | 10 ++ templates/offerings/search.html.twig | 5 + 5 files changed, 28 insertions(+), 152 deletions(-) create mode 100644 assets/offering_search.js create mode 100644 assets/styles/offering_search.css delete mode 100755 docroot/javascript/jquery.expander.js diff --git a/assets/offering_search.js b/assets/offering_search.js new file mode 100644 index 00000000..db661b15 --- /dev/null +++ b/assets/offering_search.js @@ -0,0 +1,13 @@ +import './styles/offering_search.css'; +import $ from 'jquery'; +import expander from 'jquery-expander'; +expander($); + +$('document').ready(function() { + $('div.description').expander({ + slicePoint: 140, // default is 100 + expandPrefix: '... ', // text to come before the expand link + expandText: 'read more', // default is 'read more...' + userCollapseText: '[collapse]' // default is '[collapse expanded text]' + }); +}); diff --git a/assets/styles/offering_search.css b/assets/styles/offering_search.css new file mode 100644 index 00000000..e69de29b diff --git a/docroot/javascript/jquery.expander.js b/docroot/javascript/jquery.expander.js deleted file mode 100755 index f56eef03..00000000 --- a/docroot/javascript/jquery.expander.js +++ /dev/null @@ -1,152 +0,0 @@ -/* - * jQuery Expander plugin - * Version 0.4 (12/09/2008) - * @requires jQuery v1.1.1+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - * - */ - - -(function($) { - - $.fn.expander = function(options) { - - var opts = $.extend({}, $.fn.expander.defaults, options); - var delayedCollapse; - return this.each(function() { - var $this = $(this); - var o = $.meta ? $.extend({}, opts, $this.data()) : opts; - var cleanedTag, startTags, endTags; - var allText = $this.html(); - var startText = allText.slice(0, o.slicePoint).replace(/\w+$/,''); - startTags = startText.match(/<\w[^>]*>/g); - if (startTags) {startText = allText.slice(0,o.slicePoint + startTags.join('').length).replace(/\w+$/,'');} - - if (startText.lastIndexOf('<') > startText.lastIndexOf('>') ) { - startText = startText.slice(0,startText.lastIndexOf('<')); - } - var endText = allText.slice(startText.length); - // create necessary expand/collapse elements if they don't already exist - if (!$('span.details', this).length) { - // end script if text length isn't long enough. - if ( endText.replace(/\s+$/,'').split(' ').length < o.widow ) { return; } - // otherwise, continue... - if (endText.indexOf(' -1) { - endTags = endText.match(/<(\/)?[^>]*>/g); - for (var i=0; i < endTags.length; i++) { - - if (endTags[i].indexOf(' -1) { - var startTag, startTagExists = false; - for (var j=0; j < i; j++) { - startTag = endTags[j].slice(0, endTags[j].indexOf(' ')).replace(/(\w)$/,'$1>'); - if (startTag == rSlash(endTags[i])) { - startTagExists = true; - } - } - if (!startTagExists) { - startText = startText + endTags[i]; - var matched = false; - for (var s=startTags.length - 1; s >= 0; s--) { - if (startTags[s].slice(0, startTags[s].indexOf(' ')).replace(/(\w)$/,'$1>') == rSlash(endTags[i]) - && matched == false) { - cleanedTag = cleanedTag ? startTags[s] + cleanedTag : startTags[s]; - matched = true; - } - }; - } - } - } - - endText = cleanedTag && cleanedTag + endText || endText; - } - $this.html([ - startText, - '', - o.expandPrefix, - '', - o.expandText, - '', - '', - '', - endText, - '' - ].join('') - ); - } - var $thisDetails = $('span.details', this), - $readMore = $('span.read-more', this); - $thisDetails.hide(); - $readMore.find('a').click(function() { - $readMore.hide(); - - if (o.expandEffect === 'show' && !o.expandSpeed) { - o.beforeExpand($this); - $thisDetails.show(); - o.afterExpand($this); - delayCollapse(o, $thisDetails); - } else { - o.beforeExpand($this); - $thisDetails[o.expandEffect](o.expandSpeed, function() { - $thisDetails.css({zoom: ''}); - o.afterExpand($this); - delayCollapse(o, $thisDetails); - }); - } - return false; - }); - if (o.userCollapse) { - $this - .find('span.details').append('' + o.userCollapsePrefix + '' + o.userCollapseText + ''); - $this.find('span.re-collapse a').click(function() { - - clearTimeout(delayedCollapse); - var $detailsCollapsed = $(this).parents('span.details'); - reCollapse($detailsCollapsed); - o.onCollapse($this, true); - return false; - }); - } - }); - function reCollapse(el) { - el.hide() - .prev('span.read-more').show(); - } - function delayCollapse(option, $collapseEl) { - if (option.collapseTimer) { - delayedCollapse = setTimeout(function() { - reCollapse($collapseEl); - option.onCollapse($collapseEl.parent(), false); - }, - option.collapseTimer - ); - } - } - function rSlash(rString) { - return rString.replace(/\//,''); - } - }; - // plugin defaults - $.fn.expander.defaults = { - slicePoint: 100, // the number of characters at which the contents will be sliced into two parts. - // Note: any tag names in the HTML that appear inside the sliced element before - // the slicePoint will be counted along with the text characters. - widow: 4, // a threshold of sorts for whether to initially hide/collapse part of the element's contents. - // If after slicing the contents in two there are fewer words in the second part than - // the value set by widow, we won't bother hiding/collapsing anything. - expandText: 'read more', // text displayed in a link instead of the hidden part of the element. - // clicking this will expand/show the hidden/collapsed text - expandPrefix: '… ', - collapseTimer: 0, // number of milliseconds after text has been expanded at which to collapse the text again - expandEffect: 'fadeIn', - expandSpeed: '', // speed in milliseconds of the animation effect for expanding the text - userCollapse: true, // allow the user to re-collapse the expanded text. - userCollapseText: '[collapse expanded text]', // text to use for the link to re-collapse the text - userCollapsePrefix: ' ', - beforeExpand: function($thisEl) {}, - afterExpand: function($thisEl) {}, - onCollapse: function($thisEl, byUser) {} - }; -})(jQuery); diff --git a/importmap.php b/importmap.php index 70ebf14f..b347e5f4 100644 --- a/importmap.php +++ b/importmap.php @@ -16,4 +16,14 @@ 'path' => './assets/app.js', 'entrypoint' => true, ], + 'offering_search' => [ + 'path' => './assets/offering_search.js', + 'entrypoint' => true, + ], + 'jquery-expander' => [ + 'version' => '2.0.2', + ], + 'jquery' => [ + 'version' => '3.7.1', + ], ]; diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index 6d6cc118..e66d021a 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -1,5 +1,10 @@ {% extends 'base.html.twig' %} +{% block importmap %} + {# do NOT call parent() #} + {{ importmap(['app', 'offering_search']) }} +{% endblock %} + {% block body %}
From 1694994bbe2463bec3c8ab997fcb8eecd858ec50 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 16 Oct 2024 16:27:08 -0400 Subject: [PATCH 050/173] #47: Add SAML authentication via nbgrp/onelogin-saml-bundle. --- .env | 6 + .../resources/Auth/Action/Helper/Auth.php | 124 -- .../Auth/Action/Helper/AuthInterface.php | 82 -- .../resources/Auth/Action/Helper/Cas.php | 202 ---- .../Auth/Action/Helper/CasDirectory.php | 231 ---- .../Action/Helper/MasqueradeInterface.php | 31 - .../Auth/Action/Helper/MicrosoftGraph.php | 467 -------- .../resources/Auth/Action/Helper/NullAuth.php | 117 -- .../resources/Auth/Action/Helper/Saml.php | 353 ------ composer.json | 5 +- composer.lock | 1024 ++++++++++++++++- config/bundles.php | 2 + config/packages/nbgrp_onelogin_saml.yaml | 16 + config/packages/security.yaml | 51 + config/routes.yaml | 3 + config/routes/security.yaml | 3 + src/Security/SamlUser.php | 69 ++ symfony.lock | 16 + 18 files changed, 1131 insertions(+), 1671 deletions(-) delete mode 100755 application/resources/Auth/Action/Helper/Auth.php delete mode 100755 application/resources/Auth/Action/Helper/AuthInterface.php delete mode 100755 application/resources/Auth/Action/Helper/Cas.php delete mode 100755 application/resources/Auth/Action/Helper/CasDirectory.php delete mode 100755 application/resources/Auth/Action/Helper/MasqueradeInterface.php delete mode 100644 application/resources/Auth/Action/Helper/MicrosoftGraph.php delete mode 100755 application/resources/Auth/Action/Helper/NullAuth.php delete mode 100644 application/resources/Auth/Action/Helper/Saml.php create mode 100644 config/packages/nbgrp_onelogin_saml.yaml create mode 100644 config/packages/security.yaml create mode 100644 config/routes/security.yaml create mode 100644 src/Security/SamlUser.php diff --git a/.env b/.env index eb5b0b14..76a3a4b0 100644 --- a/.env +++ b/.env @@ -14,6 +14,12 @@ # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2). # https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration +# Saml Authentication +SAML_IDP_ENTITYID="https://idp.example.edu/abc123" +SAML_IDP_SINGLESIGNONSERVICE="https://idp.example.edu/abc123/saml2" +SAML_IDP_SINGLELOGOUTSERVICE="https://idp.example.edu/abc123/saml2" +SAML_IDP_X509CERT="MIIC...." + ###> symfony/framework-bundle ### APP_ENV=dev APP_SECRET=af0c5e8cb62edd2dd690260da18618a2 diff --git a/application/resources/Auth/Action/Helper/Auth.php b/application/resources/Auth/Action/Helper/Auth.php deleted file mode 100755 index 13655d52..00000000 --- a/application/resources/Auth/Action/Helper/Auth.php +++ /dev/null @@ -1,124 +0,0 @@ -config; - if (!isset($config->authType) || !strlen(trim($config->authType))) { - $authType = 'NullAuth'; - } else { - $authType = $config->authType; - } - - try { - // Use a masquerade auth helper if enabled and in use. - try { - $masqueradeHelper = $this->getMasqueradeHelper(); - if ($masqueradeHelper->isAuthenticated()) { - $this->authHelper = $masqueradeHelper; - $this->initialized = true; - - return; - } - } catch (Exception $e) { - } - - // Use our standard Auth helper. - $this->authHelper = $this->getAuthHelperInstance($authType); - $this->initialized = true; - } catch (Zend_Controller_Action_Exception $e) { - throw new Exception("Can not use authentication type '".$authType."'. ".$e->getMessage()); - } - } - - /** - * Answer an instance of the AuthHelper for the authType specified. - * - * @param string $authType - * - * @return Auth_Action_Helper_AuthInterface - */ - private function getAuthHelperInstance($authType) - { - $authHelper = Zend_Controller_Action_HelperBroker::getStaticHelper($authType); - if (!($authHelper instanceof Auth_Action_Helper_AuthInterface)) { - $class = $authHelper::class; - throw new Exception("Auth helper for auth-type '$authType' has class '$class' which does not implement Auth_Action_Helper_AuthInterface."); - } - - return $authHelper; - } - - /** - * Answer the configured Authentication Helper. - * - * @return Zend_Controller_Action_Helper_Interface - * - * @since 6/14/10 - */ - public function getHelper() - { - if (!$this->initialized) { - $this->init(); - } - - if (null === $this->authHelper) { - throw new Exception("No authentication helper is available. Maybe one wasn't configured.", 450); - } - - return $this->authHelper; - } - - /** - * Answer the configured Authentication Helper. - * - * @return void - * - * @since 6/14/10 - */ - public function direct() - { - return $this->getHelper(); - } - - /** - * Answer the configured Masquerade helper if configured. - * - * Throws an exception if no masquerade helper is available. - * - * @return Auth_Action_Helper_MasqueradeInterface - */ - public function getMasqueradeHelper() - { - $config = Zend_Registry::getInstance()->config; - if (!empty($config->masquerade->enabled) && !empty($config->masquerade->type)) { - return $this->getAuthHelperInstance($config->masquerade->type); - } - throw new Exception('No masquerade auth helper enabled.'); - } -} diff --git a/application/resources/Auth/Action/Helper/AuthInterface.php b/application/resources/Auth/Action/Helper/AuthInterface.php deleted file mode 100755 index fa4d6cf7..00000000 --- a/application/resources/Auth/Action/Helper/AuthInterface.php +++ /dev/null @@ -1,82 +0,0 @@ -config; - - if ($config->cas->debug_file) { - phpCAS::setDebug($config->cas->debug_file); - } - - if (empty($config->cas->host)) { - throw new InvalidArgumentException('cas.host must be configured.'); - } - if (empty($config->cas->port)) { - throw new InvalidArgumentException('cas.port must be configured.'); - } - if (empty($config->cas->path)) { - throw new InvalidArgumentException('cas.path must be configured.'); - } - if (empty($config->cas->service_urls)) { - throw new InvalidArgumentException('cas.service_urls[] must be configured.'); - } - - phpCAS::client( - CAS_VERSION_2_0, - $config->cas->host, - (int) $config->cas->port, - $config->cas->path, - $config->cas->service_urls->toArray(), - false); - - if ($config->cas->server_cert) { - phpCAS::setCasServerCACert($config->cas->server_cert); - } else { - phpCAS::setNoCasServerValidation(); - } - - self::$phpcasInitialized = true; - } - } -} diff --git a/application/resources/Auth/Action/Helper/CasDirectory.php b/application/resources/Auth/Action/Helper/CasDirectory.php deleted file mode 100755 index d8388f52..00000000 --- a/application/resources/Auth/Action/Helper/CasDirectory.php +++ /dev/null @@ -1,231 +0,0 @@ -isAuthenticated()) { - throw new Exception('No user authenticated.'); - } - - return $_SESSION['masquerade.CasDirectory']['id']; - } - - /** - * Answer a name for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return string - */ - public function getUserDisplayName() - { - if (!$this->isAuthenticated()) { - throw new Exception('No user authenticated.'); - } - - return $_SESSION['masquerade.CasDirectory']['name']; - } - - /** - * Answer an email address for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return string - */ - public function getUserEmail() - { - if (!$this->isAuthenticated()) { - throw new Exception('No user authenticated.'); - } - - return $_SESSION['masquerade.CasDirectory']['email']; - } - - /** - * Answer an array of groups for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return array - */ - public function getUserGroups() - { - if (!$this->isAuthenticated()) { - throw new Exception('No user authenticated.'); - } - - return $_SESSION['masquerade.CasDirectory']['memberof']; - } - - /** - * Change to a different user account. Clients are responsible for checking that - * the current user is authorized before calling this method. Clients are also - * responsible for logging. - * - * Throws an exception if unsupported. - * - * @param string $userId - * - * @return void - */ - public function changeUser($userId) - { - $config = Zend_Registry::getInstance()->config; - if (empty($config->masquerade->CasDirectory->url)) { - throw new Exception('No masquerade.CasDirectory.url configured.'); - } - - $extraParams = []; - if (!empty($config->masquerade->CasDirectory->extra_params)) { - parse_str($config->masquerade->CasDirectory->extra_params, $extraParams); - } - - $params = array_merge([ - 'action' => 'get_user', - 'id' => $userId, - ], $extraParams); - $url = $config->masquerade->CasDirectory->url.'?'.http_build_query($params); - - $headers = ['User-Agent: Drupal CAS-MM-Sync']; - if (!empty($config->masquerade->CasDirectory->headers)) { - foreach ($config->masquerade->CasDirectory->headers as $header) { - if (!preg_match('/.+:.+/', $header)) { - throw new Exception('Each element of masquerade.CasDirectory.headers[] must be a "key: value" string.'); - } - $headers[] = $header; - } - } - foreach ($headers as $k => $v) { - $headers[$k] = rtrim($v)."\r\n"; - } - $opts = [ - 'http' => [ - 'header' => implode('', $headers), - ], - ]; - $context = stream_context_create($opts); - $xmlstring = file_get_contents($url, false, $context); - if (empty($xmlstring)) { - throw new Exception('Could not load user information.'); - } - $doc = new DOMDocument(); - if (!$doc->loadXML($xmlstring)) { - throw new Exception('Could not parse user information.'); - } - - $xpath = new DOMXPath($doc); - $xpath->registerNamespace('cas', 'http://www.yale.edu/tp/cas'); - - $id = $xpath->query('/cas:results/cas:entry/cas:user')->item(0)->nodeValue; - if ($id == $userId) { - $_SESSION['masquerade.CasDirectory'] = [ - 'id' => $userId, - ]; - } else { - throw new Exception("Id found didn't match query."); - } - - $name = ''; - $elements = $xpath->query('/cas:results/cas:entry/cas:attribute[@name="FirstName"]'); - if ($elements->length) { - $name .= $elements->item(0)->getAttribute('value'); - } - $name .= ' '; - $elements = $xpath->query('/cas:results/cas:entry/cas:attribute[@name="LastName"]'); - if ($elements->length) { - $name .= $elements->item(0)->getAttribute('value'); - } - if (strlen(trim($name))) { - $_SESSION['masquerade.CasDirectory']['name'] = $name; - } else { - $_SESSION['masquerade.CasDirectory']['name'] = 'name unknown'; - } - - $elements = $xpath->query('/cas:results/cas:entry/cas:attribute[@name="EMail"]'); - if ($elements->length) { - $_SESSION['masquerade.CasDirectory']['email'] = $elements->item(0)->getAttribute('value'); - } else { - $_SESSION['masquerade.CasDirectory']['email'] = ''; - } - - $elements = $xpath->query('/cas:results/cas:entry/cas:attribute[@name="MemberOf"]'); - $_SESSION['masquerade.CasDirectory']['memberof'] = []; - foreach ($elements as $element) { - $_SESSION['masquerade.CasDirectory']['memberof'][] = $element->getAttribute('value'); - } - } -} diff --git a/application/resources/Auth/Action/Helper/MasqueradeInterface.php b/application/resources/Auth/Action/Helper/MasqueradeInterface.php deleted file mode 100755 index 3c52b358..00000000 --- a/application/resources/Auth/Action/Helper/MasqueradeInterface.php +++ /dev/null @@ -1,31 +0,0 @@ -isAuthenticated()) { - throw new Exception('No user authenticated.'); - } - - return $_SESSION['masquerade.MicrosoftGraph']['id']; - } - - /** - * Answer a name for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return string - */ - public function getUserDisplayName() - { - if (!$this->isAuthenticated()) { - throw new Exception('No user authenticated.'); - } - - return $_SESSION['masquerade.MicrosoftGraph']['name']; - } - - /** - * Answer an email address for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return string - */ - public function getUserEmail() - { - if (!$this->isAuthenticated()) { - throw new Exception('No user authenticated.'); - } - - return $_SESSION['masquerade.MicrosoftGraph']['email']; - } - - /** - * Answer an array of groups for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return array - */ - public function getUserGroups() - { - if (!$this->isAuthenticated()) { - throw new Exception('No user authenticated.'); - } - - return $_SESSION['masquerade.MicrosoftGraph']['memberof']; - } - - /** - * Change to a different user account. Clients are responsible for checking that - * the current user is authorized before calling this method. Clients are also - * responsible for logging. - * - * Throws an exception if unsupported. - * - * @param string $userId - * - * @return void - */ - public function changeUser($userId) - { - $user = $this->fetchUserForLogin($userId); - - $properties = $this->extractUserInfo($user); - $_SESSION['masquerade.MicrosoftGraph'] = [ - 'id' => $properties['user_login'], - ]; - - $name = ''; - if (!empty($properties['first_name'])) { - $name .= $properties['first_name'].' '; - } - if (!empty($properties['last_name'])) { - $name .= $properties['last_name']; - } - if (strlen(trim($name))) { - $_SESSION['masquerade.MicrosoftGraph']['name'] = $name; - } else { - $_SESSION['masquerade.MicrosoftGraph']['name'] = 'name unknown'; - } - - if (!empty($properties['user_email'])) { - $_SESSION['masquerade.MicrosoftGraph']['email'] = $properties['user_email']; - } else { - $_SESSION['masquerade.MicrosoftGraph']['email'] = ''; - } - - $_SESSION['masquerade.MicrosoftGraph']['memberof'] = []; - } - - /** - * Answer our already-configured O365 API. - * - * @return Microsoft\Graph\Graph - * The Graph object - */ - protected function getGraph() - { - if (empty($this->graph)) { - $this->graph = new GraphServiceClient( - $this->getTokenRequestContext() - ); - } - - return $this->graph; - } - - /** - * Get an O365 Access token context. - */ - protected function getTokenRequestContext() - { - $config = Zend_Registry::getInstance()->config; - if (empty($config->masquerade->MicrosoftGraph->tenantId)) { - throw new Exception('No masquerade.MicrosoftGraph.tenantId configured.'); - } - if (empty($config->masquerade->MicrosoftGraph->appId)) { - throw new Exception('No masquerade.MicrosoftGraph.appId configured.'); - } - if (empty($config->masquerade->MicrosoftGraph->appSecret)) { - throw new Exception('No masquerade.MicrosoftGraph.appSecret configured.'); - } - - return new ClientCredentialContext( - $config->masquerade->MicrosoftGraph->tenantId, - $config->masquerade->MicrosoftGraph->appId, - $config->masquerade->MicrosoftGraph->appSecret, - ); - } - - /** - * Answer an MS Graph User object matching a login string. - * - * @param string $login - * - * @return User - */ - protected function fetchUserForLogin($login) - { - // First search by the primary unique ID. - try { - return $this->fetchUserByProperty($this->getPrimaryUniqueIdProperty(), $login); - } catch (Exception $e) { - // If we didn't find an account based on the primary id, try a secondary ID if configured. - if (404 == $e->getCode() && !empty($this->getSecondaryUniqueIdProperty())) { - return $this->fetchUserByProperty($this->getSecondaryUniqueIdProperty(), $login); - } else { - // If we don't support secondary ids or get another error, just throw it. - throw $e; - } - } - } - - /** - * Answer an MS Graph User object matching a login string. - * - * @param string $property - * The MSGraph property to match - * @param string $value - * The user-id value to match - * - * @return User - */ - protected function fetchUserByProperty($property, $value) - { - $requestConfig = new UsersRequestBuilderGetRequestConfiguration( - queryParameters: UsersRequestBuilderGetRequestConfiguration::createQueryParameters( - filter: $property." eq '".urlencode($value)."'", - select: $this->getUserGraphProperties(), - orderby: ['displayName'], - top: 10, - count: true - ), - headers: ['ConsistencyLevel' => 'eventual'] - ); - $result = $this->getGraph()->users()->get($requestConfig)->wait(); - $users = []; - foreach ($result->getValue() as $user) { - $users[] = $user; - } - if (count($users) < 1) { - throw new Exception('Could not get user. Expecting 1 entry, found '.count($users).' in AzureAD.', 404); - } elseif (1 === count($users)) { - return $users[0]; - } else { - return $this->getPrimaryAccountFromUserList($users); - } - } - - protected function getUserGraphProperties() - { - return [ - 'id', - 'displayName', - 'mail', - 'givenName', - 'surname', - 'userType', - $this->getPrimaryUniqueIdProperty(), - $this->getSecondaryUniqueIdProperty(), - ]; - } - - /** - * Filter a list of MS Graph User objects to find a single "primary" one. - * - * @param array $users - * The MSGraph User list - * - * @return User - * A single user if one can be determined to be "primary" - */ - protected function getPrimaryAccountFromUserList(array $users) - { - // Give priority to users with the type "Member" over "Guest" or other - // account types. - $memberUsers = []; - foreach ($users as $user) { - if ('member' == strtolower($user->getUserType())) { - $memberUsers[] = $user; - } - } - // If we only have a single user with type "Member", then return that user. - if (1 === count($memberUsers)) { - return $memberUsers[0]; - } - - // Not sure what to do if we have multiple "Member" accounts with the same - // ID or multiple "Guest" accounts with the same ID. - // Perhaps we could do some email filtering or other logic, but hopefully - // this case won't come up. - ob_start(); - foreach ($users as $user) { - $properties = $user->getProperties(); - echo "\n\t
"; - echo "\n\t\t
Primary ID property (".$this->getPrimaryUniqueIdProperty().'):
'.(empty($properties[$this->getPrimaryUniqueIdProperty()]) ? '' : $properties[$this->getPrimaryUniqueIdProperty()]).'
'; - echo "\n\t\t
Secondary ID property (".$this->getSecondaryUniqueIdProperty().'):
'.(empty($properties[$this->getSecondaryUniqueIdProperty()]) ? '' : $properties[$this->getSecondaryUniqueIdProperty()]).'
'; - echo "\n\t\t
User Type:
".$user->getUserType().'
'; - echo "\n\t\t
Mapped username in WordPress:
".$this->getLoginForGraphUser($user).'
'; - echo "\n\t\t
UserPrincipalName:
".$user->getUserPrincipalName().'
'; - echo "\n\t\t
Display Name:
".$user->getDisplayName().'
'; - echo "\n\t\t
Mail:
".$user->getMail().'
'; - echo "\n\t
"; - } - throw new Exception('Could not get single user for ID. Expecting 1 entry, found '.count($users)." users in AzureAD that share an ID and User Type:\n".ob_get_clean()); - } - - /** - * Answer the primary unique-id property key. - * - * @return string - * The property in MS Graph that holds the primary unique-id - */ - protected function getPrimaryUniqueIdProperty() - { - static $primaryUserIdProperty; - if (!isset($primaryUserIdProperty)) { - $config = Zend_Registry::getInstance()->config; - if (empty($config->masquerade->MicrosoftGraph->primaryUserIdProperty)) { - throw new Exception('No masquerade.MicrosoftGraph.primaryUserIdProperty configured.'); - } - $primaryUserIdProperty = $config->masquerade->MicrosoftGraph->primaryUserIdProperty; - } - - return $primaryUserIdProperty; - } - - /** - * Answer the secondary unique-id property key. - * - * @return string - * The property in MS Graph that holds a secondary/fall-back unique-id - */ - protected function getSecondaryUniqueIdProperty() - { - static $secondaryUserIdProperty; - if (!isset($secondaryUserIdProperty)) { - $config = Zend_Registry::getInstance()->config; - if (empty($config->masquerade->MicrosoftGraph->secondaryUserIdProperty)) { - throw new Exception('No masquerade.MicrosoftGraph.secondaryUserIdProperty configured.'); - } - $secondaryUserIdProperty = $config->masquerade->MicrosoftGraph->secondaryUserIdProperty; - } - - return $secondaryUserIdProperty; - } - - /** - * Answer the user info matching an MS Graph User object. - * - * @return array - */ - protected function extractUserInfo(User $user) - { - $info = []; - - $info['user_login'] = $this->getLoginForGraphUser($user); - $info['user_email'] = $user->getMail(); - - preg_match('/^(.+)@(.+)$/', $info['user_email'], $matches); - $emailUser = $matches[1]; - $emailDomain = $matches[2]; - - $info['user_nicename'] = $emailUser; - $info['nickname'] = $user->getGivenName(); - $info['first_name'] = $user->getGivenName(); - $info['last_name'] = $user->getSurname(); - $info['display_name'] = trim($user->getGivenName().' '.$user->getSurname()); - if (empty($info['display_name'])) { - $info['display_name'] = trim($user->getDisplayName()); - } - if (empty($info['display_name'])) { - $info['display_name'] = $emailUser; - } - if (empty($info['nickname'])) { - $info['nickname'] = $emailUser; - } - - return $info; - } - - /** - * Answer the user login matching an MS Graph User object. - * - * @return string - */ - protected function getLoginForGraphUser(User $user) - { - // Primary Unique ID. - $id = $this->getUserProperty($user, $this->getPrimaryUniqueIdProperty()); - if (!empty($id)) { - return $id; - } - // Secondary/Fallback unique ID. - else { - $id = $this->getUserProperty($user, $this->getSecondaryUniqueIdProperty()); - if (!empty($id)) { - return $id; - } else { - throw new Exception('No id could be extracted for user '.$user->getUserPrincipalName()); - } - } - } - - /** - * Answer a property from a User object. - * - * @param User $user - * The user object - * @param string $property - * The property name to fetch - * - * @return mixed - * The property or null - */ - protected function getUserProperty(User $user, $property) - { - $getterMethod = 'get'.ucfirst($property); - if (method_exists($user, $getterMethod)) { - return $user->$getterMethod(); - } else { - $additionalData = $user->getAdditionalData(); - if (!isset($additionalData[$property])) { - throw new Exception("No '$property' could be found for user ".$user->getUserPrincipalName().' in '.print_r($addtionalData, true)); - } - - return $additionalData[$property]; - } - } -} diff --git a/application/resources/Auth/Action/Helper/NullAuth.php b/application/resources/Auth/Action/Helper/NullAuth.php deleted file mode 100755 index fea60a64..00000000 --- a/application/resources/Auth/Action/Helper/NullAuth.php +++ /dev/null @@ -1,117 +0,0 @@ -auth)) { - require_once BASE_PATH.'/vendor/onelogin/php-saml/_toolkit_loader.php'; - $this->auth = new SamlAuth($this->getSamlConfig()); - } - } - - /** - * Answer the SAML configuration. - * - * @return array - */ - protected function getSamlConfig() - { - $config = Zend_Registry::getInstance()->config; - - return [ - // If 'strict' is True, then the PHP Toolkit will reject unsigned - // or unencrypted messages if it expects them to be signed or encrypted. - // Also it will reject the messages if the SAML standard is not strictly - // followed: Destination, NameId, Conditions ... are validated too. - 'strict' => true, - - // Enable debug mode (to print errors). - 'debug' => true, - - // Set a BaseURL to be used instead of try to guess - // the BaseURL of the view that process the SAML Message. - // Ex http://sp.example.com/ - // http://example.com/sp/ - // 'baseurl' => rtrim($this->getAbsoluteUrl(), '/'), - - // Service Provider Data that we are deploying. - 'sp' => [ - // Identifier of the SP entity (must be a URI) - 'entityId' => $this->getAbsoluteUrl(), - // Specifies info about where and how the message MUST be - // returned to the requester, in this case our SP. - 'assertionConsumerService' => [ - // URL Location where the from the IdP will be returned - 'url' => $this->getAbsoluteUrl('/auth/login'), - // SAML protocol binding to be used when returning the - // message. SAML Toolkit supports this endpoint for the - // HTTP-POST binding only. - 'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST', - ], - // Specifies info about where and how the message MUST be - // returned to the requester, in this case our SP. - 'singleLogoutService' => [ - // URL Location where the from the IdP will be returned - 'url' => $this->getAbsoluteUrl('/auth/logout'), - // SAML protocol binding to be used when returning the - // message. SAML Toolkit supports the HTTP-Redirect binding - // only for this endpoint. - 'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect', - ], - /* - * Key rollover - * If you plan to update the SP x509cert and privateKey - * you can define here the new x509cert and it will be - * published on the SP metadata so Identity Providers can - * read them and get ready for rollover. - */ - // 'x509certNew' => '', - ], - - // Identity Provider Data that we want connected with our SP. - 'idp' => [ - // Identifier of the IdP entity (must be a URI) - 'entityId' => $config->saml->idp->entityId, - // SSO endpoint info of the IdP. (Authentication Request protocol) - 'singleSignOnService' => [ - // URL Target of the IdP where the Authentication Request Message - // will be sent. - 'url' => $config->saml->idp->singleSignOnService->url, - // SAML protocol binding to be used when returning the - // message. SAML Toolkit supports the HTTP-Redirect binding - // only for this endpoint. - 'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect', - ], - // SLO endpoint info of the IdP. - 'singleLogoutService' => [ - // URL Location of the IdP where SLO Request will be sent. - 'url' => $config->saml->idp->singleLogoutService->url, - // URL location of the IdP where the SP will send the SLO Response (ResponseLocation) - // if not set, url for the SLO Request will be used - 'responseUrl' => '', - // SAML protocol binding to be used when returning the - // message. SAML Toolkit supports the HTTP-Redirect binding - // only for this endpoint. - 'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect', - ], - // Public x509 certificate of the IdP - 'x509cert' => $config->saml->idp->x509cert, - /* - * Instead of use the whole x509cert you can use a fingerprint in order to - * validate a SAMLResponse, but we don't recommend to use that - * method on production since is exploitable by a collision attack. - * (openssl x509 -noout -fingerprint -in "idp.crt" to generate it, - * or add for example the -sha256 , -sha384 or -sha512 parameter) - * - * If a fingerprint is provided, then the certFingerprintAlgorithm is required in order to - * let the toolkit know which algorithm was used. Possible values: sha1, sha256, sha384 or sha512 - * 'sha1' is the default value. - * - * Notice that if you want to validate any SAML Message sent by the HTTP-Redirect binding, you - * will need to provide the whole x509cert. - */ - // 'certFingerprint' => '', - // 'certFingerprintAlgorithm' => 'sha1', - - /* In some scenarios the IdP uses different certificates for - * signing/encryption, or is under key rollover phase and - * more than one certificate is published on IdP metadata. - * In order to handle that the toolkit offers that parameter. - * (when used, 'x509cert' and 'certFingerprint' values are - * ignored). - */ - // 'x509certMulti' => [ - // 'signing' => [ - // 0 => '', - // ], - // 'encryption' => [ - // 0 => '', - // ], - ], - - // Security settings - 'security' => [ - // Authentication context. - // Set to false and no AuthContext will be sent in the AuthNRequest. - // Set true or don't present this parameter and you will get an AuthContext 'exact' 'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport'. - // Set an array with the possible auth context values: array('urn:oasis:names:tc:SAML:2.0:ac:classes:Password', 'urn:oasis:names:tc:SAML:2.0:ac:classes:X509'). - 'requestedAuthnContext' => false, - ], - ]; - } - - protected function getAbsoluteUrl($path = '/') - { - return 'https://'.$_SERVER['HTTP_HOST'].rtrim($this->getFrontController()->getBaseUrl(), '/').'/'.ltrim($path, '/'); - } - - /** - * Answer true if this authentication method allows login. - * - * @return bool - */ - public function isAuthenticationEnabled() - { - return true; - } - - /** - * Log in. Throw an exception if isAuthenticationEnabled is false. - * - * @param optional string $returnUrl A url to return to after successful login - * - * @return bool TRUE on successful login - */ - public function login($returnUrl = null) - { - $this->init(); - - // Trigger SSO login. - if ('POST' != $_SERVER['REQUEST_METHOD']) { - $this->auth->login($returnUrl); - - return true; - } - // Process SSO response. - else { - if (isset($_SESSION) && isset($_SESSION['AuthNRequestID'])) { - $requestID = $_SESSION['AuthNRequestID']; - } else { - $requestID = null; - } - - $this->auth->processResponse($requestID); - unset($_SESSION['AuthNRequestID']); - - $errors = $this->auth->getErrors(); - if (!empty($errors)) { - throw new Exception('Authentication failed with these errors: '.implode(', ', $errors)); - } - - if (!$this->auth->isAuthenticated()) { - throw new Exception('Authentication failed.'); - } - - $_SESSION['SAML_AUTH_NAMEID'] = $this->auth->getNameId(); - $_SESSION['SAML_AUTH_ATTRIBUTES'] = $this->auth->getAttributes(); - // Redirect to the page we started the Login flow from. - if (isset($_REQUEST['RelayState'])) { - $this->auth->redirectTo(); - } - - return true; - } - } - - /** - * Log out. Throw an exception if isAuthenticationEnabled is false. - * - * @param optional string $returnUrl A url to return to after successful logout - * - * @return void - */ - public function logout($returnUrl = null) - { - unset($_SESSION['SAML_AUTH_NAMEID']); - unset($_SESSION['SAML_AUTH_ATTRIBUTES']); - $this->init(); - $this->auth->logout($returnUrl); - } - - /** - * Answer true if a user is currently authenticated. - * - * @return bool - */ - public function isAuthenticated() - { - if (!empty($_SESSION['SAML_AUTH_NAMEID'])) { - return true; - } - - $this->init(); - - return $this->auth->isAuthenticated(); - } - - /** - * Answer the user id if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return string - */ - public function getUserId() - { - if (!empty($_SESSION['SAML_AUTH_NAMEID'])) { - return $_SESSION['SAML_AUTH_NAMEID']; - } - - if ($this->isAuthenticated()) { - return $this->auth->getNameId(); - } else { - throw new Exception('No user is authenticated, cannot provide a user id.'); - } - } - - /** - * Answer a name for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return string - */ - public function getUserDisplayName() - { - return trim($this->getAttribute('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname')).' '. - trim($this->getAttribute('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname')); - } - - /** - * Answer an email address for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return string - */ - public function getUserEmail() - { - return trim($this->getAttribute('http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress')); - } - - /** - * Answer an array of groups for the user if a user is currently authenticated or throw an Exception - * if isAuthenticated is false. - * - * @return array - */ - public function getUserGroups() - { - return $this->getAttribute('http://schemas.microsoft.com/ws/2008/06/identity/claims/groups', false); - } - - /** - * Answer an attribute from the SAML response. - * - * @param string $name - * The attribute name - * @param bool $singleValue - * Return a single value from the attribute array rather than multiple - * - * @return string|array|null - * The attribute value - */ - protected function getAttribute($name, $singleValue = true) - { - // Prefer attributes stored in the session already. - if (!empty($_SESSION['SAML_AUTH_ATTRIBUTES'])) { - if (empty($_SESSION['SAML_AUTH_ATTRIBUTES'][$name])) { - return null; - } else { - if ($singleValue) { - if (isset($_SESSION['SAML_AUTH_ATTRIBUTES'][$name][0])) { - return $_SESSION['SAML_AUTH_ATTRIBUTES'][$name][0]; - } else { - return null; - } - } else { - return $_SESSION['SAML_AUTH_ATTRIBUTES'][$name]; - } - } - } - // Get the attributes from the current authentication response if - // available. - else { - if ($this->isAuthenticated()) { - return $this->auth->getAttribute($name); - } else { - throw new Exception("No user is authenticated, cannot provide a $name attribute."); - } - } - } -} diff --git a/composer.json b/composer.json index 9b65c356..b6617c9b 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ "ext-iconv": "*", "knplabs/knp-paginator-bundle": "^6.6", "microsoft/microsoft-graph": "^2.12", - "onelogin/php-saml": "^4.2", + "nbgrp/onelogin-saml-bundle": "^1.4", "symfony/apache-pack": "^1.0", "symfony/asset": "6.4.*", "symfony/asset-mapper": "6.4.*", @@ -27,7 +27,8 @@ "allow-plugins": { "php-http/discovery": true, "symfony/flex": true, - "symfony/runtime": true + "symfony/runtime": true, + "tbachert/spi": true }, "sort-packages": true }, diff --git a/composer.lock b/composer.lock index c8e693e7..e3077963 100644 --- a/composer.lock +++ b/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": "c707fbe1f0fcc6a98e67f1167ed963b5", + "content-hash": "0c118d009db42faaebbcbe4a29b50119", "packages": [ { "name": "brick/math", @@ -1263,16 +1263,16 @@ }, { "name": "microsoft/microsoft-graph", - "version": "v2.14.0", + "version": "v2.16.0", "source": { "type": "git", "url": "https://github.com/microsoftgraph/msgraph-sdk-php.git", - "reference": "69182967d397b1a98e68f3888a816141aeabacc0" + "reference": "706c25c117fc2bbd8b781d77e0384f08b3261d64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/69182967d397b1a98e68f3888a816141aeabacc0", - "reference": "69182967d397b1a98e68f3888a816141aeabacc0", + "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/706c25c117fc2bbd8b781d77e0384f08b3261d64", + "reference": "706c25c117fc2bbd8b781d77e0384f08b3261d64", "shasum": "" }, "require": { @@ -1304,9 +1304,9 @@ "homepage": "https://developer.microsoft.com/en-us/graph", "support": { "issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues", - "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/v2.14.0" + "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/v2.16.0" }, - "time": "2024-09-19T07:19:49+00:00" + "time": "2024-10-08T19:25:34+00:00" }, { "name": "microsoft/microsoft-graph-core", @@ -1463,6 +1463,135 @@ ], "time": "2024-06-28T09:40:51+00:00" }, + { + "name": "nbgrp/onelogin-saml-bundle", + "version": "v1.4.0", + "source": { + "type": "git", + "url": "https://github.com/nbgrp/onelogin-saml-bundle.git", + "reference": "3341544e72b699ab69357ab38cee9c80941ce1c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nbgrp/onelogin-saml-bundle/zipball/3341544e72b699ab69357ab38cee9c80941ce1c6", + "reference": "3341544e72b699ab69357ab38cee9c80941ce1c6", + "shasum": "" + }, + "require": { + "onelogin/php-saml": "^4", + "php": "^8.1", + "psr/log": "^1 || ^2 || ^3", + "symfony/config": "^6.4", + "symfony/dependency-injection": "^6.4", + "symfony/deprecation-contracts": "^3", + "symfony/event-dispatcher-contracts": "^3", + "symfony/http-foundation": "^6.4", + "symfony/http-kernel": "^6.4", + "symfony/routing": "^6.4", + "symfony/security-bundle": "^6.4", + "symfony/security-core": "^6.4", + "symfony/security-http": "^6.4" + }, + "require-dev": { + "doctrine/orm": "^2.3 || ^3", + "symfony/event-dispatcher": "^6.4", + "symfony/phpunit-bridge": "^6.4" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Nbgrp\\OneloginSamlBundle\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Alexander Menshchikov", + "email": "alexander.menshchikov@yandex.ru" + } + ], + "description": "OneLogin SAML Symfony Bundle", + "keywords": [ + "SSO", + "multiple IdP", + "onelogin", + "saml" + ], + "support": { + "issues": "https://github.com/nbgrp/onelogin-saml-bundle/issues", + "source": "https://github.com/nbgrp/onelogin-saml-bundle/tree/v1.4.0" + }, + "time": "2023-11-29T12:22:32+00:00" + }, + { + "name": "nyholm/psr7-server", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/Nyholm/psr7-server.git", + "reference": "4335801d851f554ca43fa6e7d2602141538854dc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nyholm/psr7-server/zipball/4335801d851f554ca43fa6e7d2602141538854dc", + "reference": "4335801d851f554ca43fa6e7d2602141538854dc", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0", + "psr/http-factory": "^1.0", + "psr/http-message": "^1.0 || ^2.0" + }, + "require-dev": { + "nyholm/nsa": "^1.1", + "nyholm/psr7": "^1.3", + "phpunit/phpunit": "^7.0 || ^8.5 || ^9.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Nyholm\\Psr7Server\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com" + }, + { + "name": "Martijn van der Ven", + "email": "martijn@vanderven.se" + } + ], + "description": "Helper classes to handle PSR-7 server requests", + "homepage": "http://tnyholm.se", + "keywords": [ + "psr-17", + "psr-7" + ], + "support": { + "issues": "https://github.com/Nyholm/psr7-server/issues", + "source": "https://github.com/Nyholm/psr7-server/tree/1.1.0" + }, + "funding": [ + { + "url": "https://github.com/Zegnat", + "type": "github" + }, + { + "url": "https://github.com/nyholm", + "type": "github" + } + ], + "time": "2023-11-08T09:30:43+00:00" + }, { "name": "onelogin/php-saml", "version": "4.2.0", @@ -1529,33 +1658,36 @@ }, { "name": "open-telemetry/api", - "version": "1.0.3", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/api.git", - "reference": "87de95d926f46262885d0d390060c095af13e2e5" + "reference": "542064815d38a6df55af7957cd6f1d7d967c99c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/87de95d926f46262885d0d390060c095af13e2e5", - "reference": "87de95d926f46262885d0d390060c095af13e2e5", + "url": "https://api.github.com/repos/opentelemetry-php/api/zipball/542064815d38a6df55af7957cd6f1d7d967c99c6", + "reference": "542064815d38a6df55af7957cd6f1d7d967c99c6", "shasum": "" }, "require": { "open-telemetry/context": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^8.1", "psr/log": "^1.1|^2.0|^3.0", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", "symfony/polyfill-php82": "^1.26" }, "conflict": { - "open-telemetry/sdk": "<=1.0.4" + "open-telemetry/sdk": "<=1.0.8" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.0.x-dev" + "dev-main": "1.1.x-dev" + }, + "spi": { + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [ + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager" + ] } }, "autoload": { @@ -1592,26 +1724,24 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-02-06T01:32:25+00:00" + "time": "2024-10-15T22:42:37+00:00" }, { "name": "open-telemetry/context", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/context.git", - "reference": "e9d254a7c89885e63fd2fde54e31e81aaaf52b7c" + "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/e9d254a7c89885e63fd2fde54e31e81aaaf52b7c", - "reference": "e9d254a7c89885e63fd2fde54e31e81aaaf52b7c", + "url": "https://api.github.com/repos/opentelemetry-php/context/zipball/0cba875ea1953435f78aec7f1d75afa87bdbf7f3", + "reference": "0cba875ea1953435f78aec7f1d75afa87bdbf7f3", "shasum": "" }, "require": { - "php": "^7.4 || ^8.0", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", + "php": "^8.1", "symfony/polyfill-php82": "^1.26" }, "suggest": { @@ -1653,47 +1783,54 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-01-13T05:50:44+00:00" + "time": "2024-08-21T00:29:20+00:00" }, { "name": "open-telemetry/sdk", - "version": "1.0.8", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sdk.git", - "reference": "1da4c0ca4f1a3c0fe84b81729dadec16f464fa77" + "reference": "126319e6b3996c609fded69f1e3e9dc1582c64af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/1da4c0ca4f1a3c0fe84b81729dadec16f464fa77", - "reference": "1da4c0ca4f1a3c0fe84b81729dadec16f464fa77", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/126319e6b3996c609fded69f1e3e9dc1582c64af", + "reference": "126319e6b3996c609fded69f1e3e9dc1582c64af", "shasum": "" }, "require": { "ext-json": "*", - "open-telemetry/api": "^1.0", + "nyholm/psr7-server": "^1.1", + "open-telemetry/api": "~1.0 || ~1.1", "open-telemetry/context": "^1.0", "open-telemetry/sem-conv": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^8.1", "php-http/discovery": "^1.14", "psr/http-client": "^1.0", "psr/http-client-implementation": "^1.0", "psr/http-factory-implementation": "^1.0", "psr/http-message": "^1.0.1|^2.0", "psr/log": "^1.1|^2.0|^3.0", + "ramsey/uuid": "^3.0 || ^4.0", "symfony/polyfill-mbstring": "^1.23", - "symfony/polyfill-php80": "^1.26", - "symfony/polyfill-php81": "^1.26", - "symfony/polyfill-php82": "^1.26" + "symfony/polyfill-php82": "^1.26", + "tbachert/spi": "^1.0.1" }, "suggest": { "ext-gmp": "To support unlimited number of synchronous metric readers", - "ext-mbstring": "To increase performance of string operations" + "ext-mbstring": "To increase performance of string operations", + "open-telemetry/sdk-configuration": "File-based OpenTelemetry SDK configuration" }, "type": "library", "extra": { "branch-alias": { "dev-main": "1.0.x-dev" + }, + "spi": { + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\HookManagerInterface": [ + "OpenTelemetry\\API\\Instrumentation\\AutoInstrumentation\\ExtensionHookManager" + ] } }, "autoload": { @@ -1736,7 +1873,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-02-02T03:42:40+00:00" + "time": "2024-10-15T22:42:37+00:00" }, { "name": "open-telemetry/sem-conv", @@ -1847,16 +1984,16 @@ }, { "name": "php-http/discovery", - "version": "1.19.4", + "version": "1.20.0", "source": { "type": "git", "url": "https://github.com/php-http/discovery.git", - "reference": "0700efda8d7526335132360167315fdab3aeb599" + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-http/discovery/zipball/0700efda8d7526335132360167315fdab3aeb599", - "reference": "0700efda8d7526335132360167315fdab3aeb599", + "url": "https://api.github.com/repos/php-http/discovery/zipball/82fe4c73ef3363caed49ff8dd1539ba06044910d", + "reference": "82fe4c73ef3363caed49ff8dd1539ba06044910d", "shasum": "" }, "require": { @@ -1920,9 +2057,9 @@ ], "support": { "issues": "https://github.com/php-http/discovery/issues", - "source": "https://github.com/php-http/discovery/tree/1.19.4" + "source": "https://github.com/php-http/discovery/tree/1.20.0" }, - "time": "2024-03-29T13:00:05+00:00" + "time": "2024-10-02T11:20:13+00:00" }, { "name": "php-http/promise", @@ -2025,6 +2162,54 @@ }, "time": "2021-02-03T23:26:27+00:00" }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, { "name": "psr/container", "version": "2.0.2", @@ -2990,6 +3175,80 @@ ], "time": "2024-04-18T09:32:20+00:00" }, + { + "name": "symfony/clock", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/clock.git", + "reference": "7a4840efd17135cbd547e41ec49fb910ed4f8b98" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/clock/zipball/7a4840efd17135cbd547e41ec49fb910ed4f8b98", + "reference": "7a4840efd17135cbd547e41ec49fb910ed4f8b98", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/clock": "^1.0", + "symfony/polyfill-php83": "^1.28" + }, + "provide": { + "psr/clock-implementation": "1.0" + }, + "type": "library", + "autoload": { + "files": [ + "Resources/now.php" + ], + "psr-4": { + "Symfony\\Component\\Clock\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Decouples applications from the system clock", + "homepage": "https://symfony.com", + "keywords": [ + "clock", + "psr20", + "time" + ], + "support": { + "source": "https://github.com/symfony/clock/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:51:39+00:00" + }, { "name": "symfony/config", "version": "v6.4.8", @@ -3744,22 +4003,25 @@ }, { "name": "symfony/flex", - "version": "v2.4.6", + "version": "v2.4.7", "source": { "type": "git", "url": "https://github.com/symfony/flex.git", - "reference": "4dc11919791f81d087a12db2ab4c7e044431ef6b" + "reference": "92f4fba342161ff36072bd3b8e0b3c6c23160402" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/flex/zipball/4dc11919791f81d087a12db2ab4c7e044431ef6b", - "reference": "4dc11919791f81d087a12db2ab4c7e044431ef6b", + "url": "https://api.github.com/repos/symfony/flex/zipball/92f4fba342161ff36072bd3b8e0b3c6c23160402", + "reference": "92f4fba342161ff36072bd3b8e0b3c6c23160402", "shasum": "" }, "require": { "composer-plugin-api": "^2.1", "php": ">=8.0" }, + "conflict": { + "composer/semver": "<1.7.2" + }, "require-dev": { "composer/composer": "^2.1", "symfony/dotenv": "^5.4|^6.0", @@ -3789,7 +4051,7 @@ "description": "Composer plugin for Symfony", "support": { "issues": "https://github.com/symfony/flex/issues", - "source": "https://github.com/symfony/flex/tree/v2.4.6" + "source": "https://github.com/symfony/flex/tree/v2.4.7" }, "funding": [ { @@ -3805,7 +4067,7 @@ "type": "tidelift" } ], - "time": "2024-04-27T10:22:22+00:00" + "time": "2024-10-07T08:51:54+00:00" }, { "name": "symfony/framework-bundle", @@ -4477,6 +4739,78 @@ ], "time": "2023-11-06T17:08:13+00:00" }, + { + "name": "symfony/password-hasher", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/password-hasher.git", + "reference": "90ebbe946e5d64a5fad9ac9427e335045cf2bd31" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/password-hasher/zipball/90ebbe946e5d64a5fad9ac9427e335045cf2bd31", + "reference": "90ebbe946e5d64a5fad9ac9427e335045cf2bd31", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "conflict": { + "symfony/security-core": "<5.4" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/security-core": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\PasswordHasher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Robin Chalas", + "email": "robin.chalas@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides password hashing utilities", + "homepage": "https://symfony.com", + "keywords": [ + "hashing", + "password" + ], + "support": { + "source": "https://github.com/symfony/password-hasher/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, { "name": "symfony/polyfill-intl-grapheme", "version": "v1.31.0", @@ -4869,24 +5203,184 @@ "time": "2024-09-09T11:45:10+00:00" }, { - "name": "symfony/routing", - "version": "v6.4.12", + "name": "symfony/property-access", + "version": "v6.4.11", "source": { "type": "git", - "url": "https://github.com/symfony/routing.git", - "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f" + "url": "https://github.com/symfony/property-access.git", + "reference": "866f6cd84f2094cbc6f66ce9752faf749916e2a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f", - "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f", + "url": "https://api.github.com/repos/symfony/property-access/zipball/866f6cd84f2094cbc6f66ce9752faf749916e2a9", + "reference": "866f6cd84f2094cbc6f66ce9752faf749916e2a9", "shasum": "" }, "require": { "php": ">=8.1", - "symfony/deprecation-contracts": "^2.5|^3" + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/property-info": "^5.4|^6.0|^7.0" }, - "conflict": { + "require-dev": { + "symfony/cache": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\PropertyAccess\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides functions to read and write from/to an object or array using a simple string notation", + "homepage": "https://symfony.com", + "keywords": [ + "access", + "array", + "extraction", + "index", + "injection", + "object", + "property", + "property-path", + "reflection" + ], + "support": { + "source": "https://github.com/symfony/property-access/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-30T16:10:11+00:00" + }, + { + "name": "symfony/property-info", + "version": "v6.4.10", + "source": { + "type": "git", + "url": "https://github.com/symfony/property-info.git", + "reference": "edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/property-info/zipball/edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77", + "reference": "edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/string": "^5.4|^6.0|^7.0" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "<5.2", + "phpdocumentor/type-resolver": "<1.5.1", + "symfony/dependency-injection": "<5.4", + "symfony/serializer": "<6.4" + }, + "require-dev": { + "phpdocumentor/reflection-docblock": "^5.2", + "phpstan/phpdoc-parser": "^1.0", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\PropertyInfo\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Kévin Dunglas", + "email": "dunglas@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Extracts information about PHP class' properties using metadata of popular sources", + "homepage": "https://symfony.com", + "keywords": [ + "doctrine", + "phpdoc", + "property", + "symfony", + "type", + "validator" + ], + "support": { + "source": "https://github.com/symfony/property-info/tree/v6.4.10" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-07-26T07:32:07+00:00" + }, + { + "name": "symfony/routing", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/routing.git", + "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f", + "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "conflict": { "doctrine/annotations": "<1.12", "symfony/config": "<6.2", "symfony/dependency-injection": "<5.4", @@ -5030,6 +5524,360 @@ ], "time": "2024-09-19T13:29:10+00:00" }, + { + "name": "symfony/security-bundle", + "version": "v6.4.11", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-bundle.git", + "reference": "620be16fceded671823ce6332d06f44bb327096d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/620be16fceded671823ce6332d06f44bb327096d", + "reference": "620be16fceded671823ce6332d06f44bb327096d", + "shasum": "" + }, + "require": { + "composer-runtime-api": ">=2.1", + "ext-xml": "*", + "php": ">=8.1", + "symfony/clock": "^6.3|^7.0", + "symfony/config": "^6.1|^7.0", + "symfony/dependency-injection": "^6.4.11|^7.1.4", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^6.2|^7.0", + "symfony/http-kernel": "^6.2", + "symfony/password-hasher": "^5.4|^6.0|^7.0", + "symfony/security-core": "^6.2|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/security-http": "^6.3.6|^7.0", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/browser-kit": "<5.4", + "symfony/console": "<5.4", + "symfony/framework-bundle": "<6.4", + "symfony/http-client": "<5.4", + "symfony/ldap": "<5.4", + "symfony/serializer": "<6.4", + "symfony/twig-bundle": "<5.4", + "symfony/validator": "<6.4" + }, + "require-dev": { + "symfony/asset": "^5.4|^6.0|^7.0", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/css-selector": "^5.4|^6.0|^7.0", + "symfony/dom-crawler": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/form": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^6.4|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/ldap": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0", + "symfony/serializer": "^6.4|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "symfony/twig-bridge": "^5.4|^6.0|^7.0", + "symfony/twig-bundle": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/yaml": "^5.4|^6.0|^7.0", + "twig/twig": "^2.13|^3.0.4", + "web-token/jwt-checker": "^3.1", + "web-token/jwt-signature-algorithm-ecdsa": "^3.1", + "web-token/jwt-signature-algorithm-eddsa": "^3.1", + "web-token/jwt-signature-algorithm-hmac": "^3.1", + "web-token/jwt-signature-algorithm-none": "^3.1", + "web-token/jwt-signature-algorithm-rsa": "^3.1" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Symfony\\Bundle\\SecurityBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a tight integration of the Security component into the Symfony full-stack framework", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/security-bundle/tree/v6.4.11" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-20T11:22:16+00:00" + }, + { + "name": "symfony/security-core", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-core.git", + "reference": "8c7e52155262b3ef6b7885f6d9bd90fb24eaa66f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-core/zipball/8c7e52155262b3ef6b7885f6d9bd90fb24eaa66f", + "reference": "8c7e52155262b3ef6b7885f6d9bd90fb24eaa66f", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/event-dispatcher-contracts": "^2.5|^3", + "symfony/password-hasher": "^5.4|^6.0|^7.0", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/event-dispatcher": "<5.4", + "symfony/http-foundation": "<5.4", + "symfony/ldap": "<5.4", + "symfony/security-guard": "<5.4", + "symfony/translation": "<5.4.35|>=6.0,<6.3.12|>=6.4,<6.4.3|>=7.0,<7.0.3", + "symfony/validator": "<5.4" + }, + "require-dev": { + "psr/cache": "^1.0|^2.0|^3.0", + "psr/container": "^1.1|^2.0", + "psr/log": "^1|^2|^3", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0", + "symfony/ldap": "^5.4|^6.0|^7.0", + "symfony/string": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4.35|~6.3.12|^6.4.3|^7.0.3", + "symfony/validator": "^6.4|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Security\\Core\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Security Component - Core Library", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/security-core/tree/v6.4.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-20T08:21:33+00:00" + }, + { + "name": "symfony/security-csrf", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-csrf.git", + "reference": "f46ab02b76311087873257071559edcaf6d7ab99" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-csrf/zipball/f46ab02b76311087873257071559edcaf6d7ab99", + "reference": "f46ab02b76311087873257071559edcaf6d7ab99", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/security-core": "^5.4|^6.0|^7.0" + }, + "conflict": { + "symfony/http-foundation": "<5.4" + }, + "require-dev": { + "symfony/http-foundation": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Security\\Csrf\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Security Component - CSRF Library", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/security-csrf/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, + { + "name": "symfony/security-http", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/security-http.git", + "reference": "f6df97af71943cda726dc852335204eac02a716b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/security-http/zipball/f6df97af71943cda726dc852335204eac02a716b", + "reference": "f6df97af71943cda726dc852335204eac02a716b", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-foundation": "^6.2|^7.0", + "symfony/http-kernel": "^6.3|^7.0", + "symfony/polyfill-mbstring": "~1.0", + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/security-core": "^6.4|^7.0", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/clock": "<6.3", + "symfony/event-dispatcher": "<5.4.9|>=6,<6.0.9", + "symfony/http-client-contracts": "<3.0", + "symfony/security-bundle": "<5.4", + "symfony/security-csrf": "<5.4" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/clock": "^6.3|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/http-client-contracts": "^3.0", + "symfony/rate-limiter": "^5.4|^6.0|^7.0", + "symfony/routing": "^5.4|^6.0|^7.0", + "symfony/security-csrf": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "web-token/jwt-checker": "^3.1", + "web-token/jwt-signature-algorithm-ecdsa": "^3.1" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Security\\Http\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Security Component - HTTP Integration", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/security-http/tree/v6.4.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-20T08:18:25+00:00" + }, { "name": "symfony/service-contracts", "version": "v3.5.0", @@ -5799,6 +6647,58 @@ ], "time": "2024-09-17T12:47:12+00:00" }, + { + "name": "tbachert/spi", + "version": "v1.0.2", + "source": { + "type": "git", + "url": "https://github.com/Nevay/spi.git", + "reference": "2ddfaf815dafb45791a61b08170de8d583c16062" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Nevay/spi/zipball/2ddfaf815dafb45791a61b08170de8d583c16062", + "reference": "2ddfaf815dafb45791a61b08170de8d583c16062", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^2.0", + "composer/semver": "^1.0 || ^2.0 || ^3.0", + "php": "^8.1" + }, + "require-dev": { + "composer/composer": "^2.0", + "infection/infection": "^0.27.9", + "phpunit/phpunit": "^10.5", + "psalm/phar": "^5.18" + }, + "type": "composer-plugin", + "extra": { + "branch-alias": { + "dev-main": "0.2.x-dev" + }, + "class": "Nevay\\SPI\\Composer\\Plugin", + "plugin-optional": true + }, + "autoload": { + "psr-4": { + "Nevay\\SPI\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "Service provider loading facility", + "keywords": [ + "service provider" + ], + "support": { + "issues": "https://github.com/Nevay/spi/issues", + "source": "https://github.com/Nevay/spi/tree/v1.0.2" + }, + "time": "2024-10-04T16:36:12+00:00" + }, { "name": "twig/twig", "version": "v3.14.0", @@ -6079,16 +6979,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.2.0", + "version": "v5.3.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb" + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", - "reference": "23c79fbbfb725fb92af9bcf41065c8e9a0d49ddb", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", "shasum": "" }, "require": { @@ -6131,9 +7031,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.2.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" }, - "time": "2024-09-15T16:40:33+00:00" + "time": "2024-10-08T18:51:32+00:00" }, { "name": "phar-io/manifest", diff --git a/config/bundles.php b/config/bundles.php index d61950f7..c249da0e 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -7,4 +7,6 @@ Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true], Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true], Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true], + Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], + Nbgrp\OneloginSamlBundle\NbgrpOneloginSamlBundle::class => ['all' => true], ]; diff --git a/config/packages/nbgrp_onelogin_saml.yaml b/config/packages/nbgrp_onelogin_saml.yaml new file mode 100644 index 00000000..0f7f0df1 --- /dev/null +++ b/config/packages/nbgrp_onelogin_saml.yaml @@ -0,0 +1,16 @@ +# If you need to set more values beyond the 4 specified in the environmental +# variables, copy this file to config/packages//nbgrp_onelogin_saml.yaml +# and put in values that match your IDP & application (SP). +# +# The configuration parameters available are documented at: +# https://github.com/nbgrp/onelogin-saml-bundle?tab=readme-ov-file#configuration +nbgrp_onelogin_saml: + onelogin_settings: + default: + idp: + entityId: '%env(SAML_IDP_ENTITYID)%' + singleSignOnService: + url: '%env(SAML_IDP_SINGLESIGNONSERVICE)%' + singleLogoutService: + url: '%env(SAML_IDP_SINGLELOGOUTSERVICE)%' + x509cert: '%env(SAML_IDP_X509CERT)%' diff --git a/config/packages/security.yaml b/config/packages/security.yaml new file mode 100644 index 00000000..5393dca0 --- /dev/null +++ b/config/packages/security.yaml @@ -0,0 +1,51 @@ +security: + # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords + password_hashers: + Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto' + # https://symfony.com/doc/current/security.html#loading-the-user-the-user-provider + providers: + saml_provider: + ## Basic provider instantiates a user with identifier and default roles + saml: + user_class: 'App\Security\SamlUser' + default_roles: ['ROLE_USER'] + + firewalls: + dev: + pattern: ^/(_(profiler|wdt)|css|images|js)/ + security: false + main: + lazy: true + pattern: ^/ + saml: + check_path: saml_acs + login_path: saml_login + logout: + path: saml_logout + + # activate different ways to authenticate + # https://symfony.com/doc/current/security.html#the-firewall + + # https://symfony.com/doc/current/security/impersonating_user.html + # switch_user: true + + # Easy way to control access for large sections of your site + # Note: Only the *first* access control that matches will be used + access_control: + - { path: ^/admin, roles: ROLE_ADMIN } + - { path: ^/saml/(metadata|login|acs|logout), roles: PUBLIC_ACCESS } + - { path: ^/schedules, roles: ROLE_USER } + - { path: ^/, roles: PUBLIC_ACCESS } + +when@test: + security: + password_hashers: + # By default, password hashers are resource intensive and take time. This is + # important to generate secure password hashes. In tests however, secure hashes + # are not important, waste resources and increase test times. The following + # reduces the work factor to the lowest possible values. + Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: + algorithm: auto + cost: 4 # Lowest possible value for bcrypt + time_cost: 3 # Lowest possible value for argon + memory_cost: 10 # Lowest possible value for argon diff --git a/config/routes.yaml b/config/routes.yaml index 41ef8140..004377bf 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -3,3 +3,6 @@ controllers: path: ../src/Controller/ namespace: App\Controller type: attribute + +nbgrp_saml: + resource: "@NbgrpOneloginSamlBundle/Resources/config/routes.php" diff --git a/config/routes/security.yaml b/config/routes/security.yaml new file mode 100644 index 00000000..f853be15 --- /dev/null +++ b/config/routes/security.yaml @@ -0,0 +1,3 @@ +_security_logout: + resource: security.route_loader.logout + type: service diff --git a/src/Security/SamlUser.php b/src/Security/SamlUser.php new file mode 100644 index 00000000..adfa23b9 --- /dev/null +++ b/src/Security/SamlUser.php @@ -0,0 +1,69 @@ +id = $id; + } + + public function setSamlAttributes(array $attributes): void + { + if (!empty($attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'][0])) { + $this->email = $attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress'][0]; + } + if (!empty($attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname'][0])) { + $this->givenName = $attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname'][0]; + } + if (!empty($attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname'][0])) { + $this->surname = $attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname'][0]; + } + + } + + /** + * Returns the roles granted to the user. + * + * public function getRoles() + * { + * return ['ROLE_USER']; + * } + * + * Alternatively, the roles might be stored in a ``roles`` property, + * and populated in any number of different ways when the user object + * is created. + * + * @return string[] + */ + public function getRoles(): array { + return ['ROLE_USER']; + } + + /** + * Removes sensitive data from the user. + * + * This is important if, at any given point, sensitive information like + * the plain-text password is stored on this object. + * + * @return void + */ + public function eraseCredentials() { + // Nothing to do. + } + + /** + * Returns the identifier for this user (e.g. username or email address). + */ + public function getUserIdentifier(): string { + return $this->id; + } +} diff --git a/symfony.lock b/symfony.lock index 0dbf8739..57f58de8 100644 --- a/symfony.lock +++ b/symfony.lock @@ -11,6 +11,9 @@ "knplabs/knp-paginator-bundle": { "version": "v6.6.1" }, + "nbgrp/onelogin-saml-bundle": { + "version": "v1.4.0" + }, "php-http/discovery": { "version": "1.19", "recipe": { @@ -159,6 +162,19 @@ "config/routes.yaml" ] }, + "symfony/security-bundle": { + "version": "6.4", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "6.4", + "ref": "2ae08430db28c8eb4476605894296c82a642028f" + }, + "files": [ + "config/packages/security.yaml", + "config/routes/security.yaml" + ] + }, "symfony/translation": { "version": "6.4", "recipe": { From 41b8231a41497ab114d998b35274ab731c90961c Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 17 Oct 2024 11:06:28 -0400 Subject: [PATCH 051/173] #47: Fix undefined parameters when search form is loaded without args. --- src/Controller/Offerings.php | 3 +++ templates/offerings/search.html.twig | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index d3e51a58..e526a7bc 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -430,6 +430,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) } } + $data['selectedDepartmentId'] = NULL; if ($request->get('department')) { if (is_array($request->get('department'))) { $departments = $request->get('department'); @@ -450,6 +451,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) } } + $data['selectedSubjectId'] = NULL; if ($request->get('subject')) { if (is_array($request->get('subject'))) { $subjects = $request->get('subject'); @@ -470,6 +472,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) } } + $data['selectedDivisionId'] = NULL; if ($request->get('division')) { if (is_array($request->get('division'))) { $divisions = $request->get('division'); diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index e66d021a..ce7ab776 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -30,12 +30,12 @@ {% for topic in subjects %} - + {% endfor %} {% for topic in departments %} - + {% endfor %} From 3d55d0a77e6a1d15d1b51af43d734c6cd8c01679 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 18 Oct 2024 14:34:46 -0400 Subject: [PATCH 052/173] #47: Migrate bookmarks control, add Doctrine/DBAL for database access. --- .env | 10 + .../controllers/BookmarksController.php | 76 - application/library/Bookmarks.php | 179 -- .../scripts/schedules/bookmark_control.phtml | 87 - assets/app.js | 1 + assets/bookmarks.js | 33 + .../Crystal_Clear_action_bookmark.png | Bin .../Crystal_Clear_action_bookmark_Silver.png | Bin .../images/Crystal_Clear/README.txt | 0 {docroot => assets}/images/arrow_cross.png | Bin {docroot => assets}/images/catalog_header.jpg | Bin .../images/catalog_header_plain.jpg | Bin assets/styles/bookmarks.css | 15 + compose.yaml | 13 + composer.json | 5 + composer.lock | 1585 +++++++++++++++-- config/bundles.php | 3 + config/packages/doctrine.yaml | 50 + config/packages/doctrine_migrations.yaml | 6 + config/services.yaml | 3 + docroot/2d/StyleSheets/CatalogStyles.css | 16 - importmap.php | 3 + migrations/.gitignore | 0 src/Controller/Bookmarks.php | 78 + src/Entity/.gitignore | 0 src/Repository/.gitignore | 0 src/Service/Bookmarks.php | 172 ++ src/Twig/BookmarksExtension.php | 35 + symfony.lock | 36 + templates/courses/view.html.twig | 2 +- templates/offerings/search.html.twig | 8 +- templates/offerings/view.html.twig | 2 +- .../schedules/bookmark_control.html.twig | 23 + 33 files changed, 1958 insertions(+), 483 deletions(-) delete mode 100755 application/controllers/BookmarksController.php delete mode 100755 application/library/Bookmarks.php delete mode 100755 application/views/scripts/schedules/bookmark_control.phtml create mode 100644 assets/bookmarks.js rename {docroot => assets}/images/Crystal_Clear/Crystal_Clear_action_bookmark.png (100%) rename {docroot => assets}/images/Crystal_Clear/Crystal_Clear_action_bookmark_Silver.png (100%) rename {docroot => assets}/images/Crystal_Clear/README.txt (100%) rename {docroot => assets}/images/arrow_cross.png (100%) rename {docroot => assets}/images/catalog_header.jpg (100%) rename {docroot => assets}/images/catalog_header_plain.jpg (100%) create mode 100644 assets/styles/bookmarks.css create mode 100644 compose.yaml create mode 100644 config/packages/doctrine.yaml create mode 100644 config/packages/doctrine_migrations.yaml create mode 100644 migrations/.gitignore create mode 100755 src/Controller/Bookmarks.php create mode 100644 src/Entity/.gitignore create mode 100644 src/Repository/.gitignore create mode 100755 src/Service/Bookmarks.php create mode 100644 src/Twig/BookmarksExtension.php create mode 100755 templates/schedules/bookmark_control.html.twig diff --git a/.env b/.env index 76a3a4b0..d79d3f9b 100644 --- a/.env +++ b/.env @@ -24,3 +24,13 @@ SAML_IDP_X509CERT="MIIC...." APP_ENV=dev APP_SECRET=af0c5e8cb62edd2dd690260da18618a2 ###< symfony/framework-bundle ### + +###> doctrine/doctrine-bundle ### +# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url +# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml +# +# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db" +# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4" +DATABASE_URL="mysql://symfony:symfony@database:3306/symfony?serverVersion=10.3.27-MariaDB&charset=utf8mb4" +# DATABASE_URL="postgresql://app:!ChangeMe!@127.0.0.1:5432/app?serverVersion=16&charset=utf8" +###< doctrine/doctrine-bundle ### diff --git a/application/controllers/BookmarksController.php b/application/controllers/BookmarksController.php deleted file mode 100755 index 88ea1d44..00000000 --- a/application/controllers/BookmarksController.php +++ /dev/null @@ -1,76 +0,0 @@ -bookmarks = $this->_helper->bookmarks(); - - // Verify our CSRF key - if (!$this->_getParam('csrf_key') == $this->_helper->csrfKey()) { - throw new PermissionDeniedException('Invalid CSRF Key. Please log in again.'); - } - - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(true); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); - - echo ''; - } - - /** - * Bookmark a course. - * - * @return void - * - * @since 7/29/10 - */ - public function addAction() - { - $idString = $this->_getParam('course'); - if (!$idString) { - throw new InvalidArgumentException('No Course Id specified.'); - } - $id = $this->_helper->osidId->fromString($idString); - - $this->bookmarks->add($id); - - echo ''; - echo ''; - echo ''; - } - - /** - * Remove a course bookmark. - * - * @return void - * - * @since 7/29/10 - */ - public function removeAction() - { - $idString = $this->_getParam('course'); - if (!$idString) { - throw new InvalidArgumentException('No Course Id specified.'); - } - $id = $this->_helper->osidId->fromString($idString); - - $this->bookmarks->remove($id); - - echo ''; - echo ''; - echo ''; - } -} diff --git a/application/library/Bookmarks.php b/application/library/Bookmarks.php deleted file mode 100755 index 5d36783e..00000000 --- a/application/library/Bookmarks.php +++ /dev/null @@ -1,179 +0,0 @@ -db = $db; - $this->userId = $userId; - $this->courseManager = $courseManager; - } - - private $db; - private $userId; - - /** - * Add a bookmark. - * - * @return void - * - * @since 7/29/10 - */ - public function add(osid_id_Id $courseId) - { - $stmt = $this->db->prepare('INSERT INTO user_savedcourses (user_id, course_id_keyword, course_id_authority, course_id_namespace) VALUES (?, ?, ?, ?);'); - try { - $stmt->execute([ - $this->userId, - $courseId->getIdentifier(), - $courseId->getAuthority(), - $courseId->getIdentifierNamespace(), - ]); - } catch (Zend_Db_Statement_Exception $e) { - if (23000 == $e->getCode()) { - throw new Exception('Bookmark already added.', 23000); - } else { - throw $e; - } - } - } - - /** - * Remove a bookmark. - * - * @return void - * - * @since 7/29/10 - */ - public function remove(osid_id_Id $courseId) - { - $stmt = $this->db->prepare('DELETE FROM user_savedcourses WHERE user_id = ? AND course_id_keyword = ? AND course_id_authority = ? AND course_id_namespace = ? LIMIT 1;'); - $stmt->execute([ - $this->userId, - $courseId->getIdentifier(), - $courseId->getAuthority(), - $courseId->getIdentifierNamespace(), - ]); - } - - /** - * Answer true if the course Id passed is bookmarked. - * - * @return bool - * - * @since 7/29/10 - */ - public function isBookmarked(osid_id_Id $courseId) - { - $stmt = $this->db->prepare('SELECT COUNT(*) as is_bookmarked FROM user_savedcourses WHERE user_id = ? AND course_id_keyword = ? AND course_id_authority = ? AND course_id_namespace = ?'); - $stmt->execute([ - $this->userId, - $courseId->getIdentifier(), - $courseId->getAuthority(), - $courseId->getIdentifierNamespace(), - ]); - $num = (int) $stmt->fetchColumn(); - - return $num > 0; - } - - /** - * Answer an array of all bookmarked courseIds. - * - * @return osid_id_IdList - * - * @since 7/30/10 - */ - public function getAllBookmarkedCourseIds() - { - $stmt = $this->db->prepare('SELECT * FROM user_savedcourses WHERE user_id = ?'); - $stmt->execute([ - $this->userId, - ]); - $ids = []; - foreach ($stmt->fetchAll() as $row) { - $ids[] = new phpkit_id_Id($row['course_id_authority'], $row['course_id_namespace'], $row['course_id_keyword']); - } - - return new phpkit_id_ArrayIdList($ids); - } - - /** - * Answer an array of all bookmarked courses. - * - * @return osid_course_CourseList - * - * @since 7/30/10 - */ - public function getAllBookmarkedCourses() - { - $courseIdList = $this->getAllBookmarkedCourseIds(); - if (!$courseIdList->hasNext()) { - return new phpkit_course_ArrayCourseList([]); - } - - $courseLookupSession = $this->courseManager->getCourseLookupSession(); - $courseLookupSession->useFederatedCourseCatalogView(); - - return $courseLookupSession->getCoursesByIds($courseIdList); - } - - /** - * Answer an array of all bookmarked courses that match a given catalog and term. - * - * @return osid_course_CourseList - * - * @since 7/30/10 - */ - public function getBookmarkedCoursesInCatalogForTerm(osid_id_Id $catalogId, osid_id_Id $termId) - { - $courseIdList = $this->getAllBookmarkedCourseIds(); - if (!$courseIdList->hasNext()) { - return new phpkit_course_ArrayCourseList([]); - } - - $searchSession = $this->courseManager->getCourseSearchSessionForCatalog($catalogId); - - $search = $searchSession->getCourseSearch(); - $search->searchAmongCourses($courseIdList); - - $query = $searchSession->getCourseQuery(); - $record = $query->getCourseQueryRecord(new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:term')); - $record->matchTermId($termId, true); - - // Limit to just active courses - $query->matchGenusType(new phpkit_type_URNInetType('urn:inet:middlebury.edu:status-active'), true); - - $results = $searchSession->getCoursesBySearch($query, $search); - - return $results->getCourses(); - } -} diff --git a/application/views/scripts/schedules/bookmark_control.phtml b/application/views/scripts/schedules/bookmark_control.phtml deleted file mode 100755 index dead22af..00000000 --- a/application/views/scripts/schedules/bookmark_control.phtml +++ /dev/null @@ -1,87 +0,0 @@ -isAuthenticationEnabled()) { ?> - -
- -isAuthenticated()) { - /********************************************************* - * Bookmark - *********************************************************/ -// print "\n\t\t

Bookmark this course

"; - print "\n\t
"; - print "\n\t\tgetStringFromOsidId($this->bookmarks_CourseId)."\"/>"; - - print "\n\t\t 'bookmarks', 'action' => 'remove', 'course' => $this->getStringFromOsidId($this->bookmarks_CourseId), 'csrf_key' => $this->csrfKey()))."'"; - if (!$this->bookmarks()->isBookmarked($this->bookmarks_CourseId)) - print "style='display: none;'"; - print " title='click to forget' class='forget'>"; - print "star icon"; - print " Saved"; - print ""; - - print "\n\t\t 'bookmarks', 'action' => 'add', 'course' => $this->getStringFromOsidId($this->bookmarks_CourseId), 'csrf_key' => $this->csrfKey()))."'"; - if ($this->bookmarks()->isBookmarked($this->bookmarks_CourseId)) - print "style='display: none;'"; - print " title='click to save' class='save'>"; - print "star icon"; - print " Save"; - print ""; - - print "\n\t
"; -} else { - $return = $this->pathAsAbsoluteUrl($this->url()); - if (count($_GET)) - $return .= '?'.http_build_query($_GET); - - print ' Log-in to save'; -} - -if (!defined('BOOKMARK_CONTROLS_SCRIPT_ADDED')) { - $this->headScript()->captureStart(); -?> - -$(function() { // on DOM ready - - $('.save_course a').click(function () { - var clickedAnchor = $(this); - var courseId = $(this).siblings('input[name=course_id]').val(); - - $.ajax({ - url: clickedAnchor.attr('href'), - success: function () { - if (clickedAnchor.hasClass('save')) { - bookmarks_show_forget(courseId); - } else { - bookmarks_show_save(courseId); - } - } - - }); - return false; - }); - -}); - -function bookmarks_show_save(courseId) { - $('.save_course input[name=course_id][value="' + courseId + '"]').siblings('a.save').show(); - $('.save_course input[name=course_id][value="' + courseId + '"]').siblings('a.forget').hide(); -} -function bookmarks_show_forget(courseId) { - $('.save_course input[name=course_id][value="' + courseId + '"]').siblings('a.save').hide(); - $('.save_course input[name=course_id][value="' + courseId + '"]').siblings('a.forget').show(); -} - -function bookmark_controls_show_forget(courseId) { - -} - -headScript()->captureEnd(); - define('BOOKMARK_CONTROLS_SCRIPT_ADDED', true); -} - -?> - -
- - diff --git a/assets/app.js b/assets/app.js index aec61e69..4d5b99bf 100644 --- a/assets/app.js +++ b/assets/app.js @@ -5,3 +5,4 @@ * which should already be in your base.html.twig. */ import './styles/app.css'; +import 'bookmarks' diff --git a/assets/bookmarks.js b/assets/bookmarks.js new file mode 100644 index 00000000..b96e7024 --- /dev/null +++ b/assets/bookmarks.js @@ -0,0 +1,33 @@ +import './styles/bookmarks.css'; +import $ from 'jquery'; + +$(function() { // on DOM ready + + $('.save_course a').click(function () { + var clickedAnchor = $(this); + var courseId = $(this).siblings('input[name=course_id]').val(); + + $.ajax({ + url: clickedAnchor.attr('href'), + success: function () { + if (clickedAnchor.hasClass('save')) { + bookmarks_show_forget(courseId); + } else { + bookmarks_show_save(courseId); + } + } + + }); + return false; + }); + +}); + +function bookmarks_show_save(courseId) { + $('.save_course input[name=course_id][value="' + courseId + '"]').siblings('a.save').show(); + $('.save_course input[name=course_id][value="' + courseId + '"]').siblings('a.forget').hide(); +} +function bookmarks_show_forget(courseId) { + $('.save_course input[name=course_id][value="' + courseId + '"]').siblings('a.save').hide(); + $('.save_course input[name=course_id][value="' + courseId + '"]').siblings('a.forget').show(); +} diff --git a/docroot/images/Crystal_Clear/Crystal_Clear_action_bookmark.png b/assets/images/Crystal_Clear/Crystal_Clear_action_bookmark.png similarity index 100% rename from docroot/images/Crystal_Clear/Crystal_Clear_action_bookmark.png rename to assets/images/Crystal_Clear/Crystal_Clear_action_bookmark.png diff --git a/docroot/images/Crystal_Clear/Crystal_Clear_action_bookmark_Silver.png b/assets/images/Crystal_Clear/Crystal_Clear_action_bookmark_Silver.png similarity index 100% rename from docroot/images/Crystal_Clear/Crystal_Clear_action_bookmark_Silver.png rename to assets/images/Crystal_Clear/Crystal_Clear_action_bookmark_Silver.png diff --git a/docroot/images/Crystal_Clear/README.txt b/assets/images/Crystal_Clear/README.txt similarity index 100% rename from docroot/images/Crystal_Clear/README.txt rename to assets/images/Crystal_Clear/README.txt diff --git a/docroot/images/arrow_cross.png b/assets/images/arrow_cross.png similarity index 100% rename from docroot/images/arrow_cross.png rename to assets/images/arrow_cross.png diff --git a/docroot/images/catalog_header.jpg b/assets/images/catalog_header.jpg similarity index 100% rename from docroot/images/catalog_header.jpg rename to assets/images/catalog_header.jpg diff --git a/docroot/images/catalog_header_plain.jpg b/assets/images/catalog_header_plain.jpg similarity index 100% rename from docroot/images/catalog_header_plain.jpg rename to assets/images/catalog_header_plain.jpg diff --git a/assets/styles/bookmarks.css b/assets/styles/bookmarks.css new file mode 100644 index 00000000..edf879be --- /dev/null +++ b/assets/styles/bookmarks.css @@ -0,0 +1,15 @@ +div.bookmark_controls { + float: right; + padding: 5px; + margin-bottom: 5px; + margin-left: 5px; +} + +div.bookmark_controls img { + width: 1.5em; + vertical-align: middle; +} + +.search_results div.bookmark_controls { + margin-top: 0px; +} diff --git a/compose.yaml b/compose.yaml new file mode 100644 index 00000000..da94a48b --- /dev/null +++ b/compose.yaml @@ -0,0 +1,13 @@ +version: '3.7' +services: + database: + image: 'mysql:latest' + environment: + MYSQL_ROOT_PASSWORD: password + MYSQL_DATABASE: main + ports: + # To allow the host machine to access the ports below, modify the lines below. + # For example, to allow the host to connect to port 3306 on the container, you would change + # "3306" to "3306:3306". Where the first port is exposed to the host and the second is the container port. + # See https://docs.docker.com/compose/compose-file/compose-file-v3/#ports for more information. + - '3306' diff --git a/composer.json b/composer.json index b6617c9b..b8645daf 100644 --- a/composer.json +++ b/composer.json @@ -8,6 +8,10 @@ "php": ">=8.1", "ext-ctype": "*", "ext-iconv": "*", + "doctrine/dbal": "^3", + "doctrine/doctrine-bundle": "^2.13", + "doctrine/doctrine-migrations-bundle": "^3.3", + "doctrine/orm": "^3.3", "knplabs/knp-paginator-bundle": "^6.6", "microsoft/microsoft-graph": "^2.12", "nbgrp/onelogin-saml-bundle": "^1.4", @@ -87,6 +91,7 @@ "symfony/browser-kit": "6.4.*", "symfony/css-selector": "6.4.*", "symfony/debug-bundle": "6.4.*", + "symfony/maker-bundle": "^1.61", "symfony/phpunit-bridge": "^7.1", "symfony/stopwatch": "6.4.*", "symfony/web-profiler-bundle": "6.4.*" diff --git a/composer.lock b/composer.lock index e3077963..e441cfd3 100644 --- a/composer.lock +++ b/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": "0c118d009db42faaebbcbe4a29b50119", + "content-hash": "9c729b55beb1d635f76607a2921d6a24", "packages": [ { "name": "brick/math", @@ -223,34 +223,1116 @@ }, "time": "2024-09-05T10:17:24+00:00" }, + { + "name": "doctrine/cache", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/cache.git", + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/cache/zipball/1ca8f21980e770095a31456042471a57bc4c68fb", + "reference": "1ca8f21980e770095a31456042471a57bc4c68fb", + "shasum": "" + }, + "require": { + "php": "~7.1 || ^8.0" + }, + "conflict": { + "doctrine/common": ">2.2,<2.4" + }, + "require-dev": { + "cache/integration-tests": "dev-master", + "doctrine/coding-standard": "^9", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psr/cache": "^1.0 || ^2.0 || ^3.0", + "symfony/cache": "^4.4 || ^5.4 || ^6", + "symfony/var-exporter": "^4.4 || ^5.4 || ^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.", + "homepage": "https://www.doctrine-project.org/projects/cache.html", + "keywords": [ + "abstraction", + "apcu", + "cache", + "caching", + "couchdb", + "memcached", + "php", + "redis", + "xcache" + ], + "support": { + "issues": "https://github.com/doctrine/cache/issues", + "source": "https://github.com/doctrine/cache/tree/2.2.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", + "type": "tidelift" + } + ], + "time": "2022-05-20T20:07:39+00:00" + }, + { + "name": "doctrine/collections", + "version": "2.2.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/collections.git", + "reference": "d8af7f248c74f195f7347424600fd9e17b57af59" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/collections/zipball/d8af7f248c74f195f7347424600fd9e17b57af59", + "reference": "d8af7f248c74f195f7347424600fd9e17b57af59", + "shasum": "" + }, + "require": { + "doctrine/deprecations": "^1", + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^12", + "ext-json": "*", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^10.5", + "vimeo/psalm": "^5.11" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Collections\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "PHP Doctrine Collections library that adds additional functionality on top of PHP arrays.", + "homepage": "https://www.doctrine-project.org/projects/collections.html", + "keywords": [ + "array", + "collections", + "iterators", + "php" + ], + "support": { + "issues": "https://github.com/doctrine/collections/issues", + "source": "https://github.com/doctrine/collections/tree/2.2.2" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcollections", + "type": "tidelift" + } + ], + "time": "2024-04-18T06:56:21+00:00" + }, + { + "name": "doctrine/dbal", + "version": "3.9.3", + "source": { + "type": "git", + "url": "https://github.com/doctrine/dbal.git", + "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/61446f07fcb522414d6cfd8b1c3e5f9e18c579ba", + "reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba", + "shasum": "" + }, + "require": { + "composer-runtime-api": "^2", + "doctrine/cache": "^1.11|^2.0", + "doctrine/deprecations": "^0.5.3|^1", + "doctrine/event-manager": "^1|^2", + "php": "^7.4 || ^8.0", + "psr/cache": "^1|^2|^3", + "psr/log": "^1|^2|^3" + }, + "require-dev": { + "doctrine/coding-standard": "12.0.0", + "fig/log-test": "^1", + "jetbrains/phpstorm-stubs": "2023.1", + "phpstan/phpstan": "1.12.6", + "phpstan/phpstan-strict-rules": "^1.6", + "phpunit/phpunit": "9.6.20", + "psalm/plugin-phpunit": "0.18.4", + "slevomat/coding-standard": "8.13.1", + "squizlabs/php_codesniffer": "3.10.2", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/console": "^4.4|^5.4|^6.0|^7.0", + "vimeo/psalm": "4.30.0" + }, + "suggest": { + "symfony/console": "For helpful console commands such as SQL execution and import of files." + }, + "bin": [ + "bin/doctrine-dbal" + ], + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\DBAL\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + } + ], + "description": "Powerful PHP database abstraction layer (DBAL) with many features for database schema introspection and management.", + "homepage": "https://www.doctrine-project.org/projects/dbal.html", + "keywords": [ + "abstraction", + "database", + "db2", + "dbal", + "mariadb", + "mssql", + "mysql", + "oci8", + "oracle", + "pdo", + "pgsql", + "postgresql", + "queryobject", + "sasql", + "sql", + "sqlite", + "sqlserver", + "sqlsrv" + ], + "support": { + "issues": "https://github.com/doctrine/dbal/issues", + "source": "https://github.com/doctrine/dbal/tree/3.9.3" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdbal", + "type": "tidelift" + } + ], + "time": "2024-10-10T17:56:43+00:00" + }, + { + "name": "doctrine/deprecations", + "version": "1.1.3", + "source": { + "type": "git", + "url": "https://github.com/doctrine/deprecations.git", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^9", + "phpstan/phpstan": "1.4.10 || 1.10.15", + "phpstan/phpstan-phpunit": "^1.0", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", + "psalm/plugin-phpunit": "0.18.4", + "psr/log": "^1 || ^2 || ^3", + "vimeo/psalm": "4.30.0 || 5.12.0" + }, + "suggest": { + "psr/log": "Allows logging deprecations via PSR-3 logger implementation" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "A small layer on top of trigger_error(E_USER_DEPRECATED) or PSR-3 logging with options to disable all deprecations or selectively for packages.", + "homepage": "https://www.doctrine-project.org/", + "support": { + "issues": "https://github.com/doctrine/deprecations/issues", + "source": "https://github.com/doctrine/deprecations/tree/1.1.3" + }, + "time": "2024-01-30T19:34:25+00:00" + }, + { + "name": "doctrine/doctrine-bundle", + "version": "2.13.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/DoctrineBundle.git", + "reference": "ca59d84b8e63143ce1aed90cdb333ba329d71563" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/ca59d84b8e63143ce1aed90cdb333ba329d71563", + "reference": "ca59d84b8e63143ce1aed90cdb333ba329d71563", + "shasum": "" + }, + "require": { + "doctrine/cache": "^1.11 || ^2.0", + "doctrine/dbal": "^3.7.0 || ^4.0", + "doctrine/persistence": "^2.2 || ^3", + "doctrine/sql-formatter": "^1.0.1", + "php": "^7.4 || ^8.0", + "symfony/cache": "^5.4 || ^6.0 || ^7.0", + "symfony/config": "^5.4 || ^6.0 || ^7.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/dependency-injection": "^5.4 || ^6.0 || ^7.0", + "symfony/deprecation-contracts": "^2.1 || ^3", + "symfony/doctrine-bridge": "^5.4.19 || ^6.0.7 || ^7.0", + "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-php80": "^1.15", + "symfony/service-contracts": "^1.1.1 || ^2.0 || ^3" + }, + "conflict": { + "doctrine/annotations": ">=3.0", + "doctrine/orm": "<2.17 || >=4.0", + "twig/twig": "<1.34 || >=2.0 <2.4" + }, + "require-dev": { + "doctrine/annotations": "^1 || ^2", + "doctrine/coding-standard": "^12", + "doctrine/deprecations": "^1.0", + "doctrine/orm": "^2.17 || ^3.0", + "friendsofphp/proxy-manager-lts": "^1.0", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.4", + "psalm/plugin-symfony": "^5", + "psr/log": "^1.1.4 || ^2.0 || ^3.0", + "symfony/phpunit-bridge": "^6.1 || ^7.0", + "symfony/property-info": "^5.4 || ^6.0 || ^7.0", + "symfony/proxy-manager-bridge": "^5.4 || ^6.0 || ^7.0", + "symfony/security-bundle": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0", + "symfony/string": "^5.4 || ^6.0 || ^7.0", + "symfony/twig-bridge": "^5.4 || ^6.0 || ^7.0", + "symfony/validator": "^5.4 || ^6.0 || ^7.0", + "symfony/var-exporter": "^5.4 || ^6.2 || ^7.0", + "symfony/web-profiler-bundle": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0", + "twig/twig": "^1.34 || ^2.12 || ^3.0", + "vimeo/psalm": "^5.15" + }, + "suggest": { + "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.", + "ext-pdo": "*", + "symfony/web-profiler-bundle": "To use the data collector." + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Doctrine\\Bundle\\DoctrineBundle\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + }, + { + "name": "Doctrine Project", + "homepage": "https://www.doctrine-project.org/" + } + ], + "description": "Symfony DoctrineBundle", + "homepage": "https://www.doctrine-project.org", + "keywords": [ + "database", + "dbal", + "orm", + "persistence" + ], + "support": { + "issues": "https://github.com/doctrine/DoctrineBundle/issues", + "source": "https://github.com/doctrine/DoctrineBundle/tree/2.13.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-bundle", + "type": "tidelift" + } + ], + "time": "2024-09-01T09:46:40+00:00" + }, + { + "name": "doctrine/doctrine-migrations-bundle", + "version": "3.3.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git", + "reference": "715b62c31a5894afcb2b2cdbbc6607d7dd0580c0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/715b62c31a5894afcb2b2cdbbc6607d7dd0580c0", + "reference": "715b62c31a5894afcb2b2cdbbc6607d7dd0580c0", + "shasum": "" + }, + "require": { + "doctrine/doctrine-bundle": "^2.4", + "doctrine/migrations": "^3.2", + "php": "^7.2|^8.0", + "symfony/deprecation-contracts": "^2.1 || ^3", + "symfony/framework-bundle": "^5.4 || ^6.0 || ^7.0" + }, + "require-dev": { + "composer/semver": "^3.0", + "doctrine/coding-standard": "^12", + "doctrine/orm": "^2.6 || ^3", + "doctrine/persistence": "^2.0 || ^3 ", + "phpstan/phpstan": "^1.4", + "phpstan/phpstan-deprecation-rules": "^1", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan-symfony": "^1.3", + "phpunit/phpunit": "^8.5|^9.5", + "psalm/plugin-phpunit": "^0.18.4", + "psalm/plugin-symfony": "^3 || ^5", + "symfony/phpunit-bridge": "^6.3 || ^7", + "symfony/var-exporter": "^5.4 || ^6 || ^7", + "vimeo/psalm": "^4.30 || ^5.15" + }, + "type": "symfony-bundle", + "autoload": { + "psr-4": { + "Doctrine\\Bundle\\MigrationsBundle\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Doctrine Project", + "homepage": "https://www.doctrine-project.org" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DoctrineMigrationsBundle", + "homepage": "https://www.doctrine-project.org", + "keywords": [ + "dbal", + "migrations", + "schema" + ], + "support": { + "issues": "https://github.com/doctrine/DoctrineMigrationsBundle/issues", + "source": "https://github.com/doctrine/DoctrineMigrationsBundle/tree/3.3.1" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fdoctrine-migrations-bundle", + "type": "tidelift" + } + ], + "time": "2024-05-14T20:32:18+00:00" + }, + { + "name": "doctrine/event-manager", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/event-manager.git", + "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e", + "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "conflict": { + "doctrine/common": "<2.9" + }, + "require-dev": { + "doctrine/coding-standard": "^12", + "phpstan/phpstan": "^1.8.8", + "phpunit/phpunit": "^10.5", + "vimeo/psalm": "^5.24" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "The Doctrine Event Manager is a simple PHP event system that was built to be used with the various Doctrine projects.", + "homepage": "https://www.doctrine-project.org/projects/event-manager.html", + "keywords": [ + "event", + "event dispatcher", + "event manager", + "event system", + "events" + ], + "support": { + "issues": "https://github.com/doctrine/event-manager/issues", + "source": "https://github.com/doctrine/event-manager/tree/2.0.1" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", + "type": "tidelift" + } + ], + "time": "2024-05-22T20:47:39+00:00" + }, + { + "name": "doctrine/inflector", + "version": "2.0.10", + "source": { + "type": "git", + "url": "https://github.com/doctrine/inflector.git", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "require-dev": { + "doctrine/coding-standard": "^11.0", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^8.5 || ^9.5", + "vimeo/psalm": "^4.25 || ^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Inflector\\": "lib/Doctrine/Inflector" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.", + "homepage": "https://www.doctrine-project.org/projects/inflector.html", + "keywords": [ + "inflection", + "inflector", + "lowercase", + "manipulation", + "php", + "plural", + "singular", + "strings", + "uppercase", + "words" + ], + "support": { + "issues": "https://github.com/doctrine/inflector/issues", + "source": "https://github.com/doctrine/inflector/tree/2.0.10" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", + "type": "tidelift" + } + ], + "time": "2024-02-18T20:23:39+00:00" + }, + { + "name": "doctrine/instantiator", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^11", + "ext-pdo": "*", + "ext-phar": "*", + "phpbench/phpbench": "^1.2", + "phpstan/phpstan": "^1.9.4", + "phpstan/phpstan-phpunit": "^1.3", + "phpunit/phpunit": "^9.5.27", + "vimeo/psalm": "^5.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "https://ocramius.github.io/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", + "keywords": [ + "constructor", + "instantiate" + ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/2.0.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], + "time": "2022-12-30T00:23:10+00:00" + }, { "name": "doctrine/lexer", "version": "3.0.1", "source": { "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd" + "url": "https://github.com/doctrine/lexer.git", + "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", + "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^12", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^10.5", + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^5.21" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Lexer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "keywords": [ + "annotations", + "docblock", + "lexer", + "parser", + "php" + ], + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/3.0.1" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], + "time": "2024-02-05T11:56:58+00:00" + }, + { + "name": "doctrine/migrations", + "version": "3.8.2", + "source": { + "type": "git", + "url": "https://github.com/doctrine/migrations.git", + "reference": "5007eb1168691225ac305fe16856755c20860842" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/migrations/zipball/5007eb1168691225ac305fe16856755c20860842", + "reference": "5007eb1168691225ac305fe16856755c20860842", + "shasum": "" + }, + "require": { + "composer-runtime-api": "^2", + "doctrine/dbal": "^3.6 || ^4", + "doctrine/deprecations": "^0.5.3 || ^1", + "doctrine/event-manager": "^1.2 || ^2.0", + "php": "^8.1", + "psr/log": "^1.1.3 || ^2 || ^3", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0", + "symfony/var-exporter": "^6.2 || ^7.0" + }, + "conflict": { + "doctrine/orm": "<2.12 || >=4" + }, + "require-dev": { + "doctrine/coding-standard": "^12", + "doctrine/orm": "^2.13 || ^3", + "doctrine/persistence": "^2 || ^3", + "doctrine/sql-formatter": "^1.0", + "ext-pdo_sqlite": "*", + "fig/log-test": "^1", + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-deprecation-rules": "^1.1", + "phpstan/phpstan-phpunit": "^1.3", + "phpstan/phpstan-strict-rules": "^1.4", + "phpstan/phpstan-symfony": "^1.3", + "phpunit/phpunit": "^10.3", + "symfony/cache": "^5.4 || ^6.0 || ^7.0", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + }, + "suggest": { + "doctrine/sql-formatter": "Allows to generate formatted SQL with the diff command.", + "symfony/yaml": "Allows the use of yaml for migration configuration files." + }, + "bin": [ + "bin/doctrine-migrations" + ], + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Migrations\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Michael Simonson", + "email": "contact@mikesimonson.com" + } + ], + "description": "PHP Doctrine Migrations project offer additional functionality on top of the database abstraction layer (DBAL) for versioning your database schema and easily deploying changes to it. It is a very easy to use and a powerful tool.", + "homepage": "https://www.doctrine-project.org/projects/migrations.html", + "keywords": [ + "database", + "dbal", + "migrations" + ], + "support": { + "issues": "https://github.com/doctrine/migrations/issues", + "source": "https://github.com/doctrine/migrations/tree/3.8.2" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fmigrations", + "type": "tidelift" + } + ], + "time": "2024-10-10T21:35:27+00:00" + }, + { + "name": "doctrine/orm", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/orm.git", + "reference": "69958152e661aa9c14e80d1ee4962863485aa60b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", - "reference": "31ad66abc0fc9e1a1f2d9bc6a42668d2fbbcd6dd", + "url": "https://api.github.com/repos/doctrine/orm/zipball/69958152e661aa9c14e80d1ee4962863485aa60b", + "reference": "69958152e661aa9c14e80d1ee4962863485aa60b", "shasum": "" }, "require": { - "php": "^8.1" + "composer-runtime-api": "^2", + "doctrine/collections": "^2.2", + "doctrine/dbal": "^3.8.2 || ^4", + "doctrine/deprecations": "^0.5.3 || ^1", + "doctrine/event-manager": "^1.2 || ^2", + "doctrine/inflector": "^1.4 || ^2.0", + "doctrine/instantiator": "^1.3 || ^2", + "doctrine/lexer": "^3", + "doctrine/persistence": "^3.3.1", + "ext-ctype": "*", + "php": "^8.1", + "psr/cache": "^1 || ^2 || ^3", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/var-exporter": "^6.3.9 || ^7.0" + }, + "require-dev": { + "doctrine/coding-standard": "^12.0", + "phpbench/phpbench": "^1.0", + "phpdocumentor/guides-cli": "^1.4", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "1.12.6", + "phpstan/phpstan-deprecation-rules": "^1.2", + "phpunit/phpunit": "^10.4.0", + "psr/log": "^1 || ^2 || ^3", + "squizlabs/php_codesniffer": "3.7.2", + "symfony/cache": "^5.4 || ^6.2 || ^7.0", + "vimeo/psalm": "5.24.0" + }, + "suggest": { + "ext-dom": "Provides support for XSD validation for XML mapping files", + "symfony/cache": "Provides cache support for Setup Tool with doctrine/cache 2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\ORM\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" + } + ], + "description": "Object-Relational-Mapper for PHP", + "homepage": "https://www.doctrine-project.org/projects/orm.html", + "keywords": [ + "database", + "orm" + ], + "support": { + "issues": "https://github.com/doctrine/orm/issues", + "source": "https://github.com/doctrine/orm/tree/3.3.0" + }, + "time": "2024-10-12T20:07:18+00:00" + }, + { + "name": "doctrine/persistence", + "version": "3.3.3", + "source": { + "type": "git", + "url": "https://github.com/doctrine/persistence.git", + "reference": "b337726451f5d530df338fc7f68dee8781b49779" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/b337726451f5d530df338fc7f68dee8781b49779", + "reference": "b337726451f5d530df338fc7f68dee8781b49779", + "shasum": "" + }, + "require": { + "doctrine/event-manager": "^1 || ^2", + "php": "^7.2 || ^8.0", + "psr/cache": "^1.0 || ^2.0 || ^3.0" + }, + "conflict": { + "doctrine/common": "<2.10" }, "require-dev": { "doctrine/coding-standard": "^12", - "phpstan/phpstan": "^1.10", - "phpunit/phpunit": "^10.5", - "psalm/plugin-phpunit": "^0.18.3", - "vimeo/psalm": "^5.21" + "doctrine/common": "^3.0", + "phpstan/phpstan": "1.11.1", + "phpstan/phpstan-phpunit": "^1", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.5", + "symfony/cache": "^4.4 || ^5.4 || ^6.0", + "vimeo/psalm": "4.30.0 || 5.24.0" }, "type": "library", "autoload": { "psr-4": { - "Doctrine\\Common\\Lexer\\": "src" + "Doctrine\\Persistence\\": "src/Persistence" } }, "notification-url": "https://packagist.org/downloads/", @@ -266,23 +1348,35 @@ "name": "Roman Borschel", "email": "roman@code-factory.org" }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, { "name": "Johannes Schmitt", "email": "schmittjoh@gmail.com" + }, + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com" } ], - "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "description": "The Doctrine Persistence project is a set of shared interfaces and functionality that the different Doctrine object mappers share.", + "homepage": "https://www.doctrine-project.org/projects/persistence.html", "keywords": [ - "annotations", - "docblock", - "lexer", - "parser", - "php" + "mapper", + "object", + "odm", + "orm", + "persistence" ], "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/3.0.1" + "issues": "https://github.com/doctrine/persistence/issues", + "source": "https://github.com/doctrine/persistence/tree/3.3.3" }, "funding": [ { @@ -294,11 +1388,67 @@ "type": "patreon" }, { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fpersistence", "type": "tidelift" } ], - "time": "2024-02-05T11:56:58+00:00" + "time": "2024-06-20T10:14:30+00:00" + }, + { + "name": "doctrine/sql-formatter", + "version": "1.5.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/sql-formatter.git", + "reference": "16ca9e39877369d664f06dacde468548298bdc40" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/16ca9e39877369d664f06dacde468548298bdc40", + "reference": "16ca9e39877369d664f06dacde468548298bdc40", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^12", + "ergebnis/phpunit-slow-test-detector": "^2.14", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^10.5", + "vimeo/psalm": "^5.24" + }, + "bin": [ + "bin/sql-formatter" + ], + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\SqlFormatter\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jeremy Dorn", + "email": "jeremy@jeremydorn.com", + "homepage": "https://jeremydorn.com/" + } + ], + "description": "a PHP SQL highlighting library", + "homepage": "https://github.com/doctrine/sql-formatter/", + "keywords": [ + "highlight", + "sql" + ], + "support": { + "issues": "https://github.com/doctrine/sql-formatter/issues", + "source": "https://github.com/doctrine/sql-formatter/tree/1.5.0" + }, + "time": "2024-09-11T07:29:40+00:00" }, { "name": "firebase/php-jwt", @@ -3513,22 +4663,130 @@ "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, - "require": { - "php": ">=8.1" + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-04-18T09:32:20+00:00" + }, + { + "name": "symfony/doctrine-bridge", + "version": "v6.4.12", + "source": { + "type": "git", + "url": "https://github.com/symfony/doctrine-bridge.git", + "reference": "b5c0a0172bbe9b1435181d94ca5cbe4af3fb45af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/b5c0a0172bbe9b1435181d94ca5cbe4af3fb45af", + "reference": "b5c0a0172bbe9b1435181d94ca5cbe4af3fb45af", + "shasum": "" + }, + "require": { + "doctrine/event-manager": "^1.2|^2", + "doctrine/persistence": "^3.1", + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-mbstring": "~1.0", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "doctrine/dbal": "<2.13.1", + "doctrine/lexer": "<1.1", + "doctrine/orm": "<2.15", + "symfony/cache": "<5.4", + "symfony/dependency-injection": "<6.2", + "symfony/form": "<5.4.38|>=6,<6.4.6|>=7,<7.0.6", + "symfony/http-foundation": "<6.3", + "symfony/http-kernel": "<6.2", + "symfony/lock": "<6.3", + "symfony/messenger": "<5.4", + "symfony/property-info": "<5.4", + "symfony/security-bundle": "<5.4", + "symfony/security-core": "<6.4", + "symfony/validator": "<6.4" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } + "require-dev": { + "doctrine/collections": "^1.0|^2.0", + "doctrine/data-fixtures": "^1.1", + "doctrine/dbal": "^2.13.1|^3|^4", + "doctrine/orm": "^2.15|^3", + "psr/log": "^1|^2|^3", + "symfony/cache": "^5.4|^6.0|^7.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/dependency-injection": "^6.2|^7.0", + "symfony/doctrine-messenger": "^5.4|^6.0|^7.0", + "symfony/expression-language": "^5.4|^6.0|^7.0", + "symfony/form": "^5.4.38|^6.4.6|^7.0.6", + "symfony/http-kernel": "^6.3|^7.0", + "symfony/lock": "^6.3|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/property-access": "^5.4|^6.0|^7.0", + "symfony/property-info": "^5.4|^6.0|^7.0", + "symfony/proxy-manager-bridge": "^6.4", + "symfony/security-core": "^6.4|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0", + "symfony/translation": "^5.4|^6.0|^7.0", + "symfony/uid": "^5.4|^6.0|^7.0", + "symfony/validator": "^6.4|^7.0", + "symfony/var-dumper": "^5.4|^6.0|^7.0" }, + "type": "symfony-bridge", "autoload": { - "files": [ - "function.php" + "psr-4": { + "Symfony\\Bridge\\Doctrine\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -3537,18 +4795,18 @@ ], "authors": [ { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" + "name": "Fabien Potencier", + "email": "fabien@symfony.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "A generic function and convention to trigger deprecation notices", + "description": "Provides integration for Doctrine with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/doctrine-bridge/tree/v6.4.12" }, "funding": [ { @@ -3564,7 +4822,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-08T12:31:10+00:00" }, { "name": "symfony/dotenv", @@ -5961,6 +7219,68 @@ ], "time": "2024-04-18T09:32:20+00:00" }, + { + "name": "symfony/stopwatch", + "version": "v6.4.8", + "source": { + "type": "git", + "url": "https://github.com/symfony/stopwatch.git", + "reference": "63e069eb616049632cde9674c46957819454b8aa" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/63e069eb616049632cde9674c46957819454b8aa", + "reference": "63e069eb616049632cde9674c46957819454b8aa", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/service-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Stopwatch\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides a way to profile code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/stopwatch/tree/v6.4.8" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-05-31T14:49:08+00:00" + }, { "name": "symfony/string", "version": "v6.4.12", @@ -6780,76 +8100,6 @@ } ], "packages-dev": [ - { - "name": "doctrine/instantiator", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://github.com/doctrine/instantiator.git", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", - "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0", - "shasum": "" - }, - "require": { - "php": "^8.1" - }, - "require-dev": { - "doctrine/coding-standard": "^11", - "ext-pdo": "*", - "ext-phar": "*", - "phpbench/phpbench": "^1.2", - "phpstan/phpstan": "^1.9.4", - "phpstan/phpstan-phpunit": "^1.3", - "phpunit/phpunit": "^9.5.27", - "vimeo/psalm": "^5.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - } - ], - "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://www.doctrine-project.org/projects/instantiator.html", - "keywords": [ - "constructor", - "instantiate" - ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/2.0.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], - "time": "2022-12-30T00:23:10+00:00" - }, { "name": "masterminds/html5", "version": "2.9.0", @@ -8812,6 +10062,98 @@ ], "time": "2024-09-15T06:35:36+00:00" }, + { + "name": "symfony/maker-bundle", + "version": "v1.61.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/maker-bundle.git", + "reference": "a3b7f14d349f8f44ed752d4dde2263f77510cc18" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/maker-bundle/zipball/a3b7f14d349f8f44ed752d4dde2263f77510cc18", + "reference": "a3b7f14d349f8f44ed752d4dde2263f77510cc18", + "shasum": "" + }, + "require": { + "doctrine/inflector": "^2.0", + "nikic/php-parser": "^4.18|^5.0", + "php": ">=8.1", + "symfony/config": "^6.4|^7.0", + "symfony/console": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4|^7.0", + "symfony/deprecation-contracts": "^2.2|^3", + "symfony/filesystem": "^6.4|^7.0", + "symfony/finder": "^6.4|^7.0", + "symfony/framework-bundle": "^6.4|^7.0", + "symfony/http-kernel": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0" + }, + "conflict": { + "doctrine/doctrine-bundle": "<2.10", + "doctrine/orm": "<2.15" + }, + "require-dev": { + "composer/semver": "^3.0", + "doctrine/doctrine-bundle": "^2.5.0", + "doctrine/orm": "^2.15|^3", + "symfony/http-client": "^6.4|^7.0", + "symfony/phpunit-bridge": "^6.4.1|^7.0", + "symfony/security-core": "^6.4|^7.0", + "symfony/yaml": "^6.4|^7.0", + "twig/twig": "^3.0|^4.x-dev" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-main": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Bundle\\MakerBundle\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Maker helps you create empty commands, controllers, form classes, tests and more so you can forget about writing boilerplate code.", + "homepage": "https://symfony.com/doc/current/bundles/SymfonyMakerBundle/index.html", + "keywords": [ + "code generator", + "dev", + "generator", + "scaffold", + "scaffolding" + ], + "support": { + "issues": "https://github.com/symfony/maker-bundle/issues", + "source": "https://github.com/symfony/maker-bundle/tree/v1.61.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-08-29T22:50:23+00:00" + }, { "name": "symfony/phpunit-bridge", "version": "v7.1.4", @@ -8895,27 +10237,26 @@ "time": "2024-08-13T14:28:19+00:00" }, { - "name": "symfony/stopwatch", - "version": "v6.4.8", + "name": "symfony/process", + "version": "v6.4.12", "source": { "type": "git", - "url": "https://github.com/symfony/stopwatch.git", - "reference": "63e069eb616049632cde9674c46957819454b8aa" + "url": "https://github.com/symfony/process.git", + "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/63e069eb616049632cde9674c46957819454b8aa", - "reference": "63e069eb616049632cde9674c46957819454b8aa", + "url": "https://api.github.com/repos/symfony/process/zipball/3f94e5f13ff58df371a7ead461b6e8068900fbb3", + "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3", "shasum": "" }, "require": { - "php": ">=8.1", - "symfony/service-contracts": "^2.5|^3" + "php": ">=8.1" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Stopwatch\\": "" + "Symfony\\Component\\Process\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -8935,10 +10276,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides a way to profile code", + "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v6.4.8" + "source": "https://github.com/symfony/process/tree/v6.4.12" }, "funding": [ { @@ -8954,7 +10295,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-17T12:47:12+00:00" }, { "name": "symfony/web-profiler-bundle", diff --git a/config/bundles.php b/config/bundles.php index c249da0e..01e48cf3 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -9,4 +9,7 @@ Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true], Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true], Nbgrp\OneloginSamlBundle\NbgrpOneloginSamlBundle::class => ['all' => true], + Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true], + Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true], + Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true], ]; diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml new file mode 100644 index 00000000..d42c52d6 --- /dev/null +++ b/config/packages/doctrine.yaml @@ -0,0 +1,50 @@ +doctrine: + dbal: + url: '%env(resolve:DATABASE_URL)%' + + # IMPORTANT: You MUST configure your server version, + # either here or in the DATABASE_URL env var (see .env file) + #server_version: '16' + + profiling_collect_backtrace: '%kernel.debug%' + use_savepoints: true + orm: + auto_generate_proxy_classes: true + enable_lazy_ghost_objects: true + report_fields_where_declared: true + validate_xml_mapping: true + naming_strategy: doctrine.orm.naming_strategy.underscore_number_aware + auto_mapping: true + mappings: + App: + type: attribute + is_bundle: false + dir: '%kernel.project_dir%/src/Entity' + prefix: 'App\Entity' + alias: App + +when@test: + doctrine: + dbal: + # "TEST_TOKEN" is typically set by ParaTest + dbname_suffix: '_test%env(default::TEST_TOKEN)%' + +when@prod: + doctrine: + orm: + auto_generate_proxy_classes: false + proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies' + query_cache_driver: + type: pool + pool: doctrine.system_cache_pool + result_cache_driver: + type: pool + pool: doctrine.result_cache_pool + + framework: + cache: + pools: + doctrine.result_cache_pool: + adapter: cache.app + doctrine.system_cache_pool: + adapter: cache.system diff --git a/config/packages/doctrine_migrations.yaml b/config/packages/doctrine_migrations.yaml new file mode 100644 index 00000000..29231d94 --- /dev/null +++ b/config/packages/doctrine_migrations.yaml @@ -0,0 +1,6 @@ +doctrine_migrations: + migrations_paths: + # namespace is arbitrary but should be different from App\Migrations + # as migrations classes should NOT be autoloaded + 'DoctrineMigrations': '%kernel.project_dir%/migrations' + enable_profiler: false diff --git a/config/services.yaml b/config/services.yaml index 9531e2ac..2a1f7096 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -42,6 +42,9 @@ services: - 'urn:inet:middlebury.edu:genera:offering.SEM' - 'urn:inet:middlebury.edu:genera:offering.PRC' - 'urn:inet:middlebury.edu:genera:offering.WKS' + App\Twig\BookmarksExtension: + tags: + - { name: 'twig.extension' } App\Twig\OsidIdExtension: tags: - { name: 'twig.extension' } diff --git a/docroot/2d/StyleSheets/CatalogStyles.css b/docroot/2d/StyleSheets/CatalogStyles.css index c5badef0..42bd0f6b 100755 --- a/docroot/2d/StyleSheets/CatalogStyles.css +++ b/docroot/2d/StyleSheets/CatalogStyles.css @@ -167,22 +167,6 @@ div.login_info { /********************************************************* * Schedule styles *********************************************************/ -div.bookmark_controls { - float: right; - padding: 5px; - margin-bottom: 5px; - margin-left: 5px; - margin-top: -40px; -} - -div.bookmark_controls img { - width: 1.5em; - vertical-align: middle; -} - -.search_results div.bookmark_controls { - margin-top: 0px; -} div.schedule { margin: 5px; diff --git a/importmap.php b/importmap.php index b347e5f4..8454803d 100644 --- a/importmap.php +++ b/importmap.php @@ -16,6 +16,9 @@ 'path' => './assets/app.js', 'entrypoint' => true, ], + 'bookmarks' => [ + 'path' => './assets/bookmarks.js', + ], 'offering_search' => [ 'path' => './assets/offering_search.js', 'entrypoint' => true, diff --git a/migrations/.gitignore b/migrations/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/src/Controller/Bookmarks.php b/src/Controller/Bookmarks.php new file mode 100755 index 00000000..2196fb22 --- /dev/null +++ b/src/Controller/Bookmarks.php @@ -0,0 +1,78 @@ +'; + echo ''; + try { + if (!$course) { + throw new \InvalidArgumentException('No Course Id specified.'); + } + $this->bookmarks->add($this->osidIdMap->fromString($course)); + echo ''; + } + catch (\Exception $e) { + echo '' . $e->getMessage() . ''; + } + echo ''; + $response = new Response(ob_get_clean()); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; + } + + /** + * Remove a course bookmark. + * + * @return + * + * @since 7/29/10 + */ + #[Route('/bookmarks/remove/{course}', name: 'remove_bookmark')] + public function remove(string $course) + { + ob_start(); + echo ''; + echo ''; + try { + if (!$course) { + throw new \InvalidArgumentException('No Course Id specified.'); + } + $this->bookmarks->remove($this->osidIdMap->fromString($course)); + echo ''; + } + catch (\Exception $e) { + echo '' . $e->getMessage() . ''; + } + echo ''; + $response = new Response(ob_get_clean()); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; + } +} diff --git a/src/Entity/.gitignore b/src/Entity/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/src/Repository/.gitignore b/src/Repository/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/src/Service/Bookmarks.php b/src/Service/Bookmarks.php new file mode 100755 index 00000000..3993fcd7 --- /dev/null +++ b/src/Service/Bookmarks.php @@ -0,0 +1,172 @@ +entityManager->getConnection()->prepare('INSERT INTO user_savedcourses (user_id, course_id_keyword, course_id_authority, course_id_namespace) VALUES (?, ?, ?, ?);'); + try { + $stmt->executeQuery([ + $this->getUserIdentifier(), + $courseId->getIdentifier(), + $courseId->getAuthority(), + $courseId->getIdentifierNamespace(), + ]); + } catch (UniqueConstraintViolationException $e) { + throw new \Exception('Bookmark already added.', 23000, $e); + } + } + + /** + * Remove a bookmark. + * + * @return void + * + */ + public function remove(\osid_id_Id $courseId) + { + $stmt = $this->entityManager->getConnection()->prepare('DELETE FROM user_savedcourses WHERE user_id = ? AND course_id_keyword = ? AND course_id_authority = ? AND course_id_namespace = ? LIMIT 1;'); + $stmt->executeQuery([ + $this->getUserIdentifier(), + $courseId->getIdentifier(), + $courseId->getAuthority(), + $courseId->getIdentifierNamespace(), + ]); + } + + /** + * Answer true if the course Id passed is bookmarked. + * + * @return bool + * + */ + public function isBookmarked(\osid_id_Id $courseId) + { + $stmt = $this->entityManager->getConnection()->prepare('SELECT COUNT(*) as is_bookmarked FROM user_savedcourses WHERE user_id = ? AND course_id_keyword = ? AND course_id_authority = ? AND course_id_namespace = ?'); + $result = $stmt->executeQuery([ + $this->getUserIdentifier(), + $courseId->getIdentifier(), + $courseId->getAuthority(), + $courseId->getIdentifierNamespace(), + ]); + $num = (int) $result->fetchOne(); + + return $num > 0; + } + + /** + * Answer an array of all bookmarked courseIds. + * + * @return \osid_id_IdList[] + * + */ + public function getAllBookmarkedCourseIds() + { + $stmt = $this->entityManager->getConnection()->prepare('SELECT * FROM user_savedcourses WHERE user_id = ?'); + $result = $stmt->executeQuery([ + $this->getUserIdentifier(), + ]); + $ids = []; + foreach ($stmt->fetchAll() as $row) { + $ids[] = new \phpkit_id_Id($row['course_id_authority'], $row['course_id_namespace'], $row['course_id_keyword']); + } + + return new \phpkit_id_ArrayIdList($ids); + } + + /** + * Answer an array of all bookmarked courses. + * + * @return \osid_course_CourseList + * + */ + public function getAllBookmarkedCourses() + { + $courseIdList = $this->getAllBookmarkedCourseIds(); + if (!$courseIdList->hasNext()) { + return new \phpkit_course_ArrayCourseList([]); + } + + $courseLookupSession = $this->courseManager->getCourseLookupSession(); + $courseLookupSession->useFederatedCourseCatalogView(); + + return $courseLookupSession->getCoursesByIds($courseIdList); + } + + /** + * Answer an array of all bookmarked courses that match a given catalog and term. + * + * @return \osid_course_CourseList + * + */ + public function getBookmarkedCoursesInCatalogForTerm(\osid_id_Id $catalogId, \osid_id_Id $termId) + { + $courseIdList = $this->getAllBookmarkedCourseIds(); + if (!$courseIdList->hasNext()) { + return new \phpkit_course_ArrayCourseList([]); + } + + $searchSession = $this->courseManager->getCourseSearchSessionForCatalog($catalogId); + + $search = $searchSession->getCourseSearch(); + $search->searchAmongCourses($courseIdList); + + $query = $searchSession->getCourseQuery(); + $record = $query->getCourseQueryRecord(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:term')); + $record->matchTermId($termId, true); + + // Limit to just active courses + $query->matchGenusType(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:status-active'), true); + + $results = $searchSession->getCoursesBySearch($query, $search); + + return $results->getCourses(); + } + + protected function getUserIdentifier() { + $user = $this->security->getUser(); + if (!$user) { + throw new \Exception("No authenticated user found."); + } + return $user->getUserIdentifier(); + } +} diff --git a/src/Twig/BookmarksExtension.php b/src/Twig/BookmarksExtension.php new file mode 100644 index 00000000..591df6ee --- /dev/null +++ b/src/Twig/BookmarksExtension.php @@ -0,0 +1,35 @@ +bookmarks->isBookmarked($id); + } +} diff --git a/symfony.lock b/symfony.lock index 57f58de8..8f9a2825 100644 --- a/symfony.lock +++ b/symfony.lock @@ -8,6 +8,33 @@ "ref": "64d8583af5ea57b7afa4aba4b159907f3a148b05" } }, + "doctrine/doctrine-bundle": { + "version": "2.13", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "2.10", + "ref": "c170ded8fc587d6bd670550c43dafcf093762245" + }, + "files": [ + "config/packages/doctrine.yaml", + "src/Entity/.gitignore", + "src/Repository/.gitignore" + ] + }, + "doctrine/doctrine-migrations-bundle": { + "version": "3.3", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "3.1", + "ref": "1d01ec03c6ecbd67c3375c5478c9a423ae5d6a33" + }, + "files": [ + "config/packages/doctrine_migrations.yaml", + "migrations/.gitignore" + ] + }, "knplabs/knp-paginator-bundle": { "version": "v6.6.1" }, @@ -122,6 +149,15 @@ "src/Kernel.php" ] }, + "symfony/maker-bundle": { + "version": "1.61", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "1.0", + "ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f" + } + }, "symfony/monolog-bundle": { "version": "3.10", "recipe": { diff --git a/templates/courses/view.html.twig b/templates/courses/view.html.twig index 3de68fda..861e521e 100755 --- a/templates/courses/view.html.twig +++ b/templates/courses/view.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -print $this->render('schedules/bookmark_control.phtml'); +{{ include('schedules/bookmark_control.html.twig', {course_id: course.id}, with_context = false) }}
{{ course.displayname }}

{{ course.title }}

diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index ce7ab776..f9c702f9 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -269,7 +269,13 @@ @@ -215,13 +215,13 @@ {% for item in paginator %} ", that.document[ 0 ] ).appendTo( element ) + ); + } else if ( nodeName === "tr" ) { + that._createTrPlaceholder( that.currentItem, element ); + } else if ( nodeName === "img" ) { + element.attr( "src", that.currentItem.attr( "src" ) ); + } + + if ( !className ) { + element.css( "visibility", "hidden" ); + } + + return element; + }, + update: function( container, p ) { + + // 1. If a className is set as 'placeholder option, we don't force sizes - + // the class is responsible for that + // 2. The option 'forcePlaceholderSize can be enabled to force it even if a + // class name is specified + if ( className && !o.forcePlaceholderSize ) { + return; + } + + // If the element doesn't have a actual height or width by itself (without + // styles coming from a stylesheet), it receives the inline height and width + // from the dragged item. Or, if it's a tbody or tr, it's going to have a height + // anyway since we're populating them with ", that.document[ 0 ] ) + .attr( "colspan", $( this ).attr( "colspan" ) || 1 ) + .appendTo( targetTr ); + } ); + }, + + _contactContainers: function( event ) { + var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom, + floating, axis, + innermostContainer = null, + innermostIndex = null; + + // Get innermost container that intersects with item + for ( i = this.containers.length - 1; i >= 0; i-- ) { + + // Never consider a container that's located within the item itself + if ( $.contains( this.currentItem[ 0 ], this.containers[ i ].element[ 0 ] ) ) { + continue; + } + + if ( this._intersectsWith( this.containers[ i ].containerCache ) ) { + + // If we've already found a container and it's more "inner" than this, then continue + if ( innermostContainer && + $.contains( + this.containers[ i ].element[ 0 ], + innermostContainer.element[ 0 ] ) ) { + continue; + } + + innermostContainer = this.containers[ i ]; + innermostIndex = i; + + } else { + + // container doesn't intersect. trigger "out" event if necessary + if ( this.containers[ i ].containerCache.over ) { + this.containers[ i ]._trigger( "out", event, this._uiHash( this ) ); + this.containers[ i ].containerCache.over = 0; + } + } + + } + + // If no intersecting containers found, return + if ( !innermostContainer ) { + return; + } + + // Move the item into the container if it's not there already + if ( this.containers.length === 1 ) { + if ( !this.containers[ innermostIndex ].containerCache.over ) { + this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) ); + this.containers[ innermostIndex ].containerCache.over = 1; + } + } else { + + // When entering a new container, we will find the item with the least distance and + // append our item near it + dist = 10000; + itemWithLeastDistance = null; + floating = innermostContainer.floating || this._isFloating( this.currentItem ); + posProperty = floating ? "left" : "top"; + sizeProperty = floating ? "width" : "height"; + axis = floating ? "pageX" : "pageY"; + + for ( j = this.items.length - 1; j >= 0; j-- ) { + if ( !$.contains( + this.containers[ innermostIndex ].element[ 0 ], this.items[ j ].item[ 0 ] ) + ) { + continue; + } + if ( this.items[ j ].item[ 0 ] === this.currentItem[ 0 ] ) { + continue; + } + + cur = this.items[ j ].item.offset()[ posProperty ]; + nearBottom = false; + if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) { + nearBottom = true; + } + + if ( Math.abs( event[ axis ] - cur ) < dist ) { + dist = Math.abs( event[ axis ] - cur ); + itemWithLeastDistance = this.items[ j ]; + this.direction = nearBottom ? "up" : "down"; + } + } + + //Check if dropOnEmpty is enabled + if ( !itemWithLeastDistance && !this.options.dropOnEmpty ) { + return; + } + + if ( this.currentContainer === this.containers[ innermostIndex ] ) { + if ( !this.currentContainer.containerCache.over ) { + this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() ); + this.currentContainer.containerCache.over = 1; + } + return; + } + + if ( itemWithLeastDistance ) { + this._rearrange( event, itemWithLeastDistance, null, true ); + } else { + this._rearrange( event, null, this.containers[ innermostIndex ].element, true ); + } + this._trigger( "change", event, this._uiHash() ); + this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) ); + this.currentContainer = this.containers[ innermostIndex ]; + + //Update the placeholder + this.options.placeholder.update( this.currentContainer, this.placeholder ); + + //Update scrollParent + this.scrollParent = this.placeholder.scrollParent(); + + //Update overflowOffset + if ( this.scrollParent[ 0 ] !== this.document[ 0 ] && + this.scrollParent[ 0 ].tagName !== "HTML" ) { + this.overflowOffset = this.scrollParent.offset(); + } + + this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) ); + this.containers[ innermostIndex ].containerCache.over = 1; + } + + }, + + _createHelper: function( event ) { + + var o = this.options, + helper = typeof o.helper === "function" ? + $( o.helper.apply( this.element[ 0 ], [ event, this.currentItem ] ) ) : + ( o.helper === "clone" ? this.currentItem.clone() : this.currentItem ); + + //Add the helper to the DOM if that didn't happen already + if ( !helper.parents( "body" ).length ) { + this.appendTo[ 0 ].appendChild( helper[ 0 ] ); + } + + if ( helper[ 0 ] === this.currentItem[ 0 ] ) { + this._storedCSS = { + width: this.currentItem[ 0 ].style.width, + height: this.currentItem[ 0 ].style.height, + position: this.currentItem.css( "position" ), + top: this.currentItem.css( "top" ), + left: this.currentItem.css( "left" ) + }; + } + + if ( !helper[ 0 ].style.width || o.forceHelperSize ) { + helper.width( this.currentItem.width() ); + } + if ( !helper[ 0 ].style.height || o.forceHelperSize ) { + helper.height( this.currentItem.height() ); + } + + return helper; + + }, + + _adjustOffsetFromHelper: function( obj ) { + if ( typeof obj === "string" ) { + obj = obj.split( " " ); + } + if ( Array.isArray( obj ) ) { + obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 }; + } + if ( "left" in obj ) { + this.offset.click.left = obj.left + this.margins.left; + } + if ( "right" in obj ) { + this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left; + } + if ( "top" in obj ) { + this.offset.click.top = obj.top + this.margins.top; + } + if ( "bottom" in obj ) { + this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top; + } + }, + + _getParentOffset: function() { + + //Get the offsetParent and cache its position + this.offsetParent = this.helper.offsetParent(); + var po = this.offsetParent.offset(); + + // This is a special case where we need to modify a offset calculated on start, since the + // following happened: + // 1. The position of the helper is absolute, so it's position is calculated based on the + // next positioned parent + // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't + // the document, which means that the scroll is included in the initial calculation of the + // offset of the parent, and never recalculated upon drag + if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== this.document[ 0 ] && + $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) { + po.left += this.scrollParent.scrollLeft(); + po.top += this.scrollParent.scrollTop(); + } + + // This needs to be actually done for all browsers, since pageX/pageY includes + // this information. + if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ) { + po = { top: 0, left: 0 }; + } + + return { + top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ), + left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 ) + }; + + }, + + _getRelativeOffset: function() { + + if ( this.cssPosition === "relative" ) { + var p = this.currentItem.position(); + return { + top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) + + this.scrollParent.scrollTop(), + left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) + + this.scrollParent.scrollLeft() + }; + } else { + return { top: 0, left: 0 }; + } + + }, + + _cacheMargins: function() { + this.margins = { + left: ( parseInt( this.currentItem.css( "marginLeft" ), 10 ) || 0 ), + top: ( parseInt( this.currentItem.css( "marginTop" ), 10 ) || 0 ) + }; + }, + + _cacheHelperProportions: function() { + this.helperProportions = { + width: this.helper.outerWidth(), + height: this.helper.outerHeight() + }; + }, + + _setContainment: function() { + + var ce, co, over, + o = this.options; + if ( o.containment === "parent" ) { + o.containment = this.helper[ 0 ].parentNode; + } + if ( o.containment === "document" || o.containment === "window" ) { + this.containment = [ + 0 - this.offset.relative.left - this.offset.parent.left, + 0 - this.offset.relative.top - this.offset.parent.top, + o.containment === "document" ? + this.document.width() : + this.window.width() - this.helperProportions.width - this.margins.left, + ( o.containment === "document" ? + ( this.document.height() || document.body.parentNode.scrollHeight ) : + this.window.height() || this.document[ 0 ].body.parentNode.scrollHeight + ) - this.helperProportions.height - this.margins.top + ]; + } + + if ( !( /^(document|window|parent)$/ ).test( o.containment ) ) { + ce = $( o.containment )[ 0 ]; + co = $( o.containment ).offset(); + over = ( $( ce ).css( "overflow" ) !== "hidden" ); + + this.containment = [ + co.left + ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) + + ( parseInt( $( ce ).css( "paddingLeft" ), 10 ) || 0 ) - this.margins.left, + co.top + ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) + + ( parseInt( $( ce ).css( "paddingTop" ), 10 ) || 0 ) - this.margins.top, + co.left + ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) - + ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) - + ( parseInt( $( ce ).css( "paddingRight" ), 10 ) || 0 ) - + this.helperProportions.width - this.margins.left, + co.top + ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) - + ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) - + ( parseInt( $( ce ).css( "paddingBottom" ), 10 ) || 0 ) - + this.helperProportions.height - this.margins.top + ]; + } + + }, + + _convertPositionTo: function( d, pos ) { + + if ( !pos ) { + pos = this.position; + } + var mod = d === "absolute" ? 1 : -1, + scroll = this.cssPosition === "absolute" && + !( this.scrollParent[ 0 ] !== this.document[ 0 ] && + $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? + this.offsetParent : + this.scrollParent, + scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName ); + + return { + top: ( + + // The absolute mouse position + pos.top + + + // Only for relative positioned nodes: Relative offset from element to offset parent + this.offset.relative.top * mod + + + // The offsetParent's offset without borders (offset + border) + this.offset.parent.top * mod - + ( ( this.cssPosition === "fixed" ? + -this.scrollParent.scrollTop() : + ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod ) + ), + left: ( + + // The absolute mouse position + pos.left + + + // Only for relative positioned nodes: Relative offset from element to offset parent + this.offset.relative.left * mod + + + // The offsetParent's offset without borders (offset + border) + this.offset.parent.left * mod - + ( ( this.cssPosition === "fixed" ? + -this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 : + scroll.scrollLeft() ) * mod ) + ) + }; + + }, + + _generatePosition: function( event ) { + + var top, left, + o = this.options, + pageX = event.pageX, + pageY = event.pageY, + scroll = this.cssPosition === "absolute" && + !( this.scrollParent[ 0 ] !== this.document[ 0 ] && + $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ? + this.offsetParent : + this.scrollParent, + scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName ); + + // This is another very weird special case that only happens for relative elements: + // 1. If the css position is relative + // 2. and the scroll parent is the document or similar to the offset parent + // we have to refresh the relative offset during the scroll so there are no jumps + if ( this.cssPosition === "relative" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] && + this.scrollParent[ 0 ] !== this.offsetParent[ 0 ] ) ) { + this.offset.relative = this._getRelativeOffset(); + } + + /* + * - Position constraining - + * Constrain the position to a mix of grid, containment. + */ + + if ( this.originalPosition ) { //If we are not dragging yet, we won't check for options + + if ( this.containment ) { + if ( event.pageX - this.offset.click.left < this.containment[ 0 ] ) { + pageX = this.containment[ 0 ] + this.offset.click.left; + } + if ( event.pageY - this.offset.click.top < this.containment[ 1 ] ) { + pageY = this.containment[ 1 ] + this.offset.click.top; + } + if ( event.pageX - this.offset.click.left > this.containment[ 2 ] ) { + pageX = this.containment[ 2 ] + this.offset.click.left; + } + if ( event.pageY - this.offset.click.top > this.containment[ 3 ] ) { + pageY = this.containment[ 3 ] + this.offset.click.top; + } + } + + if ( o.grid ) { + top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) / + o.grid[ 1 ] ) * o.grid[ 1 ]; + pageY = this.containment ? + ( ( top - this.offset.click.top >= this.containment[ 1 ] && + top - this.offset.click.top <= this.containment[ 3 ] ) ? + top : + ( ( top - this.offset.click.top >= this.containment[ 1 ] ) ? + top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : + top; + + left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) / + o.grid[ 0 ] ) * o.grid[ 0 ]; + pageX = this.containment ? + ( ( left - this.offset.click.left >= this.containment[ 0 ] && + left - this.offset.click.left <= this.containment[ 2 ] ) ? + left : + ( ( left - this.offset.click.left >= this.containment[ 0 ] ) ? + left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : + left; + } + + } + + return { + top: ( + + // The absolute mouse position + pageY - + + // Click offset (relative to the element) + this.offset.click.top - + + // Only for relative positioned nodes: Relative offset from element to offset parent + this.offset.relative.top - + + // The offsetParent's offset without borders (offset + border) + this.offset.parent.top + + ( ( this.cssPosition === "fixed" ? + -this.scrollParent.scrollTop() : + ( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) ) + ), + left: ( + + // The absolute mouse position + pageX - + + // Click offset (relative to the element) + this.offset.click.left - + + // Only for relative positioned nodes: Relative offset from element to offset parent + this.offset.relative.left - + + // The offsetParent's offset without borders (offset + border) + this.offset.parent.left + + ( ( this.cssPosition === "fixed" ? + -this.scrollParent.scrollLeft() : + scrollIsRootNode ? 0 : scroll.scrollLeft() ) ) + ) + }; + + }, + + _rearrange: function( event, i, a, hardRefresh ) { + + if ( a ) { + a[ 0 ].appendChild( this.placeholder[ 0 ] ); + } else { + i.item[ 0 ].parentNode.insertBefore( this.placeholder[ 0 ], + ( this.direction === "down" ? i.item[ 0 ] : i.item[ 0 ].nextSibling ) ); + } + + //Various things done here to improve the performance: + // 1. we create a setTimeout, that calls refreshPositions + // 2. on the instance, we have a counter variable, that get's higher after every append + // 3. on the local scope, we copy the counter variable, and check in the timeout, + // if it's still the same + // 4. this lets only the last addition to the timeout stack through + this.counter = this.counter ? ++this.counter : 1; + var counter = this.counter; + + this._delay( function() { + if ( counter === this.counter ) { + + //Precompute after each DOM insertion, NOT on mousemove + this.refreshPositions( !hardRefresh ); + } + } ); + + }, + + _clear: function( event, noPropagation ) { + + this.reverting = false; + + // We delay all events that have to be triggered to after the point where the placeholder + // has been removed and everything else normalized again + var i, + delayedTriggers = []; + + // We first have to update the dom position of the actual currentItem + // Note: don't do it if the current item is already removed (by a user), or it gets + // reappended (see #4088) + if ( !this._noFinalSort && this.currentItem.parent().length ) { + this.placeholder.before( this.currentItem ); + } + this._noFinalSort = null; + + if ( this.helper[ 0 ] === this.currentItem[ 0 ] ) { + for ( i in this._storedCSS ) { + if ( this._storedCSS[ i ] === "auto" || this._storedCSS[ i ] === "static" ) { + this._storedCSS[ i ] = ""; + } + } + this.currentItem.css( this._storedCSS ); + this._removeClass( this.currentItem, "ui-sortable-helper" ); + } else { + this.currentItem.show(); + } + + if ( this.fromOutside && !noPropagation ) { + delayedTriggers.push( function( event ) { + this._trigger( "receive", event, this._uiHash( this.fromOutside ) ); + } ); + } + if ( ( this.fromOutside || + this.domPosition.prev !== + this.currentItem.prev().not( ".ui-sortable-helper" )[ 0 ] || + this.domPosition.parent !== this.currentItem.parent()[ 0 ] ) && !noPropagation ) { + + // Trigger update callback if the DOM position has changed + delayedTriggers.push( function( event ) { + this._trigger( "update", event, this._uiHash() ); + } ); + } + + // Check if the items Container has Changed and trigger appropriate + // events. + if ( this !== this.currentContainer ) { + if ( !noPropagation ) { + delayedTriggers.push( function( event ) { + this._trigger( "remove", event, this._uiHash() ); + } ); + delayedTriggers.push( ( function( c ) { + return function( event ) { + c._trigger( "receive", event, this._uiHash( this ) ); + }; + } ).call( this, this.currentContainer ) ); + delayedTriggers.push( ( function( c ) { + return function( event ) { + c._trigger( "update", event, this._uiHash( this ) ); + }; + } ).call( this, this.currentContainer ) ); + } + } + + //Post events to containers + function delayEvent( type, instance, container ) { + return function( event ) { + container._trigger( type, event, instance._uiHash( instance ) ); + }; + } + for ( i = this.containers.length - 1; i >= 0; i-- ) { + if ( !noPropagation ) { + delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) ); + } + if ( this.containers[ i ].containerCache.over ) { + delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) ); + this.containers[ i ].containerCache.over = 0; + } + } + + //Do what was originally in plugins + if ( this._storedStylesheet ) { + this._storedStylesheet.remove(); + this._storedStylesheet = null; + } + if ( this._storedOpacity ) { + this.helper.css( "opacity", this._storedOpacity ); + } + if ( this._storedZIndex ) { + this.helper.css( "zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex ); + } + + this.dragging = false; + + if ( !noPropagation ) { + this._trigger( "beforeStop", event, this._uiHash() ); + } + + //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, + // it unbinds ALL events from the original node! + this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] ); + + if ( !this.cancelHelperRemoval ) { + if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) { + this.helper.remove(); + } + this.helper = null; + } + + if ( !noPropagation ) { + for ( i = 0; i < delayedTriggers.length; i++ ) { + + // Trigger all delayed events + delayedTriggers[ i ].call( this, event ); + } + this._trigger( "stop", event, this._uiHash() ); + } + + this.fromOutside = false; + return !this.cancelHelperRemoval; + + }, + + _trigger: function() { + if ( $.Widget.prototype._trigger.apply( this, arguments ) === false ) { + this.cancel(); + } + }, + + _uiHash: function( _inst ) { + var inst = _inst || this; + return { + helper: inst.helper, + placeholder: inst.placeholder || $( [] ), + position: inst.position, + originalPosition: inst.originalPosition, + offset: inst.positionAbs, + item: inst.currentItem, + sender: _inst ? _inst.element : null + }; + } + +} ); + + +/*! + * jQuery UI Accordion 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Accordion +//>>group: Widgets +/* eslint-disable max-len */ +//>>description: Displays collapsible content panels for presenting information in a limited amount of space. +/* eslint-enable max-len */ +//>>docs: https://api.jqueryui.com/accordion/ +//>>demos: https://jqueryui.com/accordion/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/accordion.css +//>>css.theme: ../../themes/base/theme.css + + +var widgetsAccordion = $.widget( "ui.accordion", { + version: "1.14.1", + options: { + active: 0, + animate: {}, + classes: { + "ui-accordion-header": "ui-corner-top", + "ui-accordion-header-collapsed": "ui-corner-all", + "ui-accordion-content": "ui-corner-bottom" + }, + collapsible: false, + event: "click", + header: function( elem ) { + return elem + .find( "> li > :first-child" ) + .add( + elem.find( "> :not(li)" ) + + // Support: jQuery <3.5 only + // We could use `.even()` but that's unavailable in older jQuery. + .filter( function( i ) { + return i % 2 === 0; + } ) + ); + }, + heightStyle: "auto", + icons: { + activeHeader: "ui-icon-triangle-1-s", + header: "ui-icon-triangle-1-e" + }, + + // Callbacks + activate: null, + beforeActivate: null + }, + + hideProps: { + borderTopWidth: "hide", + borderBottomWidth: "hide", + paddingTop: "hide", + paddingBottom: "hide", + height: "hide" + }, + + showProps: { + borderTopWidth: "show", + borderBottomWidth: "show", + paddingTop: "show", + paddingBottom: "show", + height: "show" + }, + + _create: function() { + var options = this.options; + + this.prevShow = this.prevHide = $(); + this._addClass( "ui-accordion", "ui-widget ui-helper-reset" ); + this.element.attr( "role", "tablist" ); + + // Don't allow collapsible: false and active: false / null + if ( !options.collapsible && ( options.active === false || options.active == null ) ) { + options.active = 0; + } + + this._processPanels(); + + // handle negative values + if ( options.active < 0 ) { + options.active += this.headers.length; + } + this._refresh(); + }, + + _getCreateEventData: function() { + return { + header: this.active, + panel: !this.active.length ? $() : this.active.next() + }; + }, + + _createIcons: function() { + var icon, children, + icons = this.options.icons; + + if ( icons ) { + icon = $( "" ); + this._addClass( icon, "ui-accordion-header-icon", "ui-icon " + icons.header ); + icon.prependTo( this.headers ); + children = this.active.children( ".ui-accordion-header-icon" ); + this._removeClass( children, icons.header ) + ._addClass( children, null, icons.activeHeader ) + ._addClass( this.headers, "ui-accordion-icons" ); + } + }, + + _destroyIcons: function() { + this._removeClass( this.headers, "ui-accordion-icons" ); + this.headers.children( ".ui-accordion-header-icon" ).remove(); + }, + + _destroy: function() { + var contents; + + // Clean up main element + this.element.removeAttr( "role" ); + + // Clean up headers + this.headers + .removeAttr( "role aria-expanded aria-selected aria-controls tabIndex" ) + .removeUniqueId(); + + this._destroyIcons(); + + // Clean up content panels + contents = this.headers.next() + .css( "display", "" ) + .removeAttr( "role aria-hidden aria-labelledby" ) + .removeUniqueId(); + + if ( this.options.heightStyle !== "content" ) { + contents.css( "height", "" ); + } + }, + + _setOption: function( key, value ) { + if ( key === "active" ) { + + // _activate() will handle invalid values and update this.options + this._activate( value ); + return; + } + + if ( key === "event" ) { + if ( this.options.event ) { + this._off( this.headers, this.options.event ); + } + this._setupEvents( value ); + } + + this._super( key, value ); + + // Setting collapsible: false while collapsed; open first panel + if ( key === "collapsible" && !value && this.options.active === false ) { + this._activate( 0 ); + } + + if ( key === "icons" ) { + this._destroyIcons(); + if ( value ) { + this._createIcons(); + } + } + }, + + _setOptionDisabled: function( value ) { + this._super( value ); + + this.element.attr( "aria-disabled", value ); + this._toggleClass( null, "ui-state-disabled", !!value ); + }, + + _keydown: function( event ) { + if ( event.altKey || event.ctrlKey ) { + return; + } + + var keyCode = $.ui.keyCode, + length = this.headers.length, + currentIndex = this.headers.index( event.target ), + toFocus = false; + + switch ( event.keyCode ) { + case keyCode.RIGHT: + case keyCode.DOWN: + toFocus = this.headers[ ( currentIndex + 1 ) % length ]; + break; + case keyCode.LEFT: + case keyCode.UP: + toFocus = this.headers[ ( currentIndex - 1 + length ) % length ]; + break; + case keyCode.SPACE: + case keyCode.ENTER: + this._eventHandler( event ); + break; + case keyCode.HOME: + toFocus = this.headers[ 0 ]; + break; + case keyCode.END: + toFocus = this.headers[ length - 1 ]; + break; + } + + if ( toFocus ) { + $( event.target ).attr( "tabIndex", -1 ); + $( toFocus ).attr( "tabIndex", 0 ); + $( toFocus ).trigger( "focus" ); + event.preventDefault(); + } + }, + + _panelKeyDown: function( event ) { + if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) { + $( event.currentTarget ).prev().trigger( "focus" ); + } + }, + + refresh: function() { + var options = this.options; + this._processPanels(); + + // Was collapsed or no panel + if ( ( options.active === false && options.collapsible === true ) || + !this.headers.length ) { + options.active = false; + this.active = $(); + + // active false only when collapsible is true + } else if ( options.active === false ) { + this._activate( 0 ); + + // was active, but active panel is gone + } else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) { + + // all remaining panel are disabled + if ( this.headers.length === this.headers.find( ".ui-state-disabled" ).length ) { + options.active = false; + this.active = $(); + + // activate previous panel + } else { + this._activate( Math.max( 0, options.active - 1 ) ); + } + + // was active, active panel still exists + } else { + + // make sure active index is correct + options.active = this.headers.index( this.active ); + } + + this._destroyIcons(); + + this._refresh(); + }, + + _processPanels: function() { + var prevHeaders = this.headers, + prevPanels = this.panels; + + if ( typeof this.options.header === "function" ) { + this.headers = this.options.header( this.element ); + } else { + this.headers = this.element.find( this.options.header ); + } + this._addClass( this.headers, "ui-accordion-header ui-accordion-header-collapsed", + "ui-state-default" ); + + this.panels = this.headers.next().filter( ":not(.ui-accordion-content-active)" ).hide(); + this._addClass( this.panels, "ui-accordion-content", "ui-helper-reset ui-widget-content" ); + + // Avoid memory leaks (#10056) + if ( prevPanels ) { + this._off( prevHeaders.not( this.headers ) ); + this._off( prevPanels.not( this.panels ) ); + } + }, + + _refresh: function() { + var maxHeight, + options = this.options, + heightStyle = options.heightStyle, + parent = this.element.parent(); + + this.active = this._findActive( options.active ); + this._addClass( this.active, "ui-accordion-header-active", "ui-state-active" ) + ._removeClass( this.active, "ui-accordion-header-collapsed" ); + this._addClass( this.active.next(), "ui-accordion-content-active" ); + this.active.next().show(); + + this.headers + .attr( "role", "tab" ) + .each( function() { + var header = $( this ), + headerId = header.uniqueId().attr( "id" ), + panel = header.next(), + panelId = panel.uniqueId().attr( "id" ); + header.attr( "aria-controls", panelId ); + panel.attr( "aria-labelledby", headerId ); + } ) + .next() + .attr( "role", "tabpanel" ); + + this.headers + .not( this.active ) + .attr( { + "aria-selected": "false", + "aria-expanded": "false", + tabIndex: -1 + } ) + .next() + .attr( { + "aria-hidden": "true" + } ) + .hide(); + + // Make sure at least one header is in the tab order + if ( !this.active.length ) { + this.headers.eq( 0 ).attr( "tabIndex", 0 ); + } else { + this.active.attr( { + "aria-selected": "true", + "aria-expanded": "true", + tabIndex: 0 + } ) + .next() + .attr( { + "aria-hidden": "false" + } ); + } + + this._createIcons(); + + this._setupEvents( options.event ); + + if ( heightStyle === "fill" ) { + maxHeight = parent.height(); + this.element.siblings( ":visible" ).each( function() { + var elem = $( this ), + position = elem.css( "position" ); + + if ( position === "absolute" || position === "fixed" ) { + return; + } + maxHeight -= elem.outerHeight( true ); + } ); + + this.headers.each( function() { + maxHeight -= $( this ).outerHeight( true ); + } ); + + this.headers.next() + .each( function() { + $( this ).height( Math.max( 0, maxHeight - + $( this ).innerHeight() + $( this ).height() ) ); + } ) + .css( "overflow", "auto" ); + } else if ( heightStyle === "auto" ) { + maxHeight = 0; + this.headers.next() + .each( function() { + var isVisible = $( this ).is( ":visible" ); + if ( !isVisible ) { + $( this ).show(); + } + maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() ); + if ( !isVisible ) { + $( this ).hide(); + } + } ) + .height( maxHeight ); + } + }, + + _activate: function( index ) { + var active = this._findActive( index )[ 0 ]; + + // Trying to activate the already active panel + if ( active === this.active[ 0 ] ) { + return; + } + + // Trying to collapse, simulate a click on the currently active header + active = active || this.active[ 0 ]; + + this._eventHandler( { + target: active, + currentTarget: active, + preventDefault: $.noop + } ); + }, + + _findActive: function( selector ) { + return typeof selector === "number" ? this.headers.eq( selector ) : $(); + }, + + _setupEvents: function( event ) { + var events = { + keydown: "_keydown" + }; + if ( event ) { + $.each( event.split( " " ), function( index, eventName ) { + events[ eventName ] = "_eventHandler"; + } ); + } + + this._off( this.headers.add( this.headers.next() ) ); + this._on( this.headers, events ); + this._on( this.headers.next(), { keydown: "_panelKeyDown" } ); + this._hoverable( this.headers ); + this._focusable( this.headers ); + }, + + _eventHandler: function( event ) { + var activeChildren, clickedChildren, + options = this.options, + active = this.active, + clicked = $( event.currentTarget ), + clickedIsActive = clicked[ 0 ] === active[ 0 ], + collapsing = clickedIsActive && options.collapsible, + toShow = collapsing ? $() : clicked.next(), + toHide = active.next(), + eventData = { + oldHeader: active, + oldPanel: toHide, + newHeader: collapsing ? $() : clicked, + newPanel: toShow + }; + + event.preventDefault(); + + if ( + + // click on active header, but not collapsible + ( clickedIsActive && !options.collapsible ) || + + // allow canceling activation + ( this._trigger( "beforeActivate", event, eventData ) === false ) ) { + return; + } + + options.active = collapsing ? false : this.headers.index( clicked ); + + // When the call to ._toggle() comes after the class changes + // it causes a very odd bug in IE 8 (see #6720) + this.active = clickedIsActive ? $() : clicked; + this._toggle( eventData ); + + // Switch classes + // corner classes on the previously active header stay after the animation + this._removeClass( active, "ui-accordion-header-active", "ui-state-active" ); + if ( options.icons ) { + activeChildren = active.children( ".ui-accordion-header-icon" ); + this._removeClass( activeChildren, null, options.icons.activeHeader ) + ._addClass( activeChildren, null, options.icons.header ); + } + + if ( !clickedIsActive ) { + this._removeClass( clicked, "ui-accordion-header-collapsed" ) + ._addClass( clicked, "ui-accordion-header-active", "ui-state-active" ); + if ( options.icons ) { + clickedChildren = clicked.children( ".ui-accordion-header-icon" ); + this._removeClass( clickedChildren, null, options.icons.header ) + ._addClass( clickedChildren, null, options.icons.activeHeader ); + } + + this._addClass( clicked.next(), "ui-accordion-content-active" ); + } + }, + + _toggle: function( data ) { + var toShow = data.newPanel, + toHide = this.prevShow.length ? this.prevShow : data.oldPanel; + + // Handle activating a panel during the animation for another activation + this.prevShow.add( this.prevHide ).stop( true, true ); + this.prevShow = toShow; + this.prevHide = toHide; + + if ( this.options.animate ) { + this._animate( toShow, toHide, data ); + } else { + toHide.hide(); + toShow.show(); + this._toggleComplete( data ); + } + + toHide.attr( { + "aria-hidden": "true" + } ); + toHide.prev().attr( { + "aria-selected": "false", + "aria-expanded": "false" + } ); + + // if we're switching panels, remove the old header from the tab order + // if we're opening from collapsed state, remove the previous header from the tab order + // if we're collapsing, then keep the collapsing header in the tab order + if ( toShow.length && toHide.length ) { + toHide.prev().attr( { + "tabIndex": -1, + "aria-expanded": "false" + } ); + } else if ( toShow.length ) { + this.headers.filter( function() { + return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0; + } ) + .attr( "tabIndex", -1 ); + } + + toShow + .attr( "aria-hidden", "false" ) + .prev() + .attr( { + "aria-selected": "true", + "aria-expanded": "true", + tabIndex: 0 + } ); + }, + + _animate: function( toShow, toHide, data ) { + var total, easing, duration, + that = this, + adjust = 0, + boxSizing = toShow.css( "box-sizing" ), + down = toShow.length && + ( !toHide.length || ( toShow.index() < toHide.index() ) ), + animate = this.options.animate || {}, + options = down && animate.down || animate, + complete = function() { + that._toggleComplete( data ); + }; + + if ( typeof options === "number" ) { + duration = options; + } + if ( typeof options === "string" ) { + easing = options; + } + + // fall back from options to animation in case of partial down settings + easing = easing || options.easing || animate.easing; + duration = duration || options.duration || animate.duration; + + if ( !toHide.length ) { + return toShow.animate( this.showProps, duration, easing, complete ); + } + if ( !toShow.length ) { + return toHide.animate( this.hideProps, duration, easing, complete ); + } + + total = toShow.show().outerHeight(); + toHide.animate( this.hideProps, { + duration: duration, + easing: easing, + step: function( now, fx ) { + fx.now = Math.round( now ); + } + } ); + toShow + .hide() + .animate( this.showProps, { + duration: duration, + easing: easing, + complete: complete, + step: function( now, fx ) { + fx.now = Math.round( now ); + if ( fx.prop !== "height" ) { + if ( boxSizing === "content-box" ) { + adjust += fx.now; + } + } else if ( that.options.heightStyle !== "content" ) { + fx.now = Math.round( total - toHide.outerHeight() - adjust ); + adjust = 0; + } + } + } ); + }, + + _toggleComplete: function( data ) { + var toHide = data.oldPanel, + prev = toHide.prev(); + + this._removeClass( toHide, "ui-accordion-content-active" ); + this._removeClass( prev, "ui-accordion-header-active" ) + ._addClass( prev, "ui-accordion-header-collapsed" ); + + this._trigger( "activate", null, data ); + } +} ); + + +/*! + * jQuery UI Menu 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Menu +//>>group: Widgets +//>>description: Creates nestable menus. +//>>docs: https://api.jqueryui.com/menu/ +//>>demos: https://jqueryui.com/menu/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/menu.css +//>>css.theme: ../../themes/base/theme.css + + +var widgetsMenu = $.widget( "ui.menu", { + version: "1.14.1", + defaultElement: "
    ", + delay: 300, + options: { + icons: { + submenu: "ui-icon-caret-1-e" + }, + items: "> *", + menus: "ul", + position: { + my: "left top", + at: "right top" + }, + role: "menu", + + // Callbacks + blur: null, + focus: null, + select: null + }, + + _create: function() { + this.activeMenu = this.element; + + // Flag used to prevent firing of the click handler + // as the event bubbles up through nested menus + this.mouseHandled = false; + this.lastMousePosition = { x: null, y: null }; + this.element + .uniqueId() + .attr( { + role: this.options.role, + tabIndex: 0 + } ); + + this._addClass( "ui-menu", "ui-widget ui-widget-content" ); + this._on( { + + // Prevent focus from sticking to links inside menu after clicking + // them (focus should always stay on UL during navigation). + "mousedown .ui-menu-item": function( event ) { + event.preventDefault(); + + this._activateItem( event ); + }, + "click .ui-menu-item": function( event ) { + var target = $( event.target ); + var active = $( this.document[ 0 ].activeElement ); + if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) { + this.select( event ); + + // Only set the mouseHandled flag if the event will bubble, see #9469. + if ( !event.isPropagationStopped() ) { + this.mouseHandled = true; + } + + // Open submenu on click + if ( target.has( ".ui-menu" ).length ) { + this.expand( event ); + } else if ( !this.element.is( ":focus" ) && + active.closest( ".ui-menu" ).length ) { + + // Redirect focus to the menu + this.element.trigger( "focus", [ true ] ); + + // If the active item is on the top level, let it stay active. + // Otherwise, blur the active item since it is no longer visible. + if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) { + clearTimeout( this.timer ); + } + } + } + }, + "mouseenter .ui-menu-item": "_activateItem", + "mousemove .ui-menu-item": "_activateItem", + mouseleave: "collapseAll", + "mouseleave .ui-menu": "collapseAll", + focus: function( event, keepActiveItem ) { + + // If there's already an active item, keep it active + // If not, activate the first item + var item = this.active || this._menuItems().first(); + + if ( !keepActiveItem ) { + this.focus( event, item ); + } + }, + blur: function( event ) { + this._delay( function() { + var notContained = !$.contains( + this.element[ 0 ], + this.document[ 0 ].activeElement + ); + if ( notContained ) { + this.collapseAll( event ); + } + } ); + }, + keydown: "_keydown" + } ); + + this.refresh(); + + // Clicks outside of a menu collapse any open menus + this._on( this.document, { + click: function( event ) { + if ( this._closeOnDocumentClick( event ) ) { + this.collapseAll( event, true ); + } + + // Reset the mouseHandled flag + this.mouseHandled = false; + } + } ); + }, + + _activateItem: function( event ) { + + // Ignore mouse events while typeahead is active, see #10458. + // Prevents focusing the wrong item when typeahead causes a scroll while the mouse + // is over an item in the menu + if ( this.previousFilter ) { + return; + } + + // If the mouse didn't actually move, but the page was scrolled, ignore the event (#9356) + if ( event.clientX === this.lastMousePosition.x && + event.clientY === this.lastMousePosition.y ) { + return; + } + + this.lastMousePosition = { + x: event.clientX, + y: event.clientY + }; + + var actualTarget = $( event.target ).closest( ".ui-menu-item" ), + target = $( event.currentTarget ); + + // Ignore bubbled events on parent items, see #11641 + if ( actualTarget[ 0 ] !== target[ 0 ] ) { + return; + } + + // If the item is already active, there's nothing to do + if ( target.is( ".ui-state-active" ) ) { + return; + } + + // Remove ui-state-active class from siblings of the newly focused menu item + // to avoid a jump caused by adjacent elements both having a class with a border + this._removeClass( target.siblings().children( ".ui-state-active" ), + null, "ui-state-active" ); + this.focus( event, target ); + }, + + _destroy: function() { + var items = this.element.find( ".ui-menu-item" ) + .removeAttr( "role aria-disabled" ), + submenus = items.children( ".ui-menu-item-wrapper" ) + .removeUniqueId() + .removeAttr( "tabIndex role aria-haspopup" ); + + // Destroy (sub)menus + this.element + .removeAttr( "aria-activedescendant" ) + .find( ".ui-menu" ).addBack() + .removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " + + "tabIndex" ) + .removeUniqueId() + .show(); + + submenus.children().each( function() { + var elem = $( this ); + if ( elem.data( "ui-menu-submenu-caret" ) ) { + elem.remove(); + } + } ); + }, + + _keydown: function( event ) { + var match, prev, character, skip, + preventDefault = true; + + switch ( event.keyCode ) { + case $.ui.keyCode.PAGE_UP: + this.previousPage( event ); + break; + case $.ui.keyCode.PAGE_DOWN: + this.nextPage( event ); + break; + case $.ui.keyCode.HOME: + this._move( "first", "first", event ); + break; + case $.ui.keyCode.END: + this._move( "last", "last", event ); + break; + case $.ui.keyCode.UP: + this.previous( event ); + break; + case $.ui.keyCode.DOWN: + this.next( event ); + break; + case $.ui.keyCode.LEFT: + this.collapse( event ); + break; + case $.ui.keyCode.RIGHT: + if ( this.active && !this.active.is( ".ui-state-disabled" ) ) { + this.expand( event ); + } + break; + case $.ui.keyCode.ENTER: + case $.ui.keyCode.SPACE: + this._activate( event ); + break; + case $.ui.keyCode.ESCAPE: + this.collapse( event ); + break; + default: + preventDefault = false; + prev = this.previousFilter || ""; + skip = false; + + // Support number pad values + character = event.keyCode >= 96 && event.keyCode <= 105 ? + ( event.keyCode - 96 ).toString() : String.fromCharCode( event.keyCode ); + + clearTimeout( this.filterTimer ); + + if ( character === prev ) { + skip = true; + } else { + character = prev + character; + } + + match = this._filterMenuItems( character ); + match = skip && match.index( this.active.next() ) !== -1 ? + this.active.nextAll( ".ui-menu-item" ) : + match; + + // If no matches on the current filter, reset to the last character pressed + // to move down the menu to the first item that starts with that character + if ( !match.length ) { + character = String.fromCharCode( event.keyCode ); + match = this._filterMenuItems( character ); + } + + if ( match.length ) { + this.focus( event, match ); + this.previousFilter = character; + this.filterTimer = this._delay( function() { + delete this.previousFilter; + }, 1000 ); + } else { + delete this.previousFilter; + } + } + + if ( preventDefault ) { + event.preventDefault(); + } + }, + + _activate: function( event ) { + if ( this.active && !this.active.is( ".ui-state-disabled" ) ) { + if ( this.active.children( "[aria-haspopup='true']" ).length ) { + this.expand( event ); + } else { + this.select( event ); + } + } + }, + + refresh: function() { + var menus, items, newSubmenus, newItems, newWrappers, + that = this, + icon = this.options.icons.submenu, + submenus = this.element.find( this.options.menus ); + + this._toggleClass( "ui-menu-icons", null, !!this.element.find( ".ui-icon" ).length ); + + // Initialize nested menus + newSubmenus = submenus.filter( ":not(.ui-menu)" ) + .hide() + .attr( { + role: this.options.role, + "aria-hidden": "true", + "aria-expanded": "false" + } ) + .each( function() { + var menu = $( this ), + item = menu.prev(), + submenuCaret = $( "" ).data( "ui-menu-submenu-caret", true ); + + that._addClass( submenuCaret, "ui-menu-icon", "ui-icon " + icon ); + item + .attr( "aria-haspopup", "true" ) + .prepend( submenuCaret ); + menu.attr( "aria-labelledby", item.attr( "id" ) ); + } ); + + this._addClass( newSubmenus, "ui-menu", "ui-widget ui-widget-content ui-front" ); + + menus = submenus.add( this.element ); + items = menus.find( this.options.items ); + + // Initialize menu-items containing spaces and/or dashes only as dividers + items.not( ".ui-menu-item" ).each( function() { + var item = $( this ); + if ( that._isDivider( item ) ) { + that._addClass( item, "ui-menu-divider", "ui-widget-content" ); + } + } ); + + // Don't refresh list items that are already adapted + newItems = items.not( ".ui-menu-item, .ui-menu-divider" ); + newWrappers = newItems.children() + .not( ".ui-menu" ) + .uniqueId() + .attr( { + tabIndex: -1, + role: this._itemRole() + } ); + this._addClass( newItems, "ui-menu-item" ) + ._addClass( newWrappers, "ui-menu-item-wrapper" ); + + // Add aria-disabled attribute to any disabled menu item + items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" ); + + // If the active item has been removed, blur the menu + if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) { + this.blur(); + } + }, + + _itemRole: function() { + return { + menu: "menuitem", + listbox: "option" + }[ this.options.role ]; + }, + + _setOption: function( key, value ) { + if ( key === "icons" ) { + var icons = this.element.find( ".ui-menu-icon" ); + this._removeClass( icons, null, this.options.icons.submenu ) + ._addClass( icons, null, value.submenu ); + } + this._super( key, value ); + }, + + _setOptionDisabled: function( value ) { + this._super( value ); + + this.element.attr( "aria-disabled", String( value ) ); + this._toggleClass( null, "ui-state-disabled", !!value ); + }, + + focus: function( event, item ) { + var nested, focused, activeParent; + this.blur( event, event && event.type === "focus" ); + + this._scrollIntoView( item ); + + this.active = item.first(); + + focused = this.active.children( ".ui-menu-item-wrapper" ); + this._addClass( focused, null, "ui-state-active" ); + + // Only update aria-activedescendant if there's a role + // otherwise we assume focus is managed elsewhere + if ( this.options.role ) { + this.element.attr( "aria-activedescendant", focused.attr( "id" ) ); + } + + // Highlight active parent menu item, if any + activeParent = this.active + .parent() + .closest( ".ui-menu-item" ) + .children( ".ui-menu-item-wrapper" ); + this._addClass( activeParent, null, "ui-state-active" ); + + if ( event && event.type === "keydown" ) { + this._close(); + } else { + this.timer = this._delay( function() { + this._close(); + }, this.delay ); + } + + nested = item.children( ".ui-menu" ); + if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) { + this._startOpening( nested ); + } + this.activeMenu = item.parent(); + + this._trigger( "focus", event, { item: item } ); + }, + + _scrollIntoView: function( item ) { + var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight; + if ( this._hasScroll() ) { + borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0; + paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0; + offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop; + scroll = this.activeMenu.scrollTop(); + elementHeight = this.activeMenu.height(); + itemHeight = item.outerHeight(); + + if ( offset < 0 ) { + this.activeMenu.scrollTop( scroll + offset ); + } else if ( offset + itemHeight > elementHeight ) { + this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight ); + } + } + }, + + blur: function( event, fromFocus ) { + if ( !fromFocus ) { + clearTimeout( this.timer ); + } + + if ( !this.active ) { + return; + } + + this._removeClass( this.active.children( ".ui-menu-item-wrapper" ), + null, "ui-state-active" ); + + this._trigger( "blur", event, { item: this.active } ); + this.active = null; + }, + + _startOpening: function( submenu ) { + clearTimeout( this.timer ); + + // Don't open if already open fixes a Firefox bug that caused a .5 pixel + // shift in the submenu position when mousing over the caret icon + if ( submenu.attr( "aria-hidden" ) !== "true" ) { + return; + } + + this.timer = this._delay( function() { + this._close(); + this._open( submenu ); + }, this.delay ); + }, + + _open: function( submenu ) { + var position = $.extend( { + of: this.active + }, this.options.position ); + + clearTimeout( this.timer ); + this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) ) + .hide() + .attr( "aria-hidden", "true" ); + + submenu + .show() + .removeAttr( "aria-hidden" ) + .attr( "aria-expanded", "true" ) + .position( position ); + }, + + collapseAll: function( event, all ) { + clearTimeout( this.timer ); + this.timer = this._delay( function() { + + // If we were passed an event, look for the submenu that contains the event + var currentMenu = all ? this.element : + $( event && event.target ).closest( this.element.find( ".ui-menu" ) ); + + // If we found no valid submenu ancestor, use the main menu to close all + // sub menus anyway + if ( !currentMenu.length ) { + currentMenu = this.element; + } + + this._close( currentMenu ); + + this.blur( event ); + + // Work around active item staying active after menu is blurred + this._removeClass( currentMenu.find( ".ui-state-active" ), null, "ui-state-active" ); + + this.activeMenu = currentMenu; + }, all ? 0 : this.delay ); + }, + + // With no arguments, closes the currently active menu - if nothing is active + // it closes all menus. If passed an argument, it will search for menus BELOW + _close: function( startMenu ) { + if ( !startMenu ) { + startMenu = this.active ? this.active.parent() : this.element; + } + + startMenu.find( ".ui-menu" ) + .hide() + .attr( "aria-hidden", "true" ) + .attr( "aria-expanded", "false" ); + }, + + _closeOnDocumentClick: function( event ) { + return !$( event.target ).closest( ".ui-menu" ).length; + }, + + _isDivider: function( item ) { + + // Match hyphen, em dash, en dash + return !/[^\-\u2014\u2013\s]/.test( item.text() ); + }, + + collapse: function( event ) { + var newItem = this.active && + this.active.parent().closest( ".ui-menu-item", this.element ); + if ( newItem && newItem.length ) { + this._close(); + this.focus( event, newItem ); + } + }, + + expand: function( event ) { + var newItem = this.active && this._menuItems( this.active.children( ".ui-menu" ) ).first(); + + if ( newItem && newItem.length ) { + this._open( newItem.parent() ); + + // Delay so Firefox will not hide activedescendant change in expanding submenu from AT + this._delay( function() { + this.focus( event, newItem ); + } ); + } + }, + + next: function( event ) { + this._move( "next", "first", event ); + }, + + previous: function( event ) { + this._move( "prev", "last", event ); + }, + + isFirstItem: function() { + return this.active && !this.active.prevAll( ".ui-menu-item" ).length; + }, + + isLastItem: function() { + return this.active && !this.active.nextAll( ".ui-menu-item" ).length; + }, + + _menuItems: function( menu ) { + return ( menu || this.element ) + .find( this.options.items ) + .filter( ".ui-menu-item" ); + }, + + _move: function( direction, filter, event ) { + var next; + if ( this.active ) { + if ( direction === "first" || direction === "last" ) { + next = this.active + [ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" ) + .last(); + } else { + next = this.active + [ direction + "All" ]( ".ui-menu-item" ) + .first(); + } + } + if ( !next || !next.length || !this.active ) { + next = this._menuItems( this.activeMenu )[ filter ](); + } + + this.focus( event, next ); + }, + + nextPage: function( event ) { + var item, base, height; + + if ( !this.active ) { + this.next( event ); + return; + } + if ( this.isLastItem() ) { + return; + } + if ( this._hasScroll() ) { + base = this.active.offset().top; + height = this.element.innerHeight(); + + // jQuery 3.2 doesn't include scrollbars in innerHeight, add it back. + if ( $.fn.jquery.indexOf( "3.2." ) === 0 ) { + height += this.element[ 0 ].offsetHeight - this.element.outerHeight(); + } + + this.active.nextAll( ".ui-menu-item" ).each( function() { + item = $( this ); + return item.offset().top - base - height < 0; + } ); + + this.focus( event, item ); + } else { + this.focus( event, this._menuItems( this.activeMenu ) + [ !this.active ? "first" : "last" ]() ); + } + }, + + previousPage: function( event ) { + var item, base, height; + if ( !this.active ) { + this.next( event ); + return; + } + if ( this.isFirstItem() ) { + return; + } + if ( this._hasScroll() ) { + base = this.active.offset().top; + height = this.element.innerHeight(); + + // jQuery 3.2 doesn't include scrollbars in innerHeight, add it back. + if ( $.fn.jquery.indexOf( "3.2." ) === 0 ) { + height += this.element[ 0 ].offsetHeight - this.element.outerHeight(); + } + + this.active.prevAll( ".ui-menu-item" ).each( function() { + item = $( this ); + return item.offset().top - base + height > 0; + } ); + + this.focus( event, item ); + } else { + this.focus( event, this._menuItems( this.activeMenu ).first() ); + } + }, + + _hasScroll: function() { + return this.element.outerHeight() < this.element.prop( "scrollHeight" ); + }, + + select: function( event ) { + + // TODO: It should never be possible to not have an active item at this + // point, but the tests don't trigger mouseenter before click. + this.active = this.active || $( event.target ).closest( ".ui-menu-item" ); + var ui = { item: this.active }; + if ( !this.active.has( ".ui-menu" ).length ) { + this.collapseAll( event, true ); + } + this._trigger( "select", event, ui ); + }, + + _filterMenuItems: function( character ) { + var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ), + regex = new RegExp( "^" + escapedCharacter, "i" ); + + return this.activeMenu + .find( this.options.items ) + + // Only match on items, not dividers or other content (#10571) + .filter( ".ui-menu-item" ) + .filter( function() { + return regex.test( + String.prototype.trim.call( + $( this ).children( ".ui-menu-item-wrapper" ).text() ) ); + } ); + } +} ); + + +/*! + * jQuery UI Autocomplete 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Autocomplete +//>>group: Widgets +//>>description: Lists suggested words as the user is typing. +//>>docs: https://api.jqueryui.com/autocomplete/ +//>>demos: https://jqueryui.com/autocomplete/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/autocomplete.css +//>>css.theme: ../../themes/base/theme.css + + +$.widget( "ui.autocomplete", { + version: "1.14.1", + defaultElement: "", + options: { + appendTo: null, + autoFocus: false, + delay: 300, + minLength: 1, + position: { + my: "left top", + at: "left bottom", + collision: "none" + }, + source: null, + + // Callbacks + change: null, + close: null, + focus: null, + open: null, + response: null, + search: null, + select: null + }, + + requestIndex: 0, + pending: 0, + liveRegionTimer: null, + + _create: function() { + + // Some browsers only repeat keydown events, not keypress events, + // so we use the suppressKeyPress flag to determine if we've already + // handled the keydown event. #7269 + // Unfortunately the code for & in keypress is the same as the up arrow, + // so we use the suppressKeyPressRepeat flag to avoid handling keypress + // events when we know the keydown event was used to modify the + // search term. #7799 + var suppressKeyPress, suppressKeyPressRepeat, suppressInput, + nodeName = this.element[ 0 ].nodeName.toLowerCase(), + isTextarea = nodeName === "textarea", + isInput = nodeName === "input"; + + // Textareas are always multi-line + // Inputs are always single-line, even if inside a contentEditable element + // All other element types are determined by whether they're contentEditable + this.isMultiLine = isTextarea || + !isInput && this.element.prop( "contentEditable" ) === "true"; + + this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ]; + this.isNewMenu = true; + + this._addClass( "ui-autocomplete-input" ); + this.element.attr( "autocomplete", "off" ); + + this._on( this.element, { + keydown: function( event ) { + if ( this.element.prop( "readOnly" ) ) { + suppressKeyPress = true; + suppressInput = true; + suppressKeyPressRepeat = true; + return; + } + + suppressKeyPress = false; + suppressInput = false; + suppressKeyPressRepeat = false; + var keyCode = $.ui.keyCode; + switch ( event.keyCode ) { + case keyCode.PAGE_UP: + suppressKeyPress = true; + this._move( "previousPage", event ); + break; + case keyCode.PAGE_DOWN: + suppressKeyPress = true; + this._move( "nextPage", event ); + break; + case keyCode.UP: + suppressKeyPress = true; + this._keyEvent( "previous", event ); + break; + case keyCode.DOWN: + suppressKeyPress = true; + this._keyEvent( "next", event ); + break; + case keyCode.ENTER: + + // when menu is open and has focus + if ( this.menu.active ) { + + // #6055 - Opera still allows the keypress to occur + // which causes forms to submit + suppressKeyPress = true; + event.preventDefault(); + this.menu.select( event ); + } + break; + case keyCode.TAB: + if ( this.menu.active ) { + this.menu.select( event ); + } + break; + case keyCode.ESCAPE: + if ( this.menu.element.is( ":visible" ) ) { + if ( !this.isMultiLine ) { + this._value( this.term ); + } + this.close( event ); + + // Different browsers have different default behavior for escape + // Single press can mean undo or clear + event.preventDefault(); + } + break; + default: + suppressKeyPressRepeat = true; + + // search timeout should be triggered before the input value is changed + this._searchTimeout( event ); + break; + } + }, + keypress: function( event ) { + if ( suppressKeyPress ) { + suppressKeyPress = false; + if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) { + event.preventDefault(); + } + return; + } + if ( suppressKeyPressRepeat ) { + return; + } + + // Replicate some key handlers to allow them to repeat in Firefox and Opera + var keyCode = $.ui.keyCode; + switch ( event.keyCode ) { + case keyCode.PAGE_UP: + this._move( "previousPage", event ); + break; + case keyCode.PAGE_DOWN: + this._move( "nextPage", event ); + break; + case keyCode.UP: + this._keyEvent( "previous", event ); + break; + case keyCode.DOWN: + this._keyEvent( "next", event ); + break; + } + }, + input: function( event ) { + if ( suppressInput ) { + suppressInput = false; + event.preventDefault(); + return; + } + this._searchTimeout( event ); + }, + focus: function() { + this.selectedItem = null; + this.previous = this._value(); + }, + blur: function( event ) { + clearTimeout( this.searching ); + this.close( event ); + this._change( event ); + } + } ); + + this._initSource(); + this.menu = $( "
      " ) + .appendTo( this._appendTo() ) + .menu( { + + // disable ARIA support, the live region takes care of that + role: null + } ) + .hide() + .menu( "instance" ); + + this._addClass( this.menu.element, "ui-autocomplete", "ui-front" ); + this._on( this.menu.element, { + mousedown: function( event ) { + + // Prevent moving focus out of the text field + event.preventDefault(); + }, + menufocus: function( event, ui ) { + var label, item; + + // Support: Firefox + // Prevent accidental activation of menu items in Firefox (#7024 #9118) + if ( this.isNewMenu ) { + this.isNewMenu = false; + if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) { + this.menu.blur(); + + this.document.one( "mousemove", function() { + $( event.target ).trigger( event.originalEvent ); + } ); + + return; + } + } + + item = ui.item.data( "ui-autocomplete-item" ); + if ( false !== this._trigger( "focus", event, { item: item } ) ) { + + // use value to match what will end up in the input, if it was a key event + if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) { + this._value( item.value ); + } + } + + // Announce the value in the liveRegion + label = ui.item.attr( "aria-label" ) || item.value; + if ( label && String.prototype.trim.call( label ).length ) { + clearTimeout( this.liveRegionTimer ); + this.liveRegionTimer = this._delay( function() { + this.liveRegion.html( $( "
      " ).text( label ) ); + }, 100 ); + } + }, + menuselect: function( event, ui ) { + var item = ui.item.data( "ui-autocomplete-item" ), + previous = this.previous; + + // Only trigger when focus was lost (click on menu) + if ( this.element[ 0 ] !== this.document[ 0 ].activeElement ) { + this.element.trigger( "focus" ); + this.previous = previous; + } + + if ( false !== this._trigger( "select", event, { item: item } ) ) { + this._value( item.value ); + } + + // reset the term after the select event + // this allows custom select handling to work properly + this.term = this._value(); + + this.close( event ); + this.selectedItem = item; + } + } ); + + this.liveRegion = $( "
      ", { + role: "status", + "aria-live": "assertive", + "aria-relevant": "additions" + } ) + .appendTo( this.document[ 0 ].body ); + + this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" ); + + // Turning off autocomplete prevents the browser from remembering the + // value when navigating through history, so we re-enable autocomplete + // if the page is unloaded before the widget is destroyed. #7790 + this._on( this.window, { + beforeunload: function() { + this.element.removeAttr( "autocomplete" ); + } + } ); + }, + + _destroy: function() { + clearTimeout( this.searching ); + this.element.removeAttr( "autocomplete" ); + this.menu.element.remove(); + this.liveRegion.remove(); + }, + + _setOption: function( key, value ) { + this._super( key, value ); + if ( key === "source" ) { + this._initSource(); + } + if ( key === "appendTo" ) { + this.menu.element.appendTo( this._appendTo() ); + } + if ( key === "disabled" && value && this.xhr ) { + this.xhr.abort(); + } + }, + + _isEventTargetInWidget: function( event ) { + var menuElement = this.menu.element[ 0 ]; + + return event.target === this.element[ 0 ] || + event.target === menuElement || + $.contains( menuElement, event.target ); + }, + + _closeOnClickOutside: function( event ) { + if ( !this._isEventTargetInWidget( event ) ) { + this.close(); + } + }, + + _appendTo: function() { + var element = this.options.appendTo; + + if ( element ) { + element = element.jquery || element.nodeType ? + $( element ) : + this.document.find( element ).eq( 0 ); + } + + if ( !element || !element[ 0 ] ) { + element = this.element.closest( ".ui-front, dialog" ); + } + + if ( !element.length ) { + element = this.document[ 0 ].body; + } + + return element; + }, + + _initSource: function() { + var array, url, + that = this; + if ( Array.isArray( this.options.source ) ) { + array = this.options.source; + this.source = function( request, response ) { + response( $.ui.autocomplete.filter( array, request.term ) ); + }; + } else if ( typeof this.options.source === "string" ) { + url = this.options.source; + this.source = function( request, response ) { + if ( that.xhr ) { + that.xhr.abort(); + } + that.xhr = $.ajax( { + url: url, + data: request, + dataType: "json", + success: function( data ) { + response( data ); + }, + error: function() { + response( [] ); + } + } ); + }; + } else { + this.source = this.options.source; + } + }, + + _searchTimeout: function( event ) { + clearTimeout( this.searching ); + this.searching = this._delay( function() { + + // Search if the value has changed, or if the user retypes the same value (see #7434) + var equalValues = this.term === this._value(), + menuVisible = this.menu.element.is( ":visible" ), + modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey; + + if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) { + this.selectedItem = null; + this.search( null, event ); + } + }, this.options.delay ); + }, + + search: function( value, event ) { + value = value != null ? value : this._value(); + + // Always save the actual value, not the one passed as an argument + this.term = this._value(); + + if ( value.length < this.options.minLength ) { + return this.close( event ); + } + + if ( this._trigger( "search", event ) === false ) { + return; + } + + return this._search( value ); + }, + + _search: function( value ) { + this.pending++; + this._addClass( "ui-autocomplete-loading" ); + this.cancelSearch = false; + + this.source( { term: value }, this._response() ); + }, + + _response: function() { + var index = ++this.requestIndex; + + return function( content ) { + if ( index === this.requestIndex ) { + this.__response( content ); + } + + this.pending--; + if ( !this.pending ) { + this._removeClass( "ui-autocomplete-loading" ); + } + }.bind( this ); + }, + + __response: function( content ) { + if ( content ) { + content = this._normalize( content ); + } + this._trigger( "response", null, { content: content } ); + if ( !this.options.disabled && content && content.length && !this.cancelSearch ) { + this._suggest( content ); + this._trigger( "open" ); + } else { + + // use ._close() instead of .close() so we don't cancel future searches + this._close(); + } + }, + + close: function( event ) { + this.cancelSearch = true; + this._close( event ); + }, + + _close: function( event ) { + + // Remove the handler that closes the menu on outside clicks + this._off( this.document, "mousedown" ); + + if ( this.menu.element.is( ":visible" ) ) { + this.menu.element.hide(); + this.menu.blur(); + this.isNewMenu = true; + this._trigger( "close", event ); + } + }, + + _change: function( event ) { + if ( this.previous !== this._value() ) { + this._trigger( "change", event, { item: this.selectedItem } ); + } + }, + + _normalize: function( items ) { + + // assume all items have the right format when the first item is complete + if ( items.length && items[ 0 ].label && items[ 0 ].value ) { + return items; + } + return $.map( items, function( item ) { + if ( typeof item === "string" ) { + return { + label: item, + value: item + }; + } + return $.extend( {}, item, { + label: item.label || item.value, + value: item.value || item.label + } ); + } ); + }, + + _suggest: function( items ) { + var ul = this.menu.element.empty(); + this._renderMenu( ul, items ); + this.isNewMenu = true; + this.menu.refresh(); + + // Size and position menu + ul.show(); + this._resizeMenu(); + ul.position( $.extend( { + of: this.element + }, this.options.position ) ); + + if ( this.options.autoFocus ) { + this.menu.next(); + } + + // Listen for interactions outside of the widget (#6642) + this._on( this.document, { + mousedown: "_closeOnClickOutside" + } ); + }, + + _resizeMenu: function() { + var ul = this.menu.element; + ul.outerWidth( Math.max( + + // Firefox wraps long text (possibly a rounding bug) + // so we add 1px to avoid the wrapping (#7513) + ul.width( "" ).outerWidth() + 1, + this.element.outerWidth() + ) ); + }, + + _renderMenu: function( ul, items ) { + var that = this; + $.each( items, function( index, item ) { + that._renderItemData( ul, item ); + } ); + }, + + _renderItemData: function( ul, item ) { + return this._renderItem( ul, item ).data( "ui-autocomplete-item", item ); + }, + + _renderItem: function( ul, item ) { + return $( "
    • " ) + .append( $( "
      " ).text( item.label ) ) + .appendTo( ul ); + }, + + _move: function( direction, event ) { + if ( !this.menu.element.is( ":visible" ) ) { + this.search( null, event ); + return; + } + if ( this.menu.isFirstItem() && /^previous/.test( direction ) || + this.menu.isLastItem() && /^next/.test( direction ) ) { + + if ( !this.isMultiLine ) { + this._value( this.term ); + } + + this.menu.blur(); + return; + } + this.menu[ direction ]( event ); + }, + + widget: function() { + return this.menu.element; + }, + + _value: function() { + return this.valueMethod.apply( this.element, arguments ); + }, + + _keyEvent: function( keyEvent, event ) { + if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) { + this._move( keyEvent, event ); + + // Prevents moving cursor to beginning/end of the text field in some browsers + event.preventDefault(); + } + } +} ); + +$.extend( $.ui.autocomplete, { + escapeRegex: function( value ) { + return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ); + }, + filter: function( array, term ) { + var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" ); + return $.grep( array, function( value ) { + return matcher.test( value.label || value.value || value ); + } ); + } +} ); + +// Live region extension, adding a `messages` option +// NOTE: This is an experimental API. We are still investigating +// a full solution for string manipulation and internationalization. +$.widget( "ui.autocomplete", $.ui.autocomplete, { + options: { + messages: { + noResults: "No search results.", + results: function( amount ) { + return amount + ( amount > 1 ? " results are" : " result is" ) + + " available, use up and down arrow keys to navigate."; + } + } + }, + + __response: function( content ) { + var message; + this._superApply( arguments ); + if ( this.options.disabled || this.cancelSearch ) { + return; + } + if ( content && content.length ) { + message = this.options.messages.results( content.length ); + } else { + message = this.options.messages.noResults; + } + clearTimeout( this.liveRegionTimer ); + this.liveRegionTimer = this._delay( function() { + this.liveRegion.html( $( "
      " ).text( message ) ); + }, 100 ); + } +} ); + +var widgetsAutocomplete = $.ui.autocomplete; + + +/*! + * jQuery UI Controlgroup 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Controlgroup +//>>group: Widgets +//>>description: Visually groups form control widgets +//>>docs: https://api.jqueryui.com/controlgroup/ +//>>demos: https://jqueryui.com/controlgroup/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/controlgroup.css +//>>css.theme: ../../themes/base/theme.css + + +var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g; + +var widgetsControlgroup = $.widget( "ui.controlgroup", { + version: "1.14.1", + defaultElement: "
      ", + options: { + direction: "horizontal", + disabled: null, + onlyVisible: true, + items: { + "button": "input[type=button], input[type=submit], input[type=reset], button, a", + "controlgroupLabel": ".ui-controlgroup-label", + "checkboxradio": "input[type='checkbox'], input[type='radio']", + "selectmenu": "select", + "spinner": ".ui-spinner-input" + } + }, + + _create: function() { + this._enhance(); + }, + + // To support the enhanced option in jQuery Mobile, we isolate DOM manipulation + _enhance: function() { + this.element.attr( "role", "toolbar" ); + this.refresh(); + }, + + _destroy: function() { + this._callChildMethod( "destroy" ); + this.childWidgets.removeData( "ui-controlgroup-data" ); + this.element.removeAttr( "role" ); + if ( this.options.items.controlgroupLabel ) { + this.element + .find( this.options.items.controlgroupLabel ) + .find( ".ui-controlgroup-label-contents" ) + .contents().unwrap(); + } + }, + + _initWidgets: function() { + var that = this, + childWidgets = []; + + // First we iterate over each of the items options + $.each( this.options.items, function( widget, selector ) { + var labels; + var options = {}; + + // Make sure the widget has a selector set + if ( !selector ) { + return; + } + + if ( widget === "controlgroupLabel" ) { + labels = that.element.find( selector ); + labels.each( function() { + var element = $( this ); + + if ( element.children( ".ui-controlgroup-label-contents" ).length ) { + return; + } + element.contents() + .wrapAll( "" ); + } ); + that._addClass( labels, null, "ui-widget ui-widget-content ui-state-default" ); + childWidgets = childWidgets.concat( labels.get() ); + return; + } + + // Make sure the widget actually exists + if ( !$.fn[ widget ] ) { + return; + } + + // We assume everything is in the middle to start because we can't determine + // first / last elements until all enhancments are done. + if ( that[ "_" + widget + "Options" ] ) { + options = that[ "_" + widget + "Options" ]( "middle" ); + } else { + options = { classes: {} }; + } + + // Find instances of this widget inside controlgroup and init them + that.element + .find( selector ) + .each( function() { + var element = $( this ); + var instance = element[ widget ]( "instance" ); + + // We need to clone the default options for this type of widget to avoid + // polluting the variable options which has a wider scope than a single widget. + var instanceOptions = $.widget.extend( {}, options ); + + // If the button is the child of a spinner ignore it + // TODO: Find a more generic solution + if ( widget === "button" && element.parent( ".ui-spinner" ).length ) { + return; + } + + // Create the widget if it doesn't exist + if ( !instance ) { + instance = element[ widget ]()[ widget ]( "instance" ); + } + if ( instance ) { + instanceOptions.classes = + that._resolveClassesValues( instanceOptions.classes, instance ); + } + element[ widget ]( instanceOptions ); + + // Store an instance of the controlgroup to be able to reference + // from the outermost element for changing options and refresh + var widgetElement = element[ widget ]( "widget" ); + $.data( widgetElement[ 0 ], "ui-controlgroup-data", + instance ? instance : element[ widget ]( "instance" ) ); + + childWidgets.push( widgetElement[ 0 ] ); + } ); + } ); + + this.childWidgets = $( $.uniqueSort( childWidgets ) ); + this._addClass( this.childWidgets, "ui-controlgroup-item" ); + }, + + _callChildMethod: function( method ) { + this.childWidgets.each( function() { + var element = $( this ), + data = element.data( "ui-controlgroup-data" ); + if ( data && data[ method ] ) { + data[ method ](); + } + } ); + }, + + _updateCornerClass: function( element, position ) { + var remove = "ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all"; + var add = this._buildSimpleOptions( position, "label" ).classes.label; + + this._removeClass( element, null, remove ); + this._addClass( element, null, add ); + }, + + _buildSimpleOptions: function( position, key ) { + var direction = this.options.direction === "vertical"; + var result = { + classes: {} + }; + result.classes[ key ] = { + "middle": "", + "first": "ui-corner-" + ( direction ? "top" : "left" ), + "last": "ui-corner-" + ( direction ? "bottom" : "right" ), + "only": "ui-corner-all" + }[ position ]; + + return result; + }, + + _spinnerOptions: function( position ) { + var options = this._buildSimpleOptions( position, "ui-spinner" ); + + options.classes[ "ui-spinner-up" ] = ""; + options.classes[ "ui-spinner-down" ] = ""; + + return options; + }, + + _buttonOptions: function( position ) { + return this._buildSimpleOptions( position, "ui-button" ); + }, + + _checkboxradioOptions: function( position ) { + return this._buildSimpleOptions( position, "ui-checkboxradio-label" ); + }, + + _selectmenuOptions: function( position ) { + var direction = this.options.direction === "vertical"; + return { + width: direction ? "auto" : false, + classes: { + middle: { + "ui-selectmenu-button-open": "", + "ui-selectmenu-button-closed": "" + }, + first: { + "ui-selectmenu-button-open": "ui-corner-" + ( direction ? "top" : "tl" ), + "ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "top" : "left" ) + }, + last: { + "ui-selectmenu-button-open": direction ? "" : "ui-corner-tr", + "ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "bottom" : "right" ) + }, + only: { + "ui-selectmenu-button-open": "ui-corner-top", + "ui-selectmenu-button-closed": "ui-corner-all" + } + + }[ position ] + }; + }, + + _resolveClassesValues: function( classes, instance ) { + var result = {}; + $.each( classes, function( key ) { + var current = instance.options.classes[ key ] || ""; + current = String.prototype.trim.call( current.replace( controlgroupCornerRegex, "" ) ); + result[ key ] = ( current + " " + classes[ key ] ).replace( /\s+/g, " " ); + } ); + return result; + }, + + _setOption: function( key, value ) { + if ( key === "direction" ) { + this._removeClass( "ui-controlgroup-" + this.options.direction ); + } + + this._super( key, value ); + if ( key === "disabled" ) { + this._callChildMethod( value ? "disable" : "enable" ); + return; + } + + this.refresh(); + }, + + refresh: function() { + var children, + that = this; + + this._addClass( "ui-controlgroup ui-controlgroup-" + this.options.direction ); + + if ( this.options.direction === "horizontal" ) { + this._addClass( null, "ui-helper-clearfix" ); + } + this._initWidgets(); + + children = this.childWidgets; + + // We filter here because we need to track all childWidgets not just the visible ones + if ( this.options.onlyVisible ) { + children = children.filter( ":visible" ); + } + + if ( children.length ) { + + // We do this last because we need to make sure all enhancment is done + // before determining first and last + $.each( [ "first", "last" ], function( index, value ) { + var instance = children[ value ]().data( "ui-controlgroup-data" ); + + if ( instance && that[ "_" + instance.widgetName + "Options" ] ) { + var options = that[ "_" + instance.widgetName + "Options" ]( + children.length === 1 ? "only" : value + ); + options.classes = that._resolveClassesValues( options.classes, instance ); + instance.element[ instance.widgetName ]( options ); + } else { + that._updateCornerClass( children[ value ](), value ); + } + } ); + + // Finally call the refresh method on each of the child widgets. + this._callChildMethod( "refresh" ); + } + } +} ); + +/*! + * jQuery UI Checkboxradio 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Checkboxradio +//>>group: Widgets +//>>description: Enhances a form with multiple themeable checkboxes or radio buttons. +//>>docs: https://api.jqueryui.com/checkboxradio/ +//>>demos: https://jqueryui.com/checkboxradio/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/button.css +//>>css.structure: ../../themes/base/checkboxradio.css +//>>css.theme: ../../themes/base/theme.css + + +$.widget( "ui.checkboxradio", [ $.ui.formResetMixin, { + version: "1.14.1", + options: { + disabled: null, + label: null, + icon: true, + classes: { + "ui-checkboxradio-label": "ui-corner-all", + "ui-checkboxradio-icon": "ui-corner-all" + } + }, + + _getCreateOptions: function() { + var disabled, labels, labelContents; + var options = this._super() || {}; + + // We read the type here, because it makes more sense to throw a element type error first, + // rather then the error for lack of a label. Often if its the wrong type, it + // won't have a label (e.g. calling on a div, btn, etc) + this._readType(); + + labels = this.element.labels(); + + // If there are multiple labels, use the last one + this.label = $( labels[ labels.length - 1 ] ); + if ( !this.label.length ) { + $.error( "No label found for checkboxradio widget" ); + } + + this.originalLabel = ""; + + // We need to get the label text but this may also need to make sure it does not contain the + // input itself. + // The label contents could be text, html, or a mix. We wrap all elements + // and read the wrapper's `innerHTML` to get a string representation of + // the label, without the input as part of it. + labelContents = this.label.contents().not( this.element[ 0 ] ); + + if ( labelContents.length ) { + this.originalLabel += labelContents + .clone() + .wrapAll( "
      " ) + .parent() + .html(); + } + + // Set the label option if we found label text + if ( this.originalLabel ) { + options.label = this.originalLabel; + } + + disabled = this.element[ 0 ].disabled; + if ( disabled != null ) { + options.disabled = disabled; + } + return options; + }, + + _create: function() { + var checked = this.element[ 0 ].checked; + + this._bindFormResetHandler(); + + if ( this.options.disabled == null ) { + this.options.disabled = this.element[ 0 ].disabled; + } + + this._setOption( "disabled", this.options.disabled ); + this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" ); + this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" ); + + if ( this.type === "radio" ) { + this._addClass( this.label, "ui-checkboxradio-radio-label" ); + } + + if ( this.options.label && this.options.label !== this.originalLabel ) { + this._updateLabel(); + } else if ( this.originalLabel ) { + this.options.label = this.originalLabel; + } + + this._enhance(); + + if ( checked ) { + this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" ); + } + + this._on( { + change: "_toggleClasses", + focus: function() { + this._addClass( this.label, null, "ui-state-focus ui-visual-focus" ); + }, + blur: function() { + this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" ); + } + } ); + }, + + _readType: function() { + var nodeName = this.element[ 0 ].nodeName.toLowerCase(); + this.type = this.element[ 0 ].type; + if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) { + $.error( "Can't create checkboxradio on element.nodeName=" + nodeName + + " and element.type=" + this.type ); + } + }, + + // Support jQuery Mobile enhanced option + _enhance: function() { + this._updateIcon( this.element[ 0 ].checked ); + }, + + widget: function() { + return this.label; + }, + + _getRadioGroup: function() { + var group; + var name = this.element[ 0 ].name; + var nameSelector = "input[name='" + CSS.escape( name ) + "']"; + + if ( !name ) { + return $( [] ); + } + + if ( this.form.length ) { + group = $( this.form[ 0 ].elements ).filter( nameSelector ); + } else { + + // Not inside a form, check all inputs that also are not inside a form + group = $( nameSelector ).filter( function() { + return $( $( this ).prop( "form" ) ).length === 0; + } ); + } + + return group.not( this.element ); + }, + + _toggleClasses: function() { + var checked = this.element[ 0 ].checked; + this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked ); + + if ( this.options.icon && this.type === "checkbox" ) { + this._toggleClass( this.icon, null, "ui-icon-check ui-state-checked", checked ) + ._toggleClass( this.icon, null, "ui-icon-blank", !checked ); + } + + if ( this.type === "radio" ) { + this._getRadioGroup() + .each( function() { + var instance = $( this ).checkboxradio( "instance" ); + + if ( instance ) { + instance._removeClass( instance.label, + "ui-checkboxradio-checked", "ui-state-active" ); + } + } ); + } + }, + + _destroy: function() { + this._unbindFormResetHandler(); + + if ( this.icon ) { + this.icon.remove(); + this.iconSpace.remove(); + } + }, + + _setOption: function( key, value ) { + + // We don't allow the value to be set to nothing + if ( key === "label" && !value ) { + return; + } + + this._super( key, value ); + + if ( key === "disabled" ) { + this._toggleClass( this.label, null, "ui-state-disabled", value ); + this.element[ 0 ].disabled = value; + + // Don't refresh when setting disabled + return; + } + this.refresh(); + }, + + _updateIcon: function( checked ) { + var toAdd = "ui-icon ui-icon-background "; + + if ( this.options.icon ) { + if ( !this.icon ) { + this.icon = $( "" ); + this.iconSpace = $( " " ); + this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" ); + } + + if ( this.type === "checkbox" ) { + toAdd += checked ? "ui-icon-check ui-state-checked" : "ui-icon-blank"; + this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" ); + } else { + toAdd += "ui-icon-blank"; + } + this._addClass( this.icon, "ui-checkboxradio-icon", toAdd ); + if ( !checked ) { + this._removeClass( this.icon, null, "ui-icon-check ui-state-checked" ); + } + this.icon.prependTo( this.label ).after( this.iconSpace ); + } else if ( this.icon !== undefined ) { + this.icon.remove(); + this.iconSpace.remove(); + delete this.icon; + } + }, + + _updateLabel: function() { + + // Remove the contents of the label ( minus the icon, icon space, and input ) + var contents = this.label.contents().not( this.element[ 0 ] ); + if ( this.icon ) { + contents = contents.not( this.icon[ 0 ] ); + } + if ( this.iconSpace ) { + contents = contents.not( this.iconSpace[ 0 ] ); + } + contents.remove(); + + this.label.append( this.options.label ); + }, + + refresh: function() { + var checked = this.element[ 0 ].checked, + isDisabled = this.element[ 0 ].disabled; + + this._updateIcon( checked ); + this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked ); + if ( this.options.label !== null ) { + this._updateLabel(); + } + + if ( isDisabled !== this.options.disabled ) { + this._setOptions( { "disabled": isDisabled } ); + } + } + +} ] ); + +var widgetsCheckboxradio = $.ui.checkboxradio; + + +/*! + * jQuery UI Button 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Button +//>>group: Widgets +//>>description: Enhances a form with themeable buttons. +//>>docs: https://api.jqueryui.com/button/ +//>>demos: https://jqueryui.com/button/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/button.css +//>>css.theme: ../../themes/base/theme.css + + +$.widget( "ui.button", { + version: "1.14.1", + defaultElement: "
- print $this->render('schedules/bookmark_control.phtml'); + {{ include( + 'schedules/bookmark_control.html.twig', + { + course_id: item.offering.course.id, + }, + with_context = false + )}}
{{ item.offering.title }}
{{ item.offering.description | raw }}
diff --git a/templates/offerings/view.html.twig b/templates/offerings/view.html.twig index 1a4123e9..a6697f97 100755 --- a/templates/offerings/view.html.twig +++ b/templates/offerings/view.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -print $this->render('schedules/bookmark_control.phtml'); +{{ include('schedules/bookmark_control.html.twig', {course_id: offering.course.id}, with_context = false) }}
{{ offering.displayname }}

{{ offering.title|nl2br }}

diff --git a/templates/schedules/bookmark_control.html.twig b/templates/schedules/bookmark_control.html.twig new file mode 100755 index 00000000..7da4a9ae --- /dev/null +++ b/templates/schedules/bookmark_control.html.twig @@ -0,0 +1,23 @@ +
+{% if is_granted('IS_AUTHENTICATED_FULLY') %} +

Bookmark this course

+
+ + + +{% else %} + Log-in to save +{% endif %} +
From 18101b01adb62366afe26f414a20e973a326121e Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 18 Oct 2024 17:21:50 -0400 Subject: [PATCH 053/173] #47: Pass a returnTo parameter through the login flow. This isn't ideal as a session gets created before authentication is successful, preventing some anonymous requests from getting anonymous responses from cache. There may be better ways to do this, but this is a starting point. See discussion at https://github.com/nbgrp/onelogin-saml-bundle/issues/26 --- src/Controller/Login.php | 44 +++++++++++++++++++ .../schedules/bookmark_control.html.twig | 2 +- 2 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 src/Controller/Login.php diff --git a/src/Controller/Login.php b/src/Controller/Login.php new file mode 100644 index 00000000..368e60b9 --- /dev/null +++ b/src/Controller/Login.php @@ -0,0 +1,44 @@ +get('returnTo')) { + $returnTo = $request->get('returnTo'); + // Ensure that returnTo is the same as our host. + // This could be more thorough checking to ensure that the URL + // is below the application's base URL or take into account + // other routing details, but this seems like a basic sanity check. + if ($request->getHttpHost() != parse_url($returnTo, PHP_URL_HOST)) { + throw new \InvalidArgumentException("returnTo must match the current host"); + } + // Set the session variable that the Nbgrp/OneloginSamlBundle is + // looking for. + $firewallName = $this->firewallMap->getFirewallConfig($request)?->getName(); + if (!$firewallName) { + throw new ServiceUnavailableHttpException(message: 'Unknown firewall.'); + } + $request->getSession()->set('_security.'.$firewallName.'.target_path', $returnTo); + } + // Execute the Nbgrp/OneloginSamlBundle's login action. + $nbgrpLogin = new NbgrpLogin($this->firewallMap); + return $nbgrpLogin($request, $auth); + } + +} diff --git a/templates/schedules/bookmark_control.html.twig b/templates/schedules/bookmark_control.html.twig index 7da4a9ae..0a4aaf4d 100755 --- a/templates/schedules/bookmark_control.html.twig +++ b/templates/schedules/bookmark_control.html.twig @@ -18,6 +18,6 @@ Save {% else %} - Log-in to save + Log-in to save {% endif %}
From 316ce496510ca2de82cc9f727f5f1fc7acb1c894 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 11:28:33 -0400 Subject: [PATCH 054/173] #47: Include offerings in course view again. This data got pulled out to a separate function in bfc3eb21c6bbc70ea6616e0d75aa0e36e4944ddd, but I missed this usage. --- src/Controller/Courses.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index f4785a92..3e580032 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -101,6 +101,7 @@ public function listAction($catalog = NULL) public function view($course, $term = NULL) { $data = $this->getCourseDataByIdString($course, $term); + $data['offerings'] = $this->getCourseOfferingsData($data['course'], $data['term']); // Set the selected Catalog Id. // $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); From 5c948343fb5f99476188dc7a31c0b5a926c46318 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 13:39:34 -0400 Subject: [PATCH 055/173] #47: Move helper methods out of the controllers to a new shared service. --- src/Controller/Courses.php | 319 ++---------------- src/Controller/Offerings.php | 125 +------ src/Service/Osid/DataLoader.php | 444 +++++++++++++++++++++++++ templates/partials/offerings.html.twig | 16 +- 4 files changed, 491 insertions(+), 413 deletions(-) create mode 100644 src/Service/Osid/DataLoader.php diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 3e580032..52f85eda 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -8,11 +8,10 @@ use App\Helper\RecentCourses\Department as DepartmentRecentCourses; use App\Helper\RecentCourses\Instructor as InstructorRecentCourses; -use App\Helper\RecentCourses\RecentCoursesInterface; +use App\Service\Osid\DataLoader; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; use App\Service\Osid\TermHelper; -use App\Service\Osid\TopicHelper; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -44,9 +43,9 @@ class Courses extends AbstractController private $osidTermHelper; /** - * @var \App\Service\Osid\TopicHelper + * @var \App\Service\Osid\DataLoader */ - private $osidTopicHelper; + private $osidDataLoader; /** * Construct a new Catalogs controller. @@ -57,17 +56,14 @@ class Courses extends AbstractController * The osid.id_map service. * @param \App\Service\Osid\TermHelper $osidTermHelper * The osid.term_helper service. - * @param \App\Service\Osid\TopicHelper $osidTopicHelper + * @param \App\Service\Osid\DataLoader $osidDataLoader * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, TopicHelper $osidTopicHelper) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader) { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; - $this->osidTopicHelper = $osidTopicHelper; - $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); - $this->instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); - $this->namesType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:person_names'); + $this->osidDataLoader = $osidDataLoader; } #[Route('/courses/list/{catalog}', name: 'list_courses')] @@ -100,8 +96,8 @@ public function listAction($catalog = NULL) #[Route('/courses/view/{course}/{term}', name: 'view_course')] public function view($course, $term = NULL) { - $data = $this->getCourseDataByIdString($course, $term); - $data['offerings'] = $this->getCourseOfferingsData($data['course'], $data['term']); + $data = $this->osidDataLoader->getCourseDataByIdString($course, $term); + $data['offerings'] = $this->osidDataLoader->getCourseOfferingsData($data['course'], $data['term']); // Set the selected Catalog Id. // $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); @@ -123,9 +119,9 @@ public function view($course, $term = NULL) public function viewxml($course, $term = NULL) { $data = []; - $courseData = $this->getCourseDataByIdString($course, $term); - $courseData['offerings'] = $this->getCourseOfferingsData($courseData['course'], $courseData['term']); - $courseData['alternates'] = $this->getAllAlternates($courseData['course']); + $courseData = $this->osidDataLoader->getCourseDataByIdString($course, $term); + $courseData['offerings'] = $this->osidDataLoader->getCourseOfferingsData($courseData['course'], $courseData['term']); + $courseData['alternates'] = $this->osidDataLoader->getAllCourseAlternates($courseData['course']); $data['courses'] = [$courseData]; $data['title'] = $data['courses'][0]['course']->getDisplayName(); @@ -188,7 +184,7 @@ public function searchxmlAction(Request $request, $catalog) 'courses' => [], ]; foreach ($courses as $courseIdString => $course) { - $data['courses'][] = $this->getCourseData($course); + $data['courses'][] = $this->osidDataLoader->getCourseData($course); } $data['title'] = 'Course Search: "' . $keywords . '"'; $data['feedLink'] = $this->generateUrl( @@ -283,9 +279,9 @@ public function topicxmlAction(Request $request, $catalog) 'courses' => [], ]; foreach ($recentCourses->getPrimaryCourses() as $course) { - $courseData = $this->getCourseData($course); - $courseData['terms'] = $this->getRecentTermData($currentTerm, $recentCourses, $course); - $courseData['alternates'] = $this->getRecentAlternates($recentCourses, $course); + $courseData = $this->osidDataLoader->getCourseData($course); + $courseData['terms'] = $this->osidDataLoader->getRecentTermDataForCourse($currentTerm, $recentCourses, $course); + $courseData['alternates'] = $this->osidDataLoader->getRecentCourseAlternates($recentCourses, $course); $courseData['offerings'] = []; $data['courses'][] = $courseData; } @@ -373,9 +369,9 @@ public function byidxmlAction(Request $request, $catalog) 'courses' => [], ]; foreach ($recentCourses->getPrimaryCourses() as $course) { - $courseData = $this->getCourseData($course); - $courseData['terms'] = $this->getRecentTermData($currentTerm, $recentCourses, $course); - $courseData['alternates'] = $this->getRecentAlternates($recentCourses, $course); + $courseData = $this->osidDataLoader->getCourseData($course); + $courseData['terms'] = $this->osidDataLoader->getRecentTermDataForCourse($currentTerm, $recentCourses, $course); + $courseData['alternates'] = $this->osidDataLoader->getRecentCourseAlternates($recentCourses, $course); $courseData['offerings'] = []; $data['courses'][] = $courseData; } @@ -488,10 +484,10 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = NU 'courses' => [], ]; foreach ($recentCourses->getPrimaryCourses() as $course) { - $courseData = $this->getCourseData($course); + $courseData = $this->osidDataLoader->getCourseData($course); $courseData['include_alternates_in_title'] = TRUE; - $courseData['terms'] = $this->getRecentTermData($currentTerm, $recentCourses, $course); - $courseData['alternates'] = $this->getRecentAlternates($recentCourses, $course); + $courseData['terms'] = $this->osidDataLoader->getRecentTermDataForCourse($currentTerm, $recentCourses, $course); + $courseData['alternates'] = $this->osidDataLoader->getRecentCourseAlternates($recentCourses, $course); $courseData['offerings'] = []; $data['courses'][] = $courseData; } @@ -511,278 +507,5 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = NU return $response; } - /** - * Answer an array of course data suitable for templating. - * - * @param string $idString - * The course id string. - * @param string $termIdString - * A reference term's id string if one is being used for filtering - * offerings. - * - * @return array - * An array of data about the course. - */ - protected function getCourseDataByIdString($idString, $termIdString = NULL) - { - $id = $this->osidIdMap->fromString($idString); - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - - if ($termIdString) { - $termId = $this->osidIdMap->fromString($termIdString); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - $term = $termLookupSession->getTerm($termId); - } - else { - $term = NULL; - } - - return $this->getCourseData($lookupSession->getCourse($id), $term); - } - - /** - * Answer an array of course data suitable for templating. - * - * @param \osid_course_Course $course - * The course. - * @param \osid_course_Term $term - * A reference term if one is being used for filtering offerings. - * - * @return array - * An array of data about the course. - */ - protected function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { - $data = []; - $data['course'] = $course; - $data['term'] = $term; - // Optional add-on data that can be populated by other methods. - $data['is_primary'] = TRUE; - $data['alternates'] = NULL; - $data['offerings'] = []; - $data['terms'] = []; - $data['include_alternates_in_title'] = TRUE; - // Load the topics into our view - $data = array_merge($data, $this->getTopics($course->getTopics())); - // Alternate status. - $data['is_primary'] = TRUE; - if ($course->hasRecordType($this->alternateType)) { - $record = $course->getCourseRecord($this->alternateType); - $data['is_primary'] = $record->isPrimary(); - } - return $data; - } - - /** - * Answer a list of all alternates for a course. - * - * @param \osid_course_Course $course - * The course to get alternates for. - * - * @return \osid_course_Course[] - * The courses, annotated with additional is_primary values. - */ - protected function getAllAlternates(\osid_course_Course $course) { - $data = NULL; - if ($course->hasRecordType($this->alternateType)) { - $record = $course->getCourseRecord($this->alternateType); - $data = []; - if ($record->hasAlternates()) { - $alternates = $record->getAlternates(); - while ($alternates->hasNext()) { - $alternate = $alternates->getNextCourse(); - $alternate->is_primary = FALSE; - if ($alternate->hasRecordType($this->alternateType)) { - $alternateRecord = $alternate->getCourseRecord($this->alternateType); - if ($alternateRecord->isPrimary()) { - $alternate->is_primary = TRUE; - } - } - $data[] = $alternate; - } - } - } - return $data; - } - - /** - * Answer a list of alternates for a course filtered to recent ones. - * - * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses - * The helper used to filter to recent courses. - * @param \osid_course_Course $course - * The course to get alternates for. - * - * @return \osid_course_Course[] - * The courses, annotated with additional is_primary values. - */ - protected function getRecentAlternates(RecentCoursesInterface $recentCourses, $course) { - $data = NULL; - foreach ($recentCourses->getAlternatesForCourse($course) as $alternate) { - $alternate->is_primary = FALSE; - if ($alternate->hasRecordType($this->alternateType)) { - $alternateRecord = $alternate->getCourseRecord($this->alternateType); - if ($alternateRecord->isPrimary()) { - $alternate->is_primary = TRUE; - } - } - $data[] = $alternate; - } - return $data; - } - - /** - * Answer an array of course offering data suitable for templating. - * - * @param \osid_course_Course $course - * The course offerings are associated with. - * @param \osid_course_Term $term - * A reference term if one is being used for filtering offerings. - * - * @return array - * An array of course offering data. - */ - protected function getCourseOfferingsData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { - $data = []; - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $offeringLookupSession->useFederatedCourseCatalogView(); - if ($term) { - $offerings = $offeringLookupSession->getCourseOfferingsByTermForCourse( - $term->getId(), - $course->getId(), - ); - } else { - $offerings = $offeringLookupSession->getCourseOfferingsForCourse($course->getId()); - } - while ($offerings->hasNext()) { - $offering = $offerings->getNextCourseOffering(); - - if ($offering->hasRecordType($this->instructorsType)) { - $instructorsRecord = $offering->getCourseOfferingRecord($this->instructorsType); - $instructors = $instructorsRecord->getInstructors(); - $offering->instructors = []; - $offering->instructorNames = []; - if ($instructors->hasNext()) { - while ($instructors->hasNext()) { - $instructor = $instructors->getNextResource(); - $instructorData = [ - 'resource' => $instructor, - 'givename' => NULL, - 'surname' => NULL, - ]; - if ($instructor->hasRecordType($this->namesType)) { - $namesRecord = $instructor->getResourceRecord($this->namesType); - $instructorData['givename'] = $namesRecord->getGivenName(); - $instructorData['surname'] = $namesRecord->getSurname(); - $offering->instructorNames[] = $namesRecord->getSurname(); - } else { - $offering->instructorNames[] = $instructor->getDisplayName(); - } - $offering->instructors[] = $instructorData; - } - } - } - - $data[] = $offering; - } - - return $data; - } - - /** - * Answer an array of data that includes the term and past/current/future. - * - * @param \osid_course_Term $currentTerm - * The current term to compare against. - * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses - * The helper used to filter to recent courses. - * @param \osid_course_Course $course - * The course to get alternates for. - * - * @return array - * An array of term data. Sub-keys are 'term' (the Term object) and - * 'type' (current/future/past). - */ - protected function getRecentTermData(\osid_course_Term $currentTerm, RecentCoursesInterface $recentCourses, \osid_course_Course $course) { - $now = $this->DateTime_getTimestamp(new \DateTime()); - $currentTermId = $currentTerm->getId(); - $currentEndTime = $this->DateTime_getTimestamp($currentTerm->getEndTime()); - $recentTerms = $recentCourses->getTermsForCourse($course); - $data = []; - if (count($recentTerms)) { - foreach ($recentTerms as $term) { - if ($term->getId()->isEqual($currentTermId)) { - $type = 'current'; - } elseif ($currentEndTime < $this->DateTime_getTimestamp($term->getEndTime())) { - $type = 'future'; - } elseif ($now > $this->DateTime_getTimestamp($term->getStartTime()) && $now < $this->DateTime_getTimestamp($term->getEndTime())) { - $type = 'current'; - } else { - $type = 'past'; - } - $data[] = [ - 'term' => $term, - 'type' => $type, - ]; - } - } - return $data; - } - /** - * Answer a timestamp in GMT give a DateTime. - * - * @param \DateTime $dt - * The DateTime to get a timestamp for. - * - * @return int - * The GMT timestamp. - */ - public function DateTime_getTimestamp(\DateTime $dt) - { - $dtz_original = $dt->getTimezone(); - $dtz_utc = new \DateTimeZone('UTC'); - $dt->setTimezone($dtz_utc); - $year = (int) $dt->format('Y'); - $month = (int) $dt->format('n'); - $day = (int) $dt->format('j'); - $hour = (int) $dt->format('G'); - $minute = (int) $dt->format('i'); - $second = (int) $dt->format('s'); - $dt->setTimezone($dtz_original); - - return gmmktime($hour, $minute, $second, $month, $day, $year); - } - - /** - * Load topics into our view. - * - * @param \osid_course_TopicList - * - * @return void - * - * @since 4/28/09 - */ - protected function getTopics(\osid_course_TopicList $topicList) - { - $data = []; - $topics = $this->osidTopicHelper->topicListAsArray($topicList); - - $data['subjectTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); - - $data['departmentTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); - - $data['divisionTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division')); - - $data['requirementTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); - - $data['levelTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); - - $data['blockTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); - - $data['instructionMethodTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); - - return $data; - } } diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index e526a7bc..bba0e662 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -7,10 +7,10 @@ namespace App\Controller; use App\Paginator\CourseOfferingSearchAdaptor; +use App\Service\Osid\DataLoader; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; use App\Service\Osid\TermHelper; -use App\Service\Osid\TopicHelper; use App\Service\Osid\TypeHelper; use Knp\Component\Pager\PaginatorInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -44,9 +44,9 @@ class Offerings extends AbstractController private $osidTermHelper; /** - * @var \App\Service\Osid\TopicHelper + * @var \App\Service\Osid\DataLoader */ - private $osidTopicHelper; + private $osidDataLoader; /** * @var \App\Service\Osid\TypeHelper @@ -62,22 +62,20 @@ class Offerings extends AbstractController * The osid.id_map service. * @param \App\Service\Osid\TermHelper $osidTermHelper * The osid.term_helper service. - * @param \App\Service\Osid\TopicHelper $osidTopicHelper + * @param \App\Service\Osid\DataLoader $osidDataLoader * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, TopicHelper $osidTopicHelper, TypeHelper $osidTypeHelper) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader, TypeHelper $osidTypeHelper) { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; - $this->osidTopicHelper = $osidTopicHelper; + $this->osidDataLoader = $osidDataLoader; $this->osidTypeHelper = $osidTypeHelper; $this->wildcardStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); $this->booleanStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:boolean'); $this->instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $this->enrollmentType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:enrollment'); - $this->locationType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:location'); - $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->weeklyScheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); $this->subjectType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); @@ -162,7 +160,9 @@ public function searchxml(Request $request, string $catalog = NULL, string $term $data['offerings'] = []; while ($offerings->hasNext()) { $offering = $offerings->getNextCourseOffering(); - $data['offerings'][] = $this->getOfferingData($offering); + $offeringData = $this->osidDataLoader->getOfferingData($offering); + $offeringData['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); + $data['offerings'][] = $offeringData; } // Set the next and previous terms @@ -744,7 +744,8 @@ protected function prepareSearch(Request $request, string $catalog = NULL) #[Route('/offerings/view/{id}', name: 'view_offering')] public function viewAction($id) { - $data = $this->getOfferingDataByIdString($id); + $data = $this->osidDataLoader->getOfferingDataByIdString($id); + $data['alternates'] = $this->osidDataLoader->getOfferingAlternates($data['offering']); // Bookmarked Courses and Schedules $data['bookmarks_CourseId'] = $data['offering']->getCourseId(); @@ -767,8 +768,10 @@ public function viewAction($id) public function viewxmlAction($id) { $data = []; - $data['offerings'] = [$this->getOfferingDataByIdString($id)]; - $offering = $data['offerings'][0]['offering']; + $offeringData = $this->osidDataLoader->getOfferingDataByIdString($id); + $offering = $offeringData['offering']; + $offeringData['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); + $data['offerings'] = [$offeringData]; $data['title'] = $offering->getDisplayName(); $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); @@ -784,24 +787,7 @@ public function viewxmlAction($id) } /** - * Answer an array of course offering data suitable for templating. - * - * @param string $idString - * The course offering id string. - * - * @return array - * An array of data about the course offering. - */ - public function getOfferingDataByIdString($idString) - { - $id = $this->osidIdMap->fromString($idString); - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - return $this->getOfferingData($lookupSession->getCourseOffering($id)); - } - - /** - * Answer an array of course offering data suitable for templating. + * Callback to get offering data for paginated search results. * * @param \osid_course_CourseOffering $offering * The course. @@ -810,83 +796,8 @@ public function getOfferingDataByIdString($idString) * An array of data about the course offering. */ public function getOfferingData(\osid_course_CourseOffering $offering) { - $id = $offering->getId(); - - // Templates can access basic getter methods on the offering itself. - $data = ['offering' => $offering]; - - // Load the topics into our view - $data = array_merge( - $data, - $this->osidTopicHelper->asTypedArray($offering->getTopics()) - ); - - $data['location'] = NULL; - if ($offering->hasLocation()) { - $data['location'] = $offering->getLocation(); - } - - $data['weekly_schedule'] = NULL; - $weeklyScheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); - if ($offering->hasRecordType($weeklyScheduleType)) { - $data['weekly_schedule'] = $offering->getCourseOfferingRecord($weeklyScheduleType); - } - - // Instructors - $data['instructors'] = NULL; - $instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); - if ($offering->hasRecordType($instructorsType)) { - $instructorsRecord = $offering->getCourseOfferingRecord($instructorsType); - $instructors = $instructorsRecord->getInstructors(); - $data['instructors'] = []; - while ($instructors->hasNext()) { - $data['instructors'][] = $instructors->getNextResource(); - } - } - - // Alternates. - $data['is_primary'] = TRUE; - $data['alternates'] = NULL; - if ($offering->hasRecordType($this->alternateType)) { - $record = $offering->getCourseOfferingRecord($this->alternateType); - $data['is_primary'] = $record->isPrimary(); - if ($record->hasAlternates()) { - $data['alternates'] = []; - $alternates = $record->getAlternates(); - while ($alternates->hasNext()) { - $alternate = $alternates->getNextCourseOffering(); - $alternate->is_primary = FALSE; - if ($alternate->hasRecordType($this->alternateType)) { - $alternateRecord = $alternate->getCourseOfferingRecord($this->alternateType); - if ($alternateRecord->isPrimary()) { - $alternate->is_primary = TRUE; - } - } - $data['alternates'][] = $alternate; - } - - } - } - - // Availability link. @todo - $data['availabilityLink'] = NULL; - //$this->getAvailabilityLink($this->offering); - - $data['properties'] = []; - $properties = $offering->getProperties(); - while ($properties->hasNext()) { - $data['properties'][] = $properties->getNextProperty(); - } - - // Other offerings. - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - $data['offeringsTitle'] = 'All Sections'; - $data['offerings'] = $lookupSession->getCourseOfferingsByTermForCourse( - $offering->getTermId(), - $offering->getCourseId() - ); - + $data = $this->osidDataLoader->getOfferingData($offering); + $data['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); return $data; } diff --git a/src/Service/Osid/DataLoader.php b/src/Service/Osid/DataLoader.php new file mode 100644 index 00000000..f7faed4a --- /dev/null +++ b/src/Service/Osid/DataLoader.php @@ -0,0 +1,444 @@ +osidRuntime = $osidRuntime; + $this->osidIdMap = $osidIdMap; + $this->osidTermHelper = $osidTermHelper; + $this->osidTopicHelper = $osidTopicHelper; + $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); + $this->instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); + $this->locationType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:location'); + $this->namesType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:person_names'); + } + + /** + * Answer an array of course data suitable for templating. + * + * @param string $idString + * The course id string. + * @param string $termIdString + * A reference term's id string if one is being used for filtering + * offerings. + * + * @return array + * An array of data about the course. + */ + public function getCourseDataByIdString($idString, $termIdString = NULL) + { + $id = $this->osidIdMap->fromString($idString); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); + $lookupSession->useFederatedCourseCatalogView(); + + if ($termIdString) { + $termId = $this->osidIdMap->fromString($termIdString); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $term = $termLookupSession->getTerm($termId); + } + else { + $term = NULL; + } + + return $this->getCourseData($lookupSession->getCourse($id), $term); + } + + /** + * Answer an array of course data suitable for templating. + * + * @param \osid_course_Course $course + * The course. + * @param \osid_course_Term $term + * A reference term if one is being used for filtering offerings. + * + * @return array + * An array of data about the course. + */ + public function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + $data = []; + $data['course'] = $course; + $data['term'] = $term; + // Optional add-on data that can be populated by other methods. + $data['is_primary'] = TRUE; + $data['alternates'] = NULL; + $data['offerings'] = []; + $data['terms'] = []; + $data['include_alternates_in_title'] = TRUE; + // Load the topics into our view + $data = array_merge($data, $this->getTopics($course->getTopics())); + // Alternate status. + $data['is_primary'] = TRUE; + if ($course->hasRecordType($this->alternateType)) { + $record = $course->getCourseRecord($this->alternateType); + $data['is_primary'] = $record->isPrimary(); + } + return $data; + } + + /** + * Answer a list of all alternates for a course. + * + * @param \osid_course_Course $course + * The course to get alternates for. + * + * @return \osid_course_Course[] + * The courses, annotated with additional is_primary values. + */ + public function getAllCourseAlternates(\osid_course_Course $course) { + $data = NULL; + if ($course->hasRecordType($this->alternateType)) { + $record = $course->getCourseRecord($this->alternateType); + $data = []; + if ($record->hasAlternates()) { + $alternates = $record->getAlternates(); + while ($alternates->hasNext()) { + $alternate = $alternates->getNextCourse(); + $alternate->is_primary = FALSE; + if ($alternate->hasRecordType($this->alternateType)) { + $alternateRecord = $alternate->getCourseRecord($this->alternateType); + if ($alternateRecord->isPrimary()) { + $alternate->is_primary = TRUE; + } + } + $data[] = $alternate; + } + } + } + return $data; + } + + /** + * Answer a list of alternates for a course filtered to recent ones. + * + * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses + * The helper used to filter to recent courses. + * @param \osid_course_Course $course + * The course to get alternates for. + * + * @return \osid_course_Course[] + * The courses, annotated with additional is_primary values. + */ + public function getRecentCourseAlternates(RecentCoursesInterface $recentCourses, $course) { + $data = NULL; + foreach ($recentCourses->getAlternatesForCourse($course) as $alternate) { + $alternate->is_primary = FALSE; + if ($alternate->hasRecordType($this->alternateType)) { + $alternateRecord = $alternate->getCourseRecord($this->alternateType); + if ($alternateRecord->isPrimary()) { + $alternate->is_primary = TRUE; + } + } + $data[] = $alternate; + } + return $data; + } + + /** + * Answer an array of course offering data suitable for templating. + * + * @param \osid_course_Course $course + * The course offerings are associated with. + * @param \osid_course_Term $term + * A reference term if one is being used for filtering offerings. + * + * @return array + * An array of course offering data. + */ + public function getCourseOfferingsData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + $data = []; + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $offeringLookupSession->useFederatedCourseCatalogView(); + if ($term) { + $offerings = $offeringLookupSession->getCourseOfferingsByTermForCourse( + $term->getId(), + $course->getId(), + ); + } else { + $offerings = $offeringLookupSession->getCourseOfferingsForCourse($course->getId()); + } + while ($offerings->hasNext()) { + $offering = $offerings->getNextCourseOffering(); + $data[] = $this->getOfferingData($offering); + } + + return $data; + } + + /** + * Answer an array of data that includes the term and past/current/future. + * + * @param \osid_course_Term $currentTerm + * The current term to compare against. + * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses + * The helper used to filter to recent courses. + * @param \osid_course_Course $course + * The course to get alternates for. + * + * @return array + * An array of term data. Sub-keys are 'term' (the Term object) and + * 'type' (current/future/past). + */ + public function getRecentTermDataForCourse(\osid_course_Term $currentTerm, RecentCoursesInterface $recentCourses, \osid_course_Course $course) { + $now = $this->DateTime_getTimestamp(new \DateTime()); + $currentTermId = $currentTerm->getId(); + $currentEndTime = $this->DateTime_getTimestamp($currentTerm->getEndTime()); + $recentTerms = $recentCourses->getTermsForCourse($course); + $data = []; + if (count($recentTerms)) { + foreach ($recentTerms as $term) { + if ($term->getId()->isEqual($currentTermId)) { + $type = 'current'; + } elseif ($currentEndTime < $this->DateTime_getTimestamp($term->getEndTime())) { + $type = 'future'; + } elseif ($now > $this->DateTime_getTimestamp($term->getStartTime()) && $now < $this->DateTime_getTimestamp($term->getEndTime())) { + $type = 'current'; + } else { + $type = 'past'; + } + $data[] = [ + 'term' => $term, + 'type' => $type, + ]; + } + } + return $data; + } + + /** + * Answer a timestamp in GMT give a DateTime. + * + * @param \DateTime $dt + * The DateTime to get a timestamp for. + * + * @return int + * The GMT timestamp. + */ + public function DateTime_getTimestamp(\DateTime $dt) + { + $dtz_original = $dt->getTimezone(); + $dtz_utc = new \DateTimeZone('UTC'); + $dt->setTimezone($dtz_utc); + $year = (int) $dt->format('Y'); + $month = (int) $dt->format('n'); + $day = (int) $dt->format('j'); + $hour = (int) $dt->format('G'); + $minute = (int) $dt->format('i'); + $second = (int) $dt->format('s'); + $dt->setTimezone($dtz_original); + + return gmmktime($hour, $minute, $second, $month, $day, $year); + } + + /** + * Load topics into our view. + * + * @param \osid_course_TopicList + * + * @return void + * + * @since 4/28/09 + */ + protected function getTopics(\osid_course_TopicList $topicList) + { + $data = []; + $topics = $this->osidTopicHelper->topicListAsArray($topicList); + + $data['subjectTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); + + $data['departmentTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); + + $data['divisionTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.division')); + + $data['requirementTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); + + $data['levelTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); + + $data['blockTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); + + $data['instructionMethodTopics'] = $this->osidTopicHelper->filterTopicsByType($topics, new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); + + return $data; + } + + /** + * Answer an array of course offering data suitable for templating. + * + * @param string $idString + * The course offering id string. + * + * @return array + * An array of data about the course offering. + */ + public function getOfferingDataByIdString($idString) + { + $id = $this->osidIdMap->fromString($idString); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $lookupSession->useFederatedCourseCatalogView(); + return $this->getOfferingData($lookupSession->getCourseOffering($id)); + } + + /** + * Answer an array of course offering data suitable for templating. + * + * @param \osid_course_CourseOffering $offering + * The course. + * + * @return array + * An array of data about the course offering. + */ + public function getOfferingData(\osid_course_CourseOffering $offering) { + $id = $offering->getId(); + + // Templates can access basic getter methods on the offering itself. + $data = ['offering' => $offering]; + + // Load the topics into our view + $data = array_merge( + $data, + $this->osidTopicHelper->asTypedArray($offering->getTopics()) + ); + + $data['location'] = NULL; + if ($offering->hasLocation()) { + $data['location'] = $offering->getLocation(); + } + + $data['weekly_schedule'] = NULL; + $weeklyScheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); + if ($offering->hasRecordType($weeklyScheduleType)) { + $data['weekly_schedule'] = $offering->getCourseOfferingRecord($weeklyScheduleType); + } + + // Instructors + $data['instructors'] = NULL; + $data['instructor_names'] = NULL; + $instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); + if ($offering->hasRecordType($instructorsType)) { + $instructorsRecord = $offering->getCourseOfferingRecord($instructorsType); + $instructors = $instructorsRecord->getInstructors(); + $data['instructors'] = []; + $data['instructor_names'] = []; + while ($instructors->hasNext()) { + $instructor = $instructors->getNextResource(); + $data['instructors'][] = $instructor; + if ($instructor->hasRecordType($this->namesType)) { + $namesRecord = $instructor->getResourceRecord($this->namesType); + $instructorData['givename'] = $namesRecord->getGivenName(); + $instructorData['surname'] = $namesRecord->getSurname(); + $data['instructor_names'][] = $namesRecord->getSurname(); + } else { + $data['instructor_names'][] = $instructor->getDisplayName(); + } + } + } + + // Alternates. + $data['is_primary'] = TRUE; + $data['alternates'] = NULL; + if ($offering->hasRecordType($this->alternateType)) { + $record = $offering->getCourseOfferingRecord($this->alternateType); + $data['is_primary'] = $record->isPrimary(); + // Alternates can be fetched if needed with getOfferingAlternates(). + } + + // Availability link. @todo + $data['availabilityLink'] = NULL; + //$this->getAvailabilityLink($this->offering); + + $data['properties'] = []; + $properties = $offering->getProperties(); + while ($properties->hasNext()) { + $data['properties'][] = $properties->getNextProperty(); + } + + // Other offerings. + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $lookupSession->useFederatedCourseCatalogView(); + $data['offeringsTitle'] = 'All Sections'; + $data['offerings'] = $lookupSession->getCourseOfferingsByTermForCourse( + $offering->getTermId(), + $offering->getCourseId() + ); + + return $data; + } + + /** + * Answer an array of course offering alternates suitable for templating. + * + * @param \osid_course_CourseOffering $offering + * The course. + * + * @return array + * An array of alternates for the course offering. + */ + public function getOfferingAlternates(\osid_course_CourseOffering $offering) { + $data = NULL; + + if ($offering->hasRecordType($this->alternateType)) { + $record = $offering->getCourseOfferingRecord($this->alternateType); + if ($record->hasAlternates()) { + $data = []; + $alternates = $record->getAlternates(); + while ($alternates->hasNext()) { + $alternate = $alternates->getNextCourseOffering(); + $alternate->is_primary = FALSE; + if ($alternate->hasRecordType($this->alternateType)) { + $alternateRecord = $alternate->getCourseOfferingRecord($this->alternateType); + if ($alternateRecord->isPrimary()) { + $alternate->is_primary = TRUE; + } + } + $data[] = $alternate; + } + + } + } + + return $data; + } + +} diff --git a/templates/partials/offerings.html.twig b/templates/partials/offerings.html.twig index 638bfb0a..a2ff96ab 100755 --- a/templates/partials/offerings.html.twig +++ b/templates/partials/offerings.html.twig @@ -7,20 +7,20 @@ {% endif %} {% set currentTerm = null %} -{% for offering in offerings %} - {% if currentTerm is null or currentTerm.id != offering.termid %} - {% set currentTerm = offering.term %} +{% for item in offerings %} + {% if currentTerm is null or currentTerm.id != item.offering.termid %} + {% set currentTerm = item.offering.term %}

{{ currentTerm.displayname }}

{% endif %} - {% if selectedOffering and selectedOffering.id == offering.id %} + {% if selectedOffering and selectedOffering.id == item.offering.id %}
{% else %}
{% endif %} - {{offering.displayname}} - {{ offering.genustype.displayname }} - {% if offering.instructorNames %} - ({{ offering.instructorNames|join(', ') }}) + {{item.offering.displayname}} + {{ item.offering.genustype.displayname }} + {% if item.instructor_names %} + ({{ item.instructor_names|join(', ') }}) {% endif %}
{% endfor %} From 2d336ff72d694b2b5ac2c7397bb6948116e9b460 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 15:24:25 -0400 Subject: [PATCH 056/173] #47: Migrate the resource/view action and add support for places. --- .../views/scripts/resources/view.phtml | 3 - src/Controller/Resources.php | 92 +++++++++---------- templates/resources/view.html.twig | 22 +++++ 3 files changed, 65 insertions(+), 52 deletions(-) delete mode 100755 application/views/scripts/resources/view.phtml create mode 100755 templates/resources/view.html.twig diff --git a/application/views/scripts/resources/view.phtml b/application/views/scripts/resources/view.phtml deleted file mode 100755 index 307a75d3..00000000 --- a/application/views/scripts/resources/view.phtml +++ /dev/null @@ -1,3 +0,0 @@ -resource->getDescription()) - print "\n\t
".$this->escape($this->resource->getDescription())."
"; diff --git a/src/Controller/Resources.php b/src/Controller/Resources.php index c4f3498e..3c12d09b 100755 --- a/src/Controller/Resources.php +++ b/src/Controller/Resources.php @@ -6,10 +6,12 @@ namespace App\Controller; +use App\Service\Osid\DataLoader; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; use App\Service\Osid\TermHelper; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -32,6 +34,11 @@ class Resources extends AbstractController */ private $osidIdMap; + /** + * @var \App\Service\Osid\DataLoader + */ + private $osidDataLoader; + /** * Construct a new Catalogs controller. * @@ -39,23 +46,14 @@ class Resources extends AbstractController * The osid.runtime service. * @param \App\Service\Osid\IdMap $osidIdMap * The osid.id_map service. + * @param \App\Service\Osid\DataLoader $osidDataLoader + * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; - } - - /** - * Initialize object. - * - * Called from {@link __construct()} as final step of object instantiation. - * - * @return void - */ - public function init() - { - $this->instructorType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); - parent::init(); + $this->osidDataLoader = $osidDataLoader; + $this->instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); } // /** @@ -83,12 +81,12 @@ public function init() // } #[Route('/resources/view/{resource}/{term}', name: 'view_resource')] - public function viewAction($resource, $term = NULL) + public function viewAction(Request $request, $resource, $term = NULL) { $id = $this->osidIdMap->fromString($resource); $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $lookupSession->useFederatedBinView(); - $this->view->resource = $lookupSession->getResource($id); + $data['resource'] = $lookupSession->getResource($id); $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringSearchSession->useFederatedCourseCatalogView(); @@ -101,44 +99,40 @@ public function viewAction($resource, $term = NULL) $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $this->view->term = $termLookupSession->getTerm($termId); + $data['term'] = $termLookupSession->getTerm($termId); + } + else { + $data['term'] = NULL; } - // Match the instructor Id - if ($query->hasRecordType($this->instructorType)) { - $queryRecord = $query->getCourseOfferingQueryRecord($this->instructorType); - $queryRecord->matchInstructorId($id, true); - - $this->view->offerings = $offeringSearchSession->getCourseOfferingsByQuery($query); - - // Don't do the work to display instructors if we have a very large number of - // offerings. - if ($this->view->offerings->available() > 200) { - $this->view->hideOfferingInstructors = true; - } - - $this->view->offeringsTitle = 'Sections'; + $data['offeringsTitle'] = 'Sections'; + $data['offerings'] = []; + $data['offering_count'] = 0; + $data['offering_display_limit'] = 100; - $allParams = []; - $allParams['resource'] = $this->_getParam('resource'); - if ($this->getSelectedCatalogId()) { - $allParams['catalog'] = $this->osidIdMap->toString($this->getSelectedCatalogId()); + // Match the instructor Id + if (preg_match('/^resource\.person\./', $resource)) { + if ($query->hasRecordType($this->instructorType)) { + $queryRecord = $query->getCourseOfferingQueryRecord($this->instructorType); + $queryRecord->matchInstructorId($id, true); + $offerings = $offeringSearchSession->getCourseOfferingsByQuery($query); } - $this->view->offeringsForAllTermsUrl = $this->_helper->url('view', 'resources', null, $allParams); - - $this->render('offerings', null, true); - } else { - $this->view->hideOfferingInstructors = true; } - - // Set the selected Catalog Id. - if ($this->_getParam('catalog')) { - $this->setSelectedCatalogId($this->osidIdMap->fromString($this->_getParam('catalog'))); + // Match a location id + elseif (preg_match('/^resource\.place\./', $resource)) { + $query->matchLocationId($id, TRUE); + $offerings = $offeringSearchSession->getCourseOfferingsByQuery($query); + } + if (isset($offerings)) { + $data['offering_count'] = $offerings->available(); + $i = 0; + while ($offerings->hasNext() && $i < $data['offering_display_limit']) { + $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); + $i++; + } } - // Set the title - $this->view->title = $this->view->resource->getDisplayName(); - $this->view->headTitle($this->view->title); + return $this->render('resources/view.html.twig', $data); } /** @@ -150,7 +144,7 @@ public function viewAction($resource, $term = NULL) */ public function listcampusestxtAction() { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus')); + $this->renderTextList(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus')); } /** @@ -160,7 +154,7 @@ public function listcampusestxtAction() * * @since 11/17/09 */ - private function renderTextList(osid_type_Type $genusType) + private function renderTextList(\osid_type_Type $genusType) { header('Content-Type: text/plain'); diff --git a/templates/resources/view.html.twig b/templates/resources/view.html.twig new file mode 100755 index 00000000..90d4da08 --- /dev/null +++ b/templates/resources/view.html.twig @@ -0,0 +1,22 @@ +{% extends 'base.html.twig' %} + +{% block body %} +

{{ resource.displayname }}

+
{{ resource.description }}
+ +{{ include( + 'partials/offerings.html.twig', + { + offerings: offerings, + term: term, + offeringsForAllTermsUrl: url('view_resource', {resource: osidIdToString(resource.id)}), + hideOfferingInstructors: FALSE, + selectedOffering: NULL + }, + with_context = false +)}} +{% if offering_count > offering_display_limit %} +
and {{ offering_count - offering_display_limit }} more...
+{% endif %} + +{% endblock %} From 7502d289a42de3b100403b39a63ae95766ffeda8 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 15:42:23 -0400 Subject: [PATCH 057/173] #47: Port /resources/listcampusestxt action. --- src/Controller/Resources.php | 44 ++++++++++--------------------- templates/resources/list.txt.twig | 3 +++ 2 files changed, 17 insertions(+), 30 deletions(-) create mode 100644 templates/resources/list.txt.twig diff --git a/src/Controller/Resources.php b/src/Controller/Resources.php index 3c12d09b..f14d41e9 100755 --- a/src/Controller/Resources.php +++ b/src/Controller/Resources.php @@ -137,45 +137,29 @@ public function viewAction(Request $request, $resource, $term = NULL) /** * List all department topics as a text file with each line being Id|DisplayName. - * - * @return void - * - * @since 10/20/09 - */ - public function listcampusestxtAction() - { - $this->renderTextList(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus')); - } - - /** - * Render a text feed for a given topic type. - * - * @return void - * - * @since 11/17/09 */ - private function renderTextList(\osid_type_Type $genusType) + #[Route('/resources/listcampusestxt/{catalog}', name: 'list_campuses_txt')] + public function listcampusestxt(Request $request, $catalog = NULL) { - header('Content-Type: text/plain'); - - if ($this->_getParam('catalog')) { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $data = []; + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); - $this->view->title = 'Resources in '.$lookupSession->getBin()->getDisplayName(); + $data['title'] = 'Resources in '.$lookupSession->getBin()->getDisplayName(); } else { $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); - $this->view->title = 'Resources in All Bins'; + $data['title'] = 'Resources in All Bins'; } $lookupSession->useFederatedBinView(); - $resources = $lookupSession->getResourcesByGenusType($genusType); - + $data['resources'] = []; + $resources = $lookupSession->getResourcesByGenusType(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:resource.place.campus')); while ($resources->hasNext()) { - $resource = $resources->getNextResource(); - echo $this->osidIdMap->toString($resource->getId()).'|'.$this->osidIdMap->toString($resource->getId()).' - '.$resource->getDisplayName()."\n"; + $data['resources'][] = $resources->getNextResource(); } - // var_dump($lookupSession); - // var_dump($resources); - exit; + + $response = new Response($this->renderView('resources/list.txt.twig', $data)); + $response->headers->set('Content-Type', 'text/plain; charset=utf-8'); + return $response; } } diff --git a/templates/resources/list.txt.twig b/templates/resources/list.txt.twig new file mode 100644 index 00000000..870a6ee2 --- /dev/null +++ b/templates/resources/list.txt.twig @@ -0,0 +1,3 @@ +{% for resource in resources %} +{{ osidIdToString(resource.id) }}|{{ osidIdToString(resource.id) }} - {{ resource.displayname }} +{% endfor %} From 473627db4d9c42ff03b703aa7e2778c2c50f30c7 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 15:43:28 -0400 Subject: [PATCH 058/173] #47: Remove action code not used in prod. --- src/Controller/Resources.php | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/src/Controller/Resources.php b/src/Controller/Resources.php index f14d41e9..134f2052 100755 --- a/src/Controller/Resources.php +++ b/src/Controller/Resources.php @@ -56,30 +56,6 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $ $this->instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); } - // /** - // * Print out a list of all topics - // * - // * @return void - // * @access public - // * @since 4/21/09 - // */ - // public function listAction () { - // if ($this->_getParam('catalog')) { - // $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); - // $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - // $this->view->title = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); - // } else { - // $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - // $this->view->title = 'Topics in All Catalogs'; - // } - // $lookupSession->useFederatedCourseCatalogView(); - // - // $this->loadTopics($lookupSession->getTopics()); - // - // $this->setSelectedCatalogId($lookupSession->getCourseCatalogId()); - // $this->view->headTitle($this->view->title); - // } - #[Route('/resources/view/{resource}/{term}', name: 'view_resource')] public function viewAction(Request $request, $resource, $term = NULL) { From e287aa783389bb66f817c3669b4cc4d1d05e2f17 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 15:45:11 -0400 Subject: [PATCH 059/173] #47: Reorganize routes to be first in controller. --- src/Controller/Offerings.php | 90 ++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index bba0e662..736624bd 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -228,6 +228,51 @@ public function search(Request $request, PaginatorInterface $paginator, string $ return $this->render('offerings/search.html.twig', $data); } + #[Route('/offerings/view/{id}', name: 'view_offering')] + public function viewAction($id) + { + $data = $this->osidDataLoader->getOfferingDataByIdString($id); + $data['alternates'] = $this->osidDataLoader->getOfferingAlternates($data['offering']); + + // Bookmarked Courses and Schedules + $data['bookmarks_CourseId'] = $data['offering']->getCourseId(); + + $data['menuIsOfferings'] = true; + + // Set the selected Catalog Id. + $catalogSession = $this->osidRuntime->getCourseManager()->getCourseOfferingCatalogSession(); + $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($data['offering']->getId()); + if ($catalogIds->hasNext()) { + $catalogId = $catalogIds->getNextId(); + $data['menuCatalogSelectedId'] = $catalogId; + $data['menuCatalogSelected'] = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession()->getCourseCatalog($catalogId); + } + + return $this->render('offerings/view.html.twig', $data); + } + + #[Route('/offerings/viewxml/{id}', name: 'view_offering_xml')] + public function viewxmlAction($id) + { + $data = []; + $offeringData = $this->osidDataLoader->getOfferingDataByIdString($id); + $offering = $offeringData['offering']; + $offeringData['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); + $data['offerings'] = [$offeringData]; + + $data['title'] = $offering->getDisplayName(); + $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); + + $data['previousTerm'] = NULL; + $data['term'] = $offering->getTerm(); + $data['nextTerm'] = NULL; + $data['terms'] = NULL; + + $response = new Response($this->renderView('offerings/search.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; + } + /** * Run a search query and provide the data suitable for templating. * @@ -741,51 +786,6 @@ protected function prepareSearch(Request $request, string $catalog = NULL) ]; } - #[Route('/offerings/view/{id}', name: 'view_offering')] - public function viewAction($id) - { - $data = $this->osidDataLoader->getOfferingDataByIdString($id); - $data['alternates'] = $this->osidDataLoader->getOfferingAlternates($data['offering']); - - // Bookmarked Courses and Schedules - $data['bookmarks_CourseId'] = $data['offering']->getCourseId(); - - $data['menuIsOfferings'] = true; - - // Set the selected Catalog Id. - $catalogSession = $this->osidRuntime->getCourseManager()->getCourseOfferingCatalogSession(); - $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($data['offering']->getId()); - if ($catalogIds->hasNext()) { - $catalogId = $catalogIds->getNextId(); - $data['menuCatalogSelectedId'] = $catalogId; - $data['menuCatalogSelected'] = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession()->getCourseCatalog($catalogId); - } - - return $this->render('offerings/view.html.twig', $data); - } - - #[Route('/offerings/viewxml/{id}', name: 'view_offering_xml')] - public function viewxmlAction($id) - { - $data = []; - $offeringData = $this->osidDataLoader->getOfferingDataByIdString($id); - $offering = $offeringData['offering']; - $offeringData['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); - $data['offerings'] = [$offeringData]; - - $data['title'] = $offering->getDisplayName(); - $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); - - $data['previousTerm'] = NULL; - $data['term'] = $offering->getTerm(); - $data['nextTerm'] = NULL; - $data['terms'] = NULL; - - $response = new Response($this->renderView('offerings/search.xml.twig', $data)); - $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); - return $response; - } - /** * Callback to get offering data for paginated search results. * From 1f44b9db960db510e6622a4d3b5d1df5f5c68f31 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 16:30:01 -0400 Subject: [PATCH 060/173] #47: Ensure that /courses/instructorxml/* can accept prefixed or plain ids. --- .../banner/resource/Resource/Lookup/CombinedSession.php | 2 +- src/Controller/Courses.php | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/application/library/banner/resource/Resource/Lookup/CombinedSession.php b/application/library/banner/resource/Resource/Lookup/CombinedSession.php index 9e4b368d..33685deb 100755 --- a/application/library/banner/resource/Resource/Lookup/CombinedSession.php +++ b/application/library/banner/resource/Resource/Lookup/CombinedSession.php @@ -258,7 +258,7 @@ private function getPersonResource(osid_id_Id $resourceId) $row = self::$getPersonResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getPersonResource_stmt->closeCursor(); - if (!$row['WEB_ID']) { + if (empty($row) || !$row['WEB_ID']) { throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource.person.').'.'); } diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 52f85eda..1c93bf3b 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -446,7 +446,12 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = NU throw new \InvalidArgumentException('An instructor must be specified.'); } - $instructorId = $this->osidIdMap->fromString('resource.person.'.$instructor); + if (preg_match('/^resource\.person\./', $instructor)) { + $instructorId = $this->osidIdMap->fromString($instructor); + } + else { + $instructorId = $this->osidIdMap->fromString('resource.person.'.$instructor); + } $resourceLookup = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); try { $instructorResource = $resourceLookup->getResource($instructorId); From 62ba29a1be4392c7164d23820a4f9f6d86198644 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 16:30:40 -0400 Subject: [PATCH 061/173] #47: Port /terms/view/* action. --- application/views/scripts/terms/view.phtml | 16 ------- src/Controller/Terms.php | 55 +++++++++++++--------- templates/offerings/search.html.twig | 2 +- templates/offerings/view.html.twig | 2 +- templates/partials/offerings.html.twig | 2 + templates/partials/term.xml.twig | 2 +- templates/terms/view.html.twig | 17 +++++++ 7 files changed, 55 insertions(+), 41 deletions(-) delete mode 100755 application/views/scripts/terms/view.phtml create mode 100755 templates/terms/view.html.twig diff --git a/application/views/scripts/terms/view.phtml b/application/views/scripts/terms/view.phtml deleted file mode 100755 index 853aa21d..00000000 --- a/application/views/scripts/terms/view.phtml +++ /dev/null @@ -1,16 +0,0 @@ -Sections"; -$offeringParams = array( - 'controller' => 'offerings', - 'action' => 'view' - ); -while ($this->offerings->hasNext()) { - $offering = $this->offerings->getNextCourseOffering(); - $offeringParams['offering'] = $this->getStringFromOsidId($offering->getId()); - print "\n\t
"; - print "".$this->escape($offering->getDisplayName()).""; - print " \"".$this->escape($offering->getTitle())."\" - "; - print " ".$this->escape($offering->getGenusType()->getDisplayName()).""; - print "
"; -} diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index 7372276c..335f382d 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -6,6 +6,7 @@ namespace App\Controller; +use App\Service\Osid\DataLoader; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; use App\Service\Osid\TermHelper; @@ -32,6 +33,11 @@ class Terms extends AbstractController */ private $osidIdMap; + /** + * @var \App\Service\Osid\DataLoader + */ + private $osidDataLoader; + /** * Construct a new Catalogs controller. * @@ -39,10 +45,13 @@ class Terms extends AbstractController * The osid.runtime service. * @param \App\Service\Osid\IdMap $osidIdMap * The osid.id_map service. + * @param \App\Service\Osid\DataLoader $osidDataLoader + * The data loader service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; + $this->osidDataLoader = $osidDataLoader; } /** @@ -85,30 +94,32 @@ public function listxmlAction() $this->listAction(); } - #[Route('/terms/view/{id}', name: 'view_term')] - public function viewAction($id) + #[Route('/terms/view/{term}/{catalog}', name: 'view_term')] + public function viewAction($term, $catalog = NULL) { - $id = $this->osidIdMap->fromString($this->_getParam('term')); - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - $this->view->term = $lookupSession->getTerm($id); - - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - $this->view->offerings = $lookupSession->getCourseOfferingsByTerm($id); - - // Set the selected Catalog Id. - $catalogSession = $this->osidRuntime->getCourseManager()->getTermCatalogSession(); - $catalogIds = $catalogSession->getCatalogIdsByTerm($id); - if ($catalogIds->hasNext()) { - $this->setSelectedCatalogId($catalogIds->getNextId()); + $data = []; + $id = $this->osidIdMap->fromString($term); + + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession->useIsolatedCourseCatalogView(); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $offeringLookupSession->useIsolatedCourseCatalogView(); + } else { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $offeringLookupSession->useFederatedCourseCatalogView(); + } + $data['term'] = $termLookupSession->getTerm($id); + $offerings = $offeringLookupSession->getCourseOfferingsByTerm($id); + $data['offerings'] = []; + while ($offerings->hasNext()) { + $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); } - // Set the title - $this->view->title = $this->view->term->getDisplayName(); - $this->view->headTitle($this->view->title); - - $this->view->menuIsTerms = true; + return $this->render('terms/view.html.twig', $data); } /** diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index f9c702f9..89532371 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -240,7 +240,7 @@ {% endif %}
Term:
-
{{ item.offering.term.displayname }}
+
{{ item.offering.term.displayname }}
Department:
diff --git a/templates/offerings/view.html.twig b/templates/offerings/view.html.twig index a6697f97..4395f3b9 100755 --- a/templates/offerings/view.html.twig +++ b/templates/offerings/view.html.twig @@ -11,7 +11,7 @@
Term:
-
{{ offering.term.displayname }}
+
{{ offering.term.displayname }}
{% if location %}
Location:
diff --git a/templates/partials/offerings.html.twig b/templates/partials/offerings.html.twig index a2ff96ab..636c7490 100755 --- a/templates/partials/offerings.html.twig +++ b/templates/partials/offerings.html.twig @@ -1,7 +1,9 @@
{% if term %}

Sections in {{ term.displayname }}

+ {% if offeringsForAllTermsUrl %}
show sections in all terms
+ {% endif %} {% else %}

Sections

{% endif %} diff --git a/templates/partials/term.xml.twig b/templates/partials/term.xml.twig index e3a771c7..5292b8d6 100644 --- a/templates/partials/term.xml.twig +++ b/templates/partials/term.xml.twig @@ -1 +1 @@ -{{ term.displayname }} +{{ term.displayname }} diff --git a/templates/terms/view.html.twig b/templates/terms/view.html.twig new file mode 100755 index 00000000..79866c97 --- /dev/null +++ b/templates/terms/view.html.twig @@ -0,0 +1,17 @@ +{% extends 'base.html.twig' %} + +{% block body %} +

{{ term.displayname }}

+ +{{ include( + 'partials/offerings.html.twig', + { + offerings: offerings, + term: term, + offeringsForAllTermsUrl: NULL, + hideOfferingInstructors: FALSE, + selectedOffering: NULL + }, + with_context = false +)}} +{% endblock %} From b96c7e8c861b7f6d14ba075bbf196cddacaabb63 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 16:43:01 -0400 Subject: [PATCH 062/173] #47: Port /terms/list/* action. --- application/views/scripts/terms/list.phtml | 10 -------- src/Controller/Terms.php | 30 +++++++++++----------- templates/terms/list.html.twig | 10 ++++++++ 3 files changed, 25 insertions(+), 25 deletions(-) delete mode 100755 application/views/scripts/terms/list.phtml create mode 100755 templates/terms/list.html.twig diff --git a/application/views/scripts/terms/list.phtml b/application/views/scripts/terms/list.phtml deleted file mode 100755 index f3139649..00000000 --- a/application/views/scripts/terms/list.phtml +++ /dev/null @@ -1,10 +0,0 @@ - 'view' - ); - -while ($this->terms->hasNext()) { - $term = $this->terms->getNextTerm(); - $params['term'] = $this->getStringFromOsidId($term->getId()); - print "\n\t

".$term->getDisplayName()."

"; - print "\n\t
".$term->getDescription()."
"; -} diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index 335f382d..4f733e6c 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -56,29 +56,29 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $ /** * Print out a list of all terms. - * - * @return void - * - * @since 4/21/09 */ - public function listAction() + #[Route('/terms/list/{catalog}', name: 'list_terms')] + public function listAction($catalog = NULL) { - if ($this->_getParam('catalog')) { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + $data = []; + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $this->view->title = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $this->view->title = 'Terms in All Catalogs'; + $data['title'] = 'Terms in All Catalogs'; + $data['catalog_id'] = NULL; } $lookupSession->useFederatedCourseCatalogView(); - $this->view->terms = $lookupSession->getTerms(); - - $this->setSelectedCatalogId($lookupSession->getCourseCatalogId()); - $this->view->headTitle($this->view->title); - - $this->view->menuIsTerms = true; + $terms = $lookupSession->getTerms(); + $data['terms'] = []; + while ($terms->hasNext()) { + $data['terms'][] = $terms->getNextTerm(); + } + return $this->render('terms/list.html.twig', $data); } /** diff --git a/templates/terms/list.html.twig b/templates/terms/list.html.twig new file mode 100755 index 00000000..cede4e21 --- /dev/null +++ b/templates/terms/list.html.twig @@ -0,0 +1,10 @@ +{% extends 'base.html.twig' %} + +{% block body %} +

{{ title }}

+{% for term in terms %} +

{{ term.displayname }}

+
{{ term.description }}
+{% endfor %} + +{% endblock %} From 8f959da570f11d933552c85f11e59cd0490f6671 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 16:56:12 -0400 Subject: [PATCH 063/173] #47: Port /term/listxml/* action. --- application/views/scripts/terms/listxml.phtml | 32 ------------------- src/Controller/Terms.php | 30 +++++++++++++---- templates/terms/list.xml.twig | 22 +++++++++++++ 3 files changed, 46 insertions(+), 38 deletions(-) delete mode 100755 application/views/scripts/terms/listxml.phtml create mode 100755 templates/terms/list.xml.twig diff --git a/application/views/scripts/terms/listxml.phtml b/application/views/scripts/terms/listxml.phtml deleted file mode 100755 index 5066d48b..00000000 --- a/application/views/scripts/terms/listxml.phtml +++ /dev/null @@ -1,32 +0,0 @@ - - - - '.$this->title.' - '.$this->pathAsAbsoluteUrl($this->url()).' - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss -'; - -$params = array( 'controller' => 'terms', - 'action' => 'view'); - -while ($this->terms->hasNext()) { - $term = $this->terms->getNextTerm(); - print "\n\t\t"; - print "\n\t\t\t".$this->escape($term->getDisplayName()).""; - $params['term'] = $this->getStringFromOsidId($term->getId()); - print "\n\t\t\t".$this->pathAsAbsoluteUrl($this->url($params)).""; - print "\n\t\t\tgetDescription()."]]>"; - print "\n\t\t\t".$this->getStringFromOsidId($term->getId()).""; - print "\n\t\t\t".$term->getStartTime()->format('Y-m-d').""; - print "\n\t\t\t".$term->getEndTime()->format('Y-m-d').""; - print "\n\t\t\t".ceil(abs($term->getEndTime()->format('U') - $term->getStartTime()->format('U'))/60/60/24/7).""; - print "\n\t\t"; -} -?> - - - diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index 4f733e6c..bc334d6d 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -13,6 +13,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; /** * A controller for working with terms. @@ -83,15 +84,32 @@ public function listAction($catalog = NULL) /** * Print out an XML list of all terms. - * - * @return void */ - public function listxmlAction() + #[Route('/terms/listxml/{catalog}', name: 'list_terms_xml')] + public function listxmlAction($catalog = NULL) { - $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); + $data = []; + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; + } else { + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $data['title'] = 'Terms in All Catalogs'; + $data['catalog_id'] = NULL; + } + $lookupSession->useFederatedCourseCatalogView(); - $this->listAction(); + $terms = $lookupSession->getTerms(); + $data['terms'] = []; + while ($terms->hasNext()) { + $data['terms'][] = $terms->getNextTerm(); + } + $data['feedLink'] = $this->generateUrl('list_terms_xml', ['catalog' => $catalog], UrlGeneratorInterface::ABSOLUTE_URL); + $response = new Response($this->renderView('terms/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/terms/view/{term}/{catalog}', name: 'view_term')] diff --git a/templates/terms/list.xml.twig b/templates/terms/list.xml.twig new file mode 100755 index 00000000..2f118bdc --- /dev/null +++ b/templates/terms/list.xml.twig @@ -0,0 +1,22 @@ + + + + {{ title }} + {{ feedLink }} + {{ 'now' | date('r') }} + Course Catalog + http://blogs.law.harvard.edu/tech/rss + +{%~ for term in terms %} + + {{ term.displayname }} + {{ url('view_term', {term: osidIdToString(term.id), catalog: catalog_id ? osidIdToString(catalog_id)}) }} + + {{ osidIdToString(term.id) }} + {{ term.starttime | date('Y-m-d') }} + {{ term.endtime | date('Y-m-d') }} + {{ dateRangeToWeeks(term.starttime, term.endtime) }} + +{% endfor %} + + From 95a0b57131c9311b84b453a480c4841aea6c6445 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 22 Oct 2024 17:07:56 -0400 Subject: [PATCH 064/173] #47: Port /terms/details/* and /terms/detailsxml/* actions. --- application/views/scripts/terms/details.phtml | 26 -------- .../views/scripts/terms/detailsxml.phtml | 28 --------- src/Controller/Terms.php | 61 +++++++++++-------- templates/terms/details.html.twig | 16 +++++ templates/terms/details.xml.twig | 8 +++ 5 files changed, 61 insertions(+), 78 deletions(-) delete mode 100755 application/views/scripts/terms/details.phtml delete mode 100755 application/views/scripts/terms/detailsxml.phtml create mode 100755 templates/terms/details.html.twig create mode 100755 templates/terms/details.xml.twig diff --git a/application/views/scripts/terms/details.phtml b/application/views/scripts/terms/details.phtml deleted file mode 100755 index 6c269196..00000000 --- a/application/views/scripts/terms/details.phtml +++ /dev/null @@ -1,26 +0,0 @@ -"; - -print "\n\t
Name
"; -print "\n\t
"; -print $this->term->getDisplayName(); -print "
"; - -print "\n\t
Start Date
"; -print "\n\t
"; -print $this->term->getStartTime()->format('Y-m-d'); -print "
"; - -print "\n\t
End Date
"; -print "\n\t
"; -print $this->term->getEndTime()->format('Y-m-d'); -print "
"; - -print "\n\t
Weeks (including exams)
"; -print "\n\t
"; -$span = $this->term->getEndTime()->diff($this->term->getStartTime()); -print ceil($span->days / 7); -print "
"; - -print "\n
"; diff --git a/application/views/scripts/terms/detailsxml.phtml b/application/views/scripts/terms/detailsxml.phtml deleted file mode 100755 index 32902616..00000000 --- a/application/views/scripts/terms/detailsxml.phtml +++ /dev/null @@ -1,28 +0,0 @@ -'; - -print "\n"; - -print "\n\t"; -print $this->escape($this->getStringFromOsidId($this->term->getId())); -print ""; - -print "\n\t"; -print $this->term->getDisplayName(); -print ""; - -print "\n\t"; -print $this->term->getStartTime()->format('Y-m-d'); -print ""; - -print "\n\t"; -print $this->term->getEndTime()->format('Y-m-d'); -print ""; - -print "\n\t"; -$span = $this->term->getEndTime()->diff($this->term->getStartTime()); -print ceil($span->days / 7); -print ""; - -print "\n"; diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index bc334d6d..abf3bedd 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -141,39 +141,52 @@ public function viewAction($term, $catalog = NULL) } /** - * View a catalog details. - * - * @return void + * View term details. */ - public function detailsAction() + #[Route('/terms/details/{term}/{catalog}', name: 'view_term_details')] + public function detailsAction($term, $catalog = NULL) { - $id = $this->osidIdMap->fromString($this->_getParam('term')); - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - $this->view->term = $lookupSession->getTerm($id); - - // Set the selected Catalog Id. - $catalogSession = $this->osidRuntime->getCourseManager()->getTermCatalogSession(); - $catalogIds = $catalogSession->getCatalogIdsByTerm($id); - if ($catalogIds->hasNext()) { - $this->setSelectedCatalogId($catalogIds->getNextId()); + $id = $this->osidIdMap->fromString($term); + $data = []; + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession->useIsolatedCourseCatalogView(); + $data['catalog_id'] = $catalogId; + } else { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $data['catalog_id'] = NULL; } + $data['term'] = $termLookupSession->getTerm($id); - // Set the title - $this->view->title = $this->view->term->getDisplayName(); - $this->view->headTitle($this->view->title); - - $this->view->menuIsTerms = true; + return $this->render('terms/details.html.twig', $data); } /** * View a catalog details. - * - * @return void */ - public function detailsxmlAction() + #[Route('/terms/detailsxml/{term}/{catalog}', name: 'view_term_details_xml')] + public function detailsxmlAction($term, $catalog = NULL) { - $this->_helper->layout->disableLayout(); - $this->detailsAction(); + $id = $this->osidIdMap->fromString($term); + $data = []; + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession->useIsolatedCourseCatalogView(); + $data['catalog_id'] = $catalogId; + } else { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $data['catalog_id'] = NULL; + } + $data['term'] = $termLookupSession->getTerm($id); + + $data['feedLink'] = $this->generateUrl('view_term_details_xml', ['term' => $term, 'catalog' => $catalog], UrlGeneratorInterface::ABSOLUTE_URL); + + $response = new Response($this->renderView('terms/details.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } } diff --git a/templates/terms/details.html.twig b/templates/terms/details.html.twig new file mode 100755 index 00000000..f7f71484 --- /dev/null +++ b/templates/terms/details.html.twig @@ -0,0 +1,16 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +
+
Name
+
{{ term.displayname }}
+
Start Date
+
{{ term.starttime | date('Y-m-d') }}
+
End Date
+
{{ term.endtime | date('Y-m-d') }}
+
Weeks (including exams)
+
{{ dateRangeToWeeks(term.starttime, term.endtime) }}
+
+ +{% endblock %} diff --git a/templates/terms/details.xml.twig b/templates/terms/details.xml.twig new file mode 100755 index 00000000..5c604bc4 --- /dev/null +++ b/templates/terms/details.xml.twig @@ -0,0 +1,8 @@ + + + {{ osidIdToString(term.id) }} + {{ term.displayname }} + {{ term.starttime | date('Y-m-d') }} + {{ term.endtime | date('Y-m-d') }} + {{ dateRangeToWeeks(term.starttime, term.endtime) }} + From 428cff5163226037c87021abcfa4f274b62057e4 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 23 Oct 2024 13:14:25 -0400 Subject: [PATCH 065/173] #47: Port /offerings/list/* action. --- .../views/scripts/offerings/list.phtml | 1 - src/Controller/Offerings.php | 51 ++++++++----------- templates/offerings/list.html.twig | 17 +++++++ 3 files changed, 37 insertions(+), 32 deletions(-) delete mode 100755 application/views/scripts/offerings/list.phtml create mode 100755 templates/offerings/list.html.twig diff --git a/application/views/scripts/offerings/list.phtml b/application/views/scripts/offerings/list.phtml deleted file mode 100755 index b3d9bbc7..00000000 --- a/application/views/scripts/offerings/list.phtml +++ /dev/null @@ -1 +0,0 @@ -osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); - $data['title'] = $lookupSession->getCourseCatalog()->getDisplayName(); - } else { - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $data['title'] = 'All Catalogs'; - } + $catalogId = $this->osidIdMap->fromString($catalog); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $data['title'] = $lookupSession->getCourseCatalog()->getDisplayName(); $lookupSession->useFederatedCourseCatalogView(); // Add our parameters to the search query - if ($term) { - if ('CURRENT' == $term) { - $termId = $this->osidTermHelper->getNextOrLatestTermId(); - } else { - $termId = $this->osidIdMap->fromString($term); - } - - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - - $data['term'] = $termLookupSession->getTerm($termId); - - $data['offerings'] = $lookupSession->getCourseOfferingsByTerm($data['term']->getId()); + if ('CURRENT' == $term) { + $termId = $this->osidTermHelper->getNextOrLatestTermId(); } else { - $data['offerings'] = $lookupSession->getCourseOfferings(); + $termId = $this->osidIdMap->fromString($term); } - $this->setSelectedCatalogId($lookupSession->getCourseCatalogId()); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); - $data['menuIsOfferings'] = true; + $data['term'] = $termLookupSession->getTerm($termId); + + $offerings = $lookupSession->getCourseOfferingsByTerm($data['term']->getId()); + $data['offerings'] = []; + while ($offerings->hasNext()) { + $offering = $offerings->getNextCourseOffering(); + $data['offerings'][] = $this->osidDataLoader->getOfferingData($offering); + } $data['offeringsTitle'] = 'Sections'; // Don't do the work to display instructors if we have a very large number of // offerings. - if ($data['offerings']->available() > 200) { + if ($offerings->available() > 200) { $data['hideOfferingInstructors'] = true; } - $this->render('offerings', null, true); + return $this->render('offerings/list.html.twig', $data); } /** diff --git a/templates/offerings/list.html.twig b/templates/offerings/list.html.twig new file mode 100755 index 00000000..e3678df0 --- /dev/null +++ b/templates/offerings/list.html.twig @@ -0,0 +1,17 @@ +{% extends 'base.html.twig' %} + +{% block body %} +

{{ title }}

+ + {{ include( + 'partials/offerings.html.twig', + { + offerings: offerings, + term: term, + offeringsForAllTermsUrl: NULL, + hideOfferingInstructors: FALSE, + selectedOffering: NULL + }, + with_context = false + )}} +{% endblock %} From 1167d698eb296e7c719db8d054138c1d8c5bd561 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 23 Oct 2024 13:14:39 -0400 Subject: [PATCH 066/173] #47: Fix whitespace. --- src/Controller/Offerings.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index d1400664..e24d76a4 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -140,8 +140,8 @@ public function listAction(string $catalog, string $term) * * @since 10/21/09 */ - #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings_xml')] - public function searchxml(Request $request, string $catalog = NULL, string $term = NULL) + #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings_xml')] + public function searchxml(Request $request, string $catalog = NULL, string $term = NULL) { [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog, $term); // Actually run the query. From c9699b373bb50da8bccdb1a2e6ae7b29cd88afd0 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 23 Oct 2024 15:49:47 -0400 Subject: [PATCH 067/173] #47: Port the /topics/list/* and /topics/view/* actions. --- application/views/scripts/topics/list.phtml | 54 -------- application/views/scripts/topics/view.phtml | 17 --- src/Controller/Offerings.php | 8 +- src/Controller/Topics.php | 141 ++++++++++++-------- src/Service/Osid/DataLoader.php | 2 +- templates/offerings/view.html.twig | 22 +-- templates/topics/list.html.twig | 41 ++++++ templates/topics/view.html.twig | 24 ++++ 8 files changed, 166 insertions(+), 143 deletions(-) delete mode 100755 application/views/scripts/topics/list.phtml delete mode 100755 application/views/scripts/topics/view.phtml create mode 100755 templates/topics/list.html.twig create mode 100755 templates/topics/view.html.twig diff --git a/application/views/scripts/topics/list.phtml b/application/views/scripts/topics/list.phtml deleted file mode 100755 index 5d5025c1..00000000 --- a/application/views/scripts/topics/list.phtml +++ /dev/null @@ -1,54 +0,0 @@ - 'topics', - 'action' => 'view', - ); -print "\n\t

Subjects:

"; -print "\n\t\t"; - -print "\n\t\t

Departments:

"; -print "\n\t\t"; - -print "\n\t\t

Divisions:

"; -print "\n\t\t"; - -print "\n\t\t

Requirements Fulfilled:

"; -print "\n\t\t"; diff --git a/application/views/scripts/topics/view.phtml b/application/views/scripts/topics/view.phtml deleted file mode 100755 index 041f535a..00000000 --- a/application/views/scripts/topics/view.phtml +++ /dev/null @@ -1,17 +0,0 @@ -Sections"; -$offeringParams = array( - 'controller' => 'offerings', - 'action' => 'view', - 'topic' => null - ); -while ($this->offerings->hasNext()) { - $offering = $this->offerings->getNextCourseOffering(); - $offeringParams['offering'] = $this->getStringFromOsidId($offering->getId()); - print "\n\t
"; - print "".$this->escape($offering->getDisplayName()).""; - print " \"".$this->escape($offering->getTitle())."\" - "; - print " ".$this->escape($offering->getGenusType()->getDisplayName()).""; - print "
"; -} diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index e24d76a4..9b323832 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -64,6 +64,8 @@ class Offerings extends AbstractController * The osid.term_helper service. * @param \App\Service\Osid\DataLoader $osidDataLoader * The osid.topic_helper service. + * @param \App\Service\Osid\TypeHelper $osidTypeHelper + * The osid type helper service. */ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader, TypeHelper $osidTypeHelper) { $this->osidRuntime = $osidRuntime; @@ -233,8 +235,10 @@ public function viewAction($id) $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($data['offering']->getId()); if ($catalogIds->hasNext()) { $catalogId = $catalogIds->getNextId(); - $data['menuCatalogSelectedId'] = $catalogId; - $data['menuCatalogSelected'] = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession()->getCourseCatalog($catalogId); + $data['catalog_id'] = $catalogId; + } + else { + $data['catalog_id'] = NULL; } return $this->render('offerings/view.html.twig', $data); diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index 018e9daf..fdb763aa 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -4,14 +4,16 @@ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License (GPL) */ - namespace App\Controller; +namespace App\Controller; - use App\Service\Osid\IdMap; - use App\Service\Osid\Runtime; - use App\Service\Osid\TermHelper; - use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; - use Symfony\Component\HttpFoundation\Response; - use Symfony\Component\Routing\Annotation\Route; +use App\Service\Osid\DataLoader; +use App\Service\Osid\IdMap; +use App\Service\Osid\Runtime; +use App\Service\Osid\TermHelper; +use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; /** * A controller for working with topics. @@ -32,6 +34,12 @@ class Topics extends AbstractController */ private $osidIdMap; + /** + * @var \App\Service\Osid\DataLoader + */ + private $osidDataLoader; + + /** * Construct a new Catalogs controller. * @@ -39,43 +47,44 @@ class Topics extends AbstractController * The osid.runtime service. * @param \App\Service\Osid\IdMap $osidIdMap * The osid.id_map service. + * @param \App\Service\Osid\DataLoader $osidDataLoader + * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; + $this->osidDataLoader = $osidDataLoader; } /** * Print out a list of all topics. - * - * @return void - * - * @since 4/21/09 */ - public function listAction() + #[Route('/topics/list/{catalog}/{type}', name: 'list_topics')] + public function listAction(string $catalog = NULL, string $type = NULL) { - if ($this->_getParam('catalog')) { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - $this->view->title = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $this->view->title = 'Topics in All Catalogs'; + $data['title'] = 'Topics in All Catalogs'; + $data['catalog_id'] = NULL; } $lookupSession->useFederatedCourseCatalogView(); - if ($this->_getParam('type')) { - $genusType = $this->osidRuntimeType->fromString($this->_getParam('type')); + if ($type) { + $genusType = $this->osidIdMap->typeFromString($type); $topics = $lookupSession->getTopicsByGenusType($genusType); - $this->view->title .= ' of type '.$this->_getParam('type'); + $data['title'] .= ' of type ' . $type; } else { $topics = $lookupSession->getTopics(); } - $this->loadTopics($topics); + $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); - $this->setSelectedCatalogId($lookupSession->getCourseCatalogId()); - $this->view->headTitle($this->view->title); + return $this->render('topics/list.html.twig', $data); } /** @@ -128,7 +137,7 @@ public function recentAction() } if ($this->_getParam('type')) { - $genusType = $this->osidRuntimeType->fromString($this->_getParam('type')); + $genusType = $this->osidTypeHelper->fromString($this->_getParam('type')); $query->matchGenusType($genusType, true); $this->view->title .= ' of type '.$this->_getParam('type'); } @@ -173,52 +182,68 @@ public function recentxmlAction() $this->_helper->viewRenderer->setRender('topics/listxml', null, true); } - #[Route('/topics/view/{topic}/{term}', name: 'view_topic')] - public function view($topic, $term = NULL) + #[Route('/topics/view/{topic}/{catalog}/{term}', name: 'view_topic')] + public function view($topic, $catalog = NULL, $term = NULL) { + $data = []; $id = $this->osidIdMap->fromString($topic); - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - $this->view->topic = $lookupSession->getTopic($id); - - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - if ($this->_getParam('term')) { - $termId = $this->osidIdMap->fromString($term); - $this->view->offerings = $lookupSession->getCourseOfferingsByTermByTopic($termId, $id); + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); + $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $topicLookupSession->useIsolatedCourseCatalogView(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession->useIsolatedCourseCatalogView(); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $offeringLookupSession->useIsolatedCourseCatalogView(); + $data['catalog_id'] = $catalogId; + } + else { + $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); + $topicLookupSession->useFederatedCourseCatalogView(); $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $this->view->term = $termLookupSession->getTerm($termId); - } else { - $this->view->offerings = $lookupSession->getCourseOfferingsByTopic($id); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $offeringLookupSession->useFederatedCourseCatalogView(); + $data['catalog_id'] = NULL; } - // Don't do the work to display instructors if we have a very large number of - // offerings. - if ($this->view->offerings->available() > 200) { - $this->view->hideOfferingInstructors = true; - } + $data['topic'] = $topicLookupSession->getTopic($id); - // Set the selected Catalog Id. - if ($this->_getParam('catalog')) { - $this->setSelectedCatalogId($this->osidIdMap->fromString($this->_getParam('catalog'))); + if ($term) { + $termId = $this->osidIdMap->fromString($term); + $offerings = $offeringLookupSession->getCourseOfferingsByTermByTopic($termId, $id); + $data['term'] = $termLookupSession->getTerm($termId); + $data['offeringsForAllTermsUrl'] = $this->generateUrl( + 'view_topic', + [ + 'topic' => $topic, + 'catalog' => $catalog, + ], + UrlGeneratorInterface::ABSOLUTE_URL + ); + } else { + $offerings = $offeringLookupSession->getCourseOfferingsByTopic($id); + $data['term'] = NULL; + $data['offeringsForAllTermsUrl'] = NULL; } - // Set the title - $this->view->title = $this->view->topic->getDisplayName(); - $this->view->headTitle($this->view->title); - - $this->view->offeringsTitle = 'Sections'; - - $allParams = []; - $allParams['topic'] = $this->_getParam('topic'); - if ($this->getSelectedCatalogId()) { - $allParams['catalog'] = $this->osidIdMap->toString($this->getSelectedCatalogId()); + // Don't do the work to display all offerings if we have a very large + // number of offerings. + $data['offerings'] = []; + $data['offering_count'] = 0; + $data['offering_display_limit'] = 200; + $data['offeringsTitle'] = 'Sections'; + if (isset($offerings)) { + $data['offering_count'] = $offerings->available(); + $i = 0; + while ($offerings->hasNext() && $i < $data['offering_display_limit']) { + $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); + $i++; + } } - $this->view->offeringsForAllTermsUrl = $this->_helper->url('view', 'topics', null, $allParams); - $this->render('offerings', null, true); + return $this->render('topics/view.html.twig', $data); } /** diff --git a/src/Service/Osid/DataLoader.php b/src/Service/Osid/DataLoader.php index f7faed4a..77654bad 100644 --- a/src/Service/Osid/DataLoader.php +++ b/src/Service/Osid/DataLoader.php @@ -281,7 +281,7 @@ public function DateTime_getTimestamp(\DateTime $dt) * * @since 4/28/09 */ - protected function getTopics(\osid_course_TopicList $topicList) + public function getTopics(\osid_course_TopicList $topicList) { $data = []; $topics = $this->osidTopicHelper->topicListAsArray($topicList); diff --git a/templates/offerings/view.html.twig b/templates/offerings/view.html.twig index 4395f3b9..42c5f534 100755 --- a/templates/offerings/view.html.twig +++ b/templates/offerings/view.html.twig @@ -16,7 +16,7 @@ {% if location %}
Location:
- {{ location.displayname }} + {{ location.displayname }} {% if location.description %} {{ location.description }} {% endif %} @@ -38,7 +38,7 @@
Course Modality:
{% for topic in instructionMethodTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -47,7 +47,7 @@
Instructors:
{% for instructor in instructors %} - {{ instructor.displayname }}{{ not loop.last ? ',' }} + {{ instructor.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -55,28 +55,28 @@
Subject:
{% for topic in subjectTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Department:
{% for topic in departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Division:
{% for topic in divisionTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -84,7 +84,7 @@
Additional Details:
{% for topic in blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -93,7 +93,7 @@
Levels:
{% for topic in levelTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -102,7 +102,7 @@
Cross-Listed As:
{% for alternate in alternates %} - {{ alternate.displayname }} + {{ alternate.displayname }} {{ alternate.is_primary ? ' * ' }}
{% endfor %} @@ -127,6 +127,6 @@

Course

{% endblock %} diff --git a/templates/topics/list.html.twig b/templates/topics/list.html.twig new file mode 100755 index 00000000..c3aeb80f --- /dev/null +++ b/templates/topics/list.html.twig @@ -0,0 +1,41 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +{% if subjectTopics | length %} +

Subjects:

+ +{% endif %} + +{% if departmentTopics | length %} +

Departments:

+ +{% endif %} + +{% if divisionTopics | length %} +

Divisions:

+ +{% endif %} + +{% if requirementTopics | length %} +

Requirements Fulfilled:

+ +{% endif %} + +{% endblock %} diff --git a/templates/topics/view.html.twig b/templates/topics/view.html.twig new file mode 100755 index 00000000..dc0493a1 --- /dev/null +++ b/templates/topics/view.html.twig @@ -0,0 +1,24 @@ +{% extends 'base.html.twig' %} + +{% block body %} + +

{{ topic.displayname }}

+ +{{ include( + 'partials/offerings.html.twig', + { + offerings: offerings, + catalog_id: catalog_id, + term: term, + offeringsForAllTermsUrl: offeringsForAllTermsUrl, + hideOfferingInstructors: FALSE, + selectedOffering: NULL + }, + with_context = false +)}} + +{% if offering_count > offering_display_limit %} +
and {{ offering_count - offering_display_limit }} more...
+{% endif %} + +{% endblock %} From 3216762635ea0770747583c287c12b000d531011 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 23 Oct 2024 15:50:12 -0400 Subject: [PATCH 068/173] #47: Add missing closing
in bookmarks control. --- templates/schedules/bookmark_control.html.twig | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/schedules/bookmark_control.html.twig b/templates/schedules/bookmark_control.html.twig index 0a4aaf4d..3ccf72be 100755 --- a/templates/schedules/bookmark_control.html.twig +++ b/templates/schedules/bookmark_control.html.twig @@ -17,6 +17,7 @@ star icon Save + {% else %} Log-in to save {% endif %} From 433d1c2ad3a6785ea350f8acde94cd3406dee102 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 23 Oct 2024 16:43:36 -0400 Subject: [PATCH 069/173] #47: Port the /topics/listxml/* action. --- .../views/scripts/topics/listxml.phtml | 35 -------------- src/Controller/Topics.php | 46 ++++++++++++++++--- templates/topics/list.xml.twig | 20 ++++++++ 3 files changed, 60 insertions(+), 41 deletions(-) delete mode 100755 application/views/scripts/topics/listxml.phtml create mode 100755 templates/topics/list.xml.twig diff --git a/application/views/scripts/topics/listxml.phtml b/application/views/scripts/topics/listxml.phtml deleted file mode 100755 index af22e78a..00000000 --- a/application/views/scripts/topics/listxml.phtml +++ /dev/null @@ -1,35 +0,0 @@ - - - - '.$this->escape($this->title).' - '.$this->pathAsAbsoluteUrl($this->url(array('action' => 'list'))).' - - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss -'; - -$params = array( 'controller' => 'topics', - 'action' => 'view', - 'catalog' => $this->getStringFromOsidId($this->menuCatalogSelectedId) - ); - -$topics = array_merge($this->subjectTopics, $this->departmentTopics, $this->divisionTopics, $this->requirementTopics); -foreach ($topics as $topic) { - print "\n\t\t"; - print "\n\t\t\t".$this->escape($topic->getDisplayName()).""; - $params['topic'] = $this->getStringFromOsidId($topic->getId()); - print "\n\t\t\t".$this->pathAsAbsoluteUrl($this->url($params)).""; - print "\n\t\t\tgetDescription()."]]>"; - print "\n\t\t\t".$this->getStringFromOsidId($topic->getId()).""; - print "\n\t\t\t".$this->getStringFromOsidType($topic->getGenusType()).""; - print "\n\t\t"; -} - - -?> - - - diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index fdb763aa..c7b50d1d 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -89,15 +89,49 @@ public function listAction(string $catalog = NULL, string $type = NULL) /** * Print out an XML list of all catalogs. - * - * @return void */ - public function listxmlAction() + #[Route('/topics/listxml/{catalog}/{type}', name: 'list_topics_xml')] + public function listxmlAction(string $catalog = NULL, string $type = NULL) { - $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; + } else { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); + $data['title'] = 'Topics in All Catalogs'; + $data['catalog_id'] = NULL; + } + $lookupSession->useFederatedCourseCatalogView(); + + if ($type) { + $genusType = $this->osidIdMap->typeFromString($type); + $topics = $lookupSession->getTopicsByGenusType($genusType); + $data['title'] .= ' of type ' . $type; + } else { + $topics = $lookupSession->getTopics(); + } - $this->listAction(); + $topicData = $this->osidDataLoader->getTopics($topics); + $data['topics'] = array_merge( + $topicData['subjectTopics'], + $topicData['departmentTopics'], + $topicData['divisionTopics'], + $topicData['requirementTopics'], + ); + + $data['feedLink'] = $this->generateUrl( + 'list_topics_xml', + [ + 'catalog' => $catalog, + 'type' => $type, + ], + UrlGeneratorInterface::ABSOLUTE_URL, + ); + $response = new Response($this->renderView('topics/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } /** diff --git a/templates/topics/list.xml.twig b/templates/topics/list.xml.twig new file mode 100755 index 00000000..2d915570 --- /dev/null +++ b/templates/topics/list.xml.twig @@ -0,0 +1,20 @@ + + + + {{ title }} + {{ feedLink }} + {{ 'now' | date('r') }} + Course Catalog + http://blogs.law.harvard.edu/tech/rss + +{%~ for topic in topics %} + + {{ topic.displayname }} + {{ url('view_topic', {topic: osidIdToString(topic.id), catalog: catalog_id ? osidIdToString(catalog_id)}) }} + + {{ osidIdToString(topic.id) }} + {{ osidTypeToString(topic.genustype) }} + +{% endfor %} + + From 720cfd9c390bb93ef901a593dee9923ac5792c46 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 23 Oct 2024 17:09:51 -0400 Subject: [PATCH 070/173] #47: Port the /topics/recent/* and /topics/recentxml/* actions. Also consolidate logic for preparing the data to reduce duplication. --- src/Controller/Topics.php | 243 +++++++++++++++++---------------- templates/topics/list.xml.twig | 2 +- 2 files changed, 124 insertions(+), 121 deletions(-) diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index c7b50d1d..164e89ed 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -62,28 +62,7 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $ #[Route('/topics/list/{catalog}/{type}', name: 'list_topics')] public function listAction(string $catalog = NULL, string $type = NULL) { - if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; - } else { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $data['title'] = 'Topics in All Catalogs'; - $data['catalog_id'] = NULL; - } - $lookupSession->useFederatedCourseCatalogView(); - - if ($type) { - $genusType = $this->osidIdMap->typeFromString($type); - $topics = $lookupSession->getTopicsByGenusType($genusType); - $data['title'] .= ' of type ' . $type; - } else { - $topics = $lookupSession->getTopics(); - } - - $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); - + $data = $this->getTopicData($catalog, $type); return $this->render('topics/list.html.twig', $data); } @@ -93,34 +72,7 @@ public function listAction(string $catalog = NULL, string $type = NULL) #[Route('/topics/listxml/{catalog}/{type}', name: 'list_topics_xml')] public function listxmlAction(string $catalog = NULL, string $type = NULL) { - if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; - } else { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $data['title'] = 'Topics in All Catalogs'; - $data['catalog_id'] = NULL; - } - $lookupSession->useFederatedCourseCatalogView(); - - if ($type) { - $genusType = $this->osidIdMap->typeFromString($type); - $topics = $lookupSession->getTopicsByGenusType($genusType); - $data['title'] .= ' of type ' . $type; - } else { - $topics = $lookupSession->getTopics(); - } - - $topicData = $this->osidDataLoader->getTopics($topics); - $data['topics'] = array_merge( - $topicData['subjectTopics'], - $topicData['departmentTopics'], - $topicData['divisionTopics'], - $topicData['requirementTopics'], - ); - + $data = $this->getTopicData($catalog, $type); $data['feedLink'] = $this->generateUrl( 'list_topics_xml', [ @@ -136,84 +88,32 @@ public function listxmlAction(string $catalog = NULL, string $type = NULL) /** * Print out a list of all topics. - * - * @return void - * - * @since 4/21/09 */ - public function recentAction() - { - if ($this->_getParam('catalog')) { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); - $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $this->view->title = 'Topics in '.$searchSession->getCourseCatalog()->getDisplayName(); - } else { - $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSession(); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - - $this->view->title = 'Topics in All Catalogs'; - } - $searchSession->useFederatedCourseCatalogView(); - $query = $searchSession->getTopicQuery(); - - // Match recent terms - $terms = $termLookupSession->getTerms(); - // Define a cutoff date after which courses will be included in the feed. - // Currently set to 4 years. Would be good to have as a configurable time. - $now = new DateTime(); - $cutOff = $this->DateTime_getTimestamp($now) - (60 * 60 * 24 * 365 * 4); - while ($terms->hasNext()) { - $term = $terms->getNextTerm(); - if ($this->DateTime_getTimestamp($term->getEndTime()) > $cutOff) { - $query->matchTermId($term->getId(), true); - } - } - - if ($this->_getParam('type')) { - $genusType = $this->osidTypeHelper->fromString($this->_getParam('type')); - $query->matchGenusType($genusType, true); - $this->view->title .= ' of type '.$this->_getParam('type'); - } - - $topics = $searchSession->getTopicsByQuery($query); - - $this->loadTopics($topics); - - $this->setSelectedCatalogId($searchSession->getCourseCatalogId()); - $this->view->headTitle($this->view->title); - - $this->_helper->viewRenderer->setRender('topics/list', null, true); - } - - public function DateTime_getTimestamp($dt) + #[Route('/topics/recent/{catalog}/{type}', name: 'list_recent_topics')] + public function recentAction(string $catalog = NULL, string $type = NULL) { - $dtz_original = $dt->getTimezone(); - $dtz_utc = new DateTimeZone('UTC'); - $dt->setTimezone($dtz_utc); - $year = (int) $dt->format('Y'); - $month = (int) $dt->format('n'); - $day = (int) $dt->format('j'); - $hour = (int) $dt->format('G'); - $minute = (int) $dt->format('i'); - $second = (int) $dt->format('s'); - $dt->setTimezone($dtz_original); - - return gmmktime($hour, $minute, $second, $month, $day, $year); + $data = $this->getRecentTopicData($catalog, $type); + return $this->render('topics/list.html.twig', $data); } /** * Print out an XML list of all catalogs. - * - * @return void */ - public function recentxmlAction() + #[Route('/topics/recentxml/{catalog}/{type}', name: 'list_recent_topics_xml')] + public function recentxmlAction(string $catalog = NULL, string $type = NULL) { - $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); - - $this->recentAction(); - $this->_helper->viewRenderer->setRender('topics/listxml', null, true); + $data = $this->getRecentTopicData($catalog, $type); + $data['feedLink'] = $this->generateUrl( + 'list_recent_topics_xml', + [ + 'catalog' => $catalog, + 'type' => $type, + ], + UrlGeneratorInterface::ABSOLUTE_URL, + ); + $response = new Response($this->renderView('topics/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/topics/view/{topic}/{catalog}/{term}', name: 'view_topic')] @@ -386,6 +286,109 @@ public function listdepartmentstxtAction() $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); } + /** + * Answer an array of topic data for an optional catalog and type. + * + * @param string $catalog + * The catalog id to search within. + * @param string $type + * The type id to search within. + * @return array + * The topic data ready for templating. + */ + protected function getTopicData(string $catalog = NULL, string $type = NULL) { + $data = []; + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; + } else { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); + $data['title'] = 'Topics in All Catalogs'; + $data['catalog_id'] = NULL; + } + $lookupSession->useFederatedCourseCatalogView(); + + if ($type) { + $genusType = $this->osidIdMap->typeFromString($type); + $topics = $lookupSession->getTopicsByGenusType($genusType); + $data['title'] .= ' of type ' . $type; + } else { + $topics = $lookupSession->getTopics(); + } + + $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); + return $data; + } + + /** + * Answer an array of recent topic data for an optional catalog and type. + * + * @param string $catalog + * The catalog id to search within. + * @param string $type + * The type id to search within. + * @return array + * The topic data ready for templating. + */ + protected function getRecentTopicData(string $catalog = NULL, string $type = NULL) { + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); + $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $data['title'] = 'Topics in '.$searchSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; + } else { + $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSession(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $data['title'] = 'Topics in All Catalogs'; + $data['catalog_id'] = $catalogId; + } + $searchSession->useFederatedCourseCatalogView(); + $query = $searchSession->getTopicQuery(); + + // Match recent terms + $terms = $termLookupSession->getTerms(); + // Define a cutoff date after which courses will be included in the feed. + // Currently set to 4 years. Would be good to have as a configurable time. + $now = new \DateTime(); + $cutOff = $this->DateTime_getTimestamp($now) - (60 * 60 * 24 * 365 * 4); + while ($terms->hasNext()) { + $term = $terms->getNextTerm(); + if ($this->DateTime_getTimestamp($term->getEndTime()) > $cutOff) { + $query->matchTermId($term->getId(), true); + } + } + + if ($type) { + $genusType = $this->osidIdMap->typeFromString($type); + $query->matchGenusType($genusType, true); + $data['title'] .= ' of type ' . $type; + } + + $topics = $searchSession->getTopicsByQuery($query); + $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); + + return $data; + } + + protected function DateTime_getTimestamp($dt) + { + $dtz_original = $dt->getTimezone(); + $dtz_utc = new \DateTimeZone('UTC'); + $dt->setTimezone($dtz_utc); + $year = (int) $dt->format('Y'); + $month = (int) $dt->format('n'); + $day = (int) $dt->format('j'); + $hour = (int) $dt->format('G'); + $minute = (int) $dt->format('i'); + $second = (int) $dt->format('s'); + $dt->setTimezone($dtz_original); + + return gmmktime($hour, $minute, $second, $month, $day, $year); + } + /** * Render a text feed for a given topic type. * diff --git a/templates/topics/list.xml.twig b/templates/topics/list.xml.twig index 2d915570..2a4ac7ad 100755 --- a/templates/topics/list.xml.twig +++ b/templates/topics/list.xml.twig @@ -7,7 +7,7 @@ Course Catalog http://blogs.law.harvard.edu/tech/rss -{%~ for topic in topics %} +{%~ for topic in subjectTopics|merge(departmentTopics, divisionTopics, requirementTopics) %} {{ topic.displayname }} {{ url('view_topic', {topic: osidIdToString(topic.id), catalog: catalog_id ? osidIdToString(catalog_id)}) }} From 65f83f7e178f59eac5b50849c232d52a9d1731a0 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 12:20:55 -0400 Subject: [PATCH 071/173] #47: Port /topics/viewxml/* action. --- src/Controller/Topics.php | 43 +++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index 164e89ed..0014c221 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -182,36 +182,39 @@ public function view($topic, $catalog = NULL, $term = NULL) /** * Print out an XML listing of a topic. - * - * @return void */ - public function viewxmlAction() + #[Route('/topics/viewxml/{topic}/{catalog}', name: 'view_topic_xml')] + public function viewxmlAction(string $topic, string $catalog = NULL) { - $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); + $data = []; - if ($this->_getParam('catalog')) { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - $this->view->title = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $this->view->title = 'Topics in All Catalogs'; + $data['title'] = 'Topics in All Catalogs'; + $data['catalog_id'] = NULL; } $lookupSession->useFederatedCourseCatalogView(); - $topicId = $this->osidIdMap->fromString($this->_getParam('topic')); - - $topic = $lookupSession->getTopic($topicId); - $topics = new phpkit_course_ArrayTopicList([$topic]); - - $this->loadTopics($topics); - - $this->setSelectedCatalogId($lookupSession->getCourseCatalogId()); - $this->view->title = 'Catalog Details'; - $this->view->headTitle($this->view->title); + $topicId = $this->osidIdMap->fromString($topic); + $topics = new \phpkit_course_ArrayTopicList([$lookupSession->getTopic($topicId)]); + $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); - $this->render('topics/listxml', null, true); + $data['feedLink'] = $this->generateUrl( + 'view_topic_xml', + [ + 'catalog' => $catalog, + 'topic' => $topic, + ], + UrlGeneratorInterface::ABSOLUTE_URL, + ); + $response = new Response($this->renderView('topics/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } /** From fa3b25d126f93e16b2a3a14caf07e1f49802d159 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 12:35:33 -0400 Subject: [PATCH 072/173] #47: Port /topics/list*txt actions. --- src/Controller/Topics.php | 101 +++++++++++++++++---------------- templates/topics/list.txt.twig | 3 + 2 files changed, 55 insertions(+), 49 deletions(-) create mode 100644 templates/topics/list.txt.twig diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index 0014c221..24bd4986 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -218,75 +218,75 @@ public function viewxmlAction(string $topic, string $catalog = NULL) } /** - * List all department topics as a text file with each line being Id|DisplayName. - * - * @return void - * - * @since 10/20/09 + * List all subject topics as a text file with each line being Id|DisplayName. */ - public function listsubjectstxtAction() + #[Route('/topics/listsubjectstxt/{catalog}', name: 'list_subjects_txt')] + public function listsubjectstxtAction($catalog = NULL) { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject')); + return $this->renderTextList( + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'), + $catalog, + ); } /** * List all requirement topics as a text file with each line being Id|DisplayName. - * - * @return void - * - * @since 10/20/09 */ - public function listrequirementstxtAction() + #[Route('/topics/listrequirementstxt/{catalog}', name: 'list_requirements_txt')] + public function listrequirementstxtAction($catalog = NULL) { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement')); + return $this->renderTextList( + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'), + $catalog, + ); } /** * List all level topics as a text file with each line being Id|DisplayName. - * - * @return void - * - * @since 1/15/10 */ - public function listlevelstxtAction() + #[Route('/topics/listlevelstxt/{catalog}', name: 'list_levels_txt')] + public function listlevelstxtAction($catalog = NULL) { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level')); + return $this->renderTextList( + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'), + $catalog, + ); } /** * List all block topics as a text file with each line being Id|DisplayName. - * - * @return void - * - * @since 10/20/09 */ - public function listblockstxtAction() + #[Route('/topics/listblockstxt/{catalog}', name: 'list_blocks_txt')] + public function listblockstxtAction($catalog = NULL) { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block')); + return $this->renderTextList( + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'), + $catalog, + ); } /** * List all instruction-methods topics as a text file with each line being Id|DisplayName. - * - * @return void - * - * @since 10/20/09 */ - public function listinstructionmethodstxtAction() + #[Route('/topics/listinstructionmethodstxt/{catalog}', name: 'list_instructionmethods_txt')] + public function listinstructionmethodstxtAction($catalog = NULL) { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method')); + return $this->renderTextList( + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'), + $catalog, + ); } /** * List all department topics as a text file with each line being Id|DisplayName. - * - * @return void - * - * @since 10/20/09 */ - public function listdepartmentstxtAction() + #[Route('/topics/listdepartmentstxt/{catalog}', name: 'list_departments_txt')] + public function listdepartmentstxtAction($catalog = NULL) { - $this->renderTextList(new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department')); + return $this->renderTextList( + new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'), + $catalog, + ); } /** @@ -395,31 +395,34 @@ protected function DateTime_getTimestamp($dt) /** * Render a text feed for a given topic type. * - * @return void + * @param \osid_type_Type $genusType + * The type of topics to list. + * @param string $catalog + * An optional catalog to limit results to. * - * @since 11/17/09 + * @return \Symfony\Component\HttpFoundation\Response + * The rendered response. */ - private function renderTextList(osid_type_Type $genusType) + private function renderTextList(\osid_type_Type $genusType, string $catalog = NULL) { - header('Content-Type: text/plain'); + $data = []; - if ($this->_getParam('catalog')) { - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); + if ($catalog) { + $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - $this->view->title = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $this->view->title = 'Topics in All Catalogs'; } $lookupSession->useFederatedCourseCatalogView(); $topics = $lookupSession->getTopicsByGenusType($genusType); - while ($topics->hasNext()) { - $topic = $topics->getNextTopic(); - echo $this->osidIdMap->toString($topic->getId()).'|'.$this->osidIdMap->toString($topic->getId()).' - '.$topic->getDisplayName()."\n"; + $data['topics'][] = $topics->getNextTopic(); } - exit; + $response = new Response($this->renderView('topics/list.txt.twig', $data)); + $response->headers->set('Content-Type', 'text/plain; charset=utf-8'); + return $response; } + } diff --git a/templates/topics/list.txt.twig b/templates/topics/list.txt.twig new file mode 100644 index 00000000..65568a08 --- /dev/null +++ b/templates/topics/list.txt.twig @@ -0,0 +1,3 @@ +{% for topic in topics %} +{{ osidIdToString(topic.id) }}|{{ osidIdToString(topic.id) }} - {{ topic.displayname }} +{% endfor %} From 55d324a68ed4aae40e6c9b3f21db6716784f47e3 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 12:35:53 -0400 Subject: [PATCH 073/173] #47: Be more specific about types. --- src/Controller/Topics.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index 24bd4986..d46df8fc 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -376,7 +376,7 @@ protected function getRecentTopicData(string $catalog = NULL, string $type = NUL return $data; } - protected function DateTime_getTimestamp($dt) + protected function DateTime_getTimestamp(\DateTime $dt) { $dtz_original = $dt->getTimezone(); $dtz_utc = new \DateTimeZone('UTC'); From 2c56e0e9c7dac2d9d8a00e44dfda781766ef535d Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 14:37:02 -0400 Subject: [PATCH 074/173] #47: Port the /catalogs/listxml action. --- .../views/scripts/catalogs/listxml.phtml | 32 -------------- src/Controller/Catalogs.php | 44 +++++++++++-------- templates/catalogs/list.html.twig | 4 +- templates/catalogs/list.xml.twig | 19 ++++++++ 4 files changed, 46 insertions(+), 53 deletions(-) delete mode 100755 application/views/scripts/catalogs/listxml.phtml create mode 100755 templates/catalogs/list.xml.twig diff --git a/application/views/scripts/catalogs/listxml.phtml b/application/views/scripts/catalogs/listxml.phtml deleted file mode 100755 index 2ecc04ed..00000000 --- a/application/views/scripts/catalogs/listxml.phtml +++ /dev/null @@ -1,32 +0,0 @@ - - - - '.$this->title.' - '.$this->pathAsAbsoluteUrl($this->url()).' - - '.date('r').' - Course Catalog - http://blogs.law.harvard.edu/tech/rss -'; - -$params = array( 'controller' => 'catalogs', - 'action' => 'view'); - -while ($this->catalogs->hasNext()) { - $catalog = $this->catalogs->getNextCourseCatalog(); - print "\n\t\t"; - print "\n\t\t\t".$this->escape($catalog->getDisplayName()).""; - $params['catalog'] = $this->getStringFromOsidId($catalog->getId()); - print "\n\t\t\t".$this->pathAsAbsoluteUrl($this->url($params)).""; - print "\n\t\t\tgetDescription()."]]>"; - print "\n\t\t\t".$this->getStringFromOsidId($catalog->getId()).""; - print "\n\t\t"; -} - - -?> - - - diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index 88b72081..354a6e3d 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -14,6 +14,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; +use Symfony\Component\Routing\Generator\UrlGeneratorInterface; /** * A controller for accessing catalogs. @@ -57,38 +58,43 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $ $this->osidTermHelper = $osidTermHelper; } - #[Route('/catalogs/', name: 'list_catalogs')] + #[Route('/catalogs/list', name: 'list_catalogs')] public function listAction() { - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); + $data = []; + $data['title'] = 'Available Catalogs'; + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); $catalogs = $lookupSession->getCourseCatalogs(); - $catalogData = []; + $data['catalogs'] = []; while ($catalogs->hasNext()) { - $catalog = $catalogs->getNextCourseCatalog(); - $catalogData[] = [ - "id" => $this->osidIdMap->toString($catalog->getId()), - "display_name" => $catalog->getDisplayName(), - "description" => $catalog->getDescription(), - ]; + $data['catalogs'][] = $catalogs->getNextCourseCatalog(); } - return $this->render('catalogs/list.html.twig', [ - 'title' => 'Available Catalogs', - 'catalogs' => $catalogData, - ]); + return $this->render('catalogs/list.html.twig', $data); } /** * Print out an XML list of all catalogs. - * - * @return void */ + #[Route('/catalogs/listxml', name: 'list_catalogs_xml')] public function listxmlAction() { - $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); - - $this->listAction(); + $data = []; + $data['title'] = 'All Catalogs'; + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); + $catalogs = $lookupSession->getCourseCatalogs(); + $data['catalogs'] = []; + while ($catalogs->hasNext()) { + $data['catalogs'][] = $catalogs->getNextCourseCatalog(); + } + $data['feedLink'] = $this->generateUrl( + 'list_catalogs_xml', + [], + UrlGeneratorInterface::ABSOLUTE_URL, + ); + $response = new Response($this->renderView('catalogs/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/catalogs/view/{catalog}/{term}', name: 'view_catalog')] diff --git a/templates/catalogs/list.html.twig b/templates/catalogs/list.html.twig index 70644f79..a516f6d0 100755 --- a/templates/catalogs/list.html.twig +++ b/templates/catalogs/list.html.twig @@ -2,7 +2,7 @@ {% block body %} {% for catalog in catalogs %} -

{{ catalog.display_name }}

-
{{ catalog.description }}
+

{{ catalog.displayname }}

+
{{ catalog.description | raw }}
{% endfor %} {% endblock %} diff --git a/templates/catalogs/list.xml.twig b/templates/catalogs/list.xml.twig new file mode 100755 index 00000000..d78fed36 --- /dev/null +++ b/templates/catalogs/list.xml.twig @@ -0,0 +1,19 @@ + + + + {{ title }} + {{ feedLink }} + {{ 'now' | date('r') }} + Course Catalog + http://blogs.law.harvard.edu/tech/rss + +{%~ for catalog in catalogs %} + + {{ catalog.displayname }} + {{ url('view_catalog', {catalog: osidIdToString(catalog.id)}) }} + + {{ osidIdToString(catalog.id) }} + +{% endfor %} + + From ae1c678cbeaa403238eb57c6045dec99b60244a9 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 14:42:14 -0400 Subject: [PATCH 075/173] #47: Port the /catalogs/viewxml/* action. --- src/Controller/Catalogs.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index 354a6e3d..af071bd0 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -122,23 +122,23 @@ public function viewAction(string $catalog, $term = NULL) /** * Print out an XML listing of a catalog. - * - * @return void */ - public function viewxmlAction() + #[Route('/catalogs/viewxml/{catalog}', name: 'view_catalog_xml')] + public function viewxmlAction(string $catalog) { - $this->_helper->layout->disableLayout(); - $this->getResponse()->setHeader('Content-Type', 'text/xml'); - - $catalogId = $this->osidIdMap->fromString($this->_getParam('catalog')); - - $lookupSession = $this->runtime->getCourseManager()->getCourseCatalogLookupSession(); - $catalog = $lookupSession->getCourseCatalog($catalogId); - $this->view->catalogs = new phpkit_course_ArrayCourseCatalogList([$catalog]); - - $this->view->title = 'Catalog Details'; - $this->view->headTitle($this->view->title); - - $this->render('catalogs/listxml', null, true); + $data = []; + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); + $data['title'] = 'View Catalog'; + $data['catalogs'] = [$lookupSession->getCourseCatalog($this->osidIdMap->fromString($catalog))]; + $data['feedLink'] = $this->generateUrl( + 'list_catalogs_xml', + [ + 'catalog' => $catalog, + ], + UrlGeneratorInterface::ABSOLUTE_URL, + ); + $response = new Response($this->renderView('catalogs/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } } From 6cafcedadfd56f27a815fc552536271367a72844 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 15:18:04 -0400 Subject: [PATCH 076/173] #47: Use a base.xml.twig for RSS structure. --- templates/base.xml.twig | 13 +++++++++++++ templates/catalogs/list.xml.twig | 14 +++----------- templates/courses/list.xml.twig | 15 +++------------ templates/offerings/search.xml.twig | 14 +++----------- templates/terms/list.xml.twig | 14 +++----------- templates/topics/list.xml.twig | 14 +++----------- 6 files changed, 28 insertions(+), 56 deletions(-) create mode 100644 templates/base.xml.twig diff --git a/templates/base.xml.twig b/templates/base.xml.twig new file mode 100644 index 00000000..54d9e5a7 --- /dev/null +++ b/templates/base.xml.twig @@ -0,0 +1,13 @@ + + + +{% block channel_meta %} + {{ title }} + {{ feedLink }} + {{ 'now' | date('r') }} + Course Catalog + http://blogs.law.harvard.edu/tech/rss +{% endblock %} +{% block items %}{% endblock %} + + diff --git a/templates/catalogs/list.xml.twig b/templates/catalogs/list.xml.twig index d78fed36..41f21b2b 100755 --- a/templates/catalogs/list.xml.twig +++ b/templates/catalogs/list.xml.twig @@ -1,12 +1,5 @@ - - - - {{ title }} - {{ feedLink }} - {{ 'now' | date('r') }} - Course Catalog - http://blogs.law.harvard.edu/tech/rss - +{% extends 'base.xml.twig' %} +{% block items %} {%~ for catalog in catalogs %} {{ catalog.displayname }} @@ -15,5 +8,4 @@ {{ osidIdToString(catalog.id) }} {% endfor %} - - +{% endblock %} diff --git a/templates/courses/list.xml.twig b/templates/courses/list.xml.twig index 0a5b11da..849be663 100755 --- a/templates/courses/list.xml.twig +++ b/templates/courses/list.xml.twig @@ -1,15 +1,6 @@ - - - - {{ title }} - {{ feedLink }} - - {{ 'now' | date('r') }} - Course Catalog - http://blogs.law.harvard.edu/tech/rss +{% extends 'base.xml.twig' %} +{% block items %} {% for course_data in courses %} {{ include('partials/course.xml.twig', course_data, with_context = FALSE) }} {% endfor %} - - - +{% endblock %} diff --git a/templates/offerings/search.xml.twig b/templates/offerings/search.xml.twig index 01e76541..38373983 100755 --- a/templates/offerings/search.xml.twig +++ b/templates/offerings/search.xml.twig @@ -1,12 +1,5 @@ - - - - {{ title }} - {{ feedLink }} - - {{ 'now' | date('r') }} - Course Catalog - http://blogs.law.harvard.edu/tech/rss +{% extends 'base.xml.twig' %} +{% block items %} {% if previousTerm %}{{ include('partials/term.xml.twig', {term: previousTerm, key: 'previous_term'}) }}{% endif %} {% if term %}{{ include('partials/term.xml.twig', {term: term, key: 'chosen_term'}) }}{% endif %} {% if nextTerm %}{{ include('partials/term.xml.twig', {term: nextTerm, key: 'next_term'}) }}{% endif %} @@ -21,5 +14,4 @@ {% for offering in offerings %} {{ include('partials/offering.xml.twig', offering, with_context = false) }} {% endfor %} - - +{% endblock %} diff --git a/templates/terms/list.xml.twig b/templates/terms/list.xml.twig index 2f118bdc..00f8cc8e 100755 --- a/templates/terms/list.xml.twig +++ b/templates/terms/list.xml.twig @@ -1,12 +1,5 @@ - - - - {{ title }} - {{ feedLink }} - {{ 'now' | date('r') }} - Course Catalog - http://blogs.law.harvard.edu/tech/rss - +{% extends 'base.xml.twig' %} +{% block items %} {%~ for term in terms %} {{ term.displayname }} @@ -18,5 +11,4 @@ {{ dateRangeToWeeks(term.starttime, term.endtime) }} {% endfor %} - - +{% endblock %} diff --git a/templates/topics/list.xml.twig b/templates/topics/list.xml.twig index 2a4ac7ad..328eb8d6 100755 --- a/templates/topics/list.xml.twig +++ b/templates/topics/list.xml.twig @@ -1,12 +1,5 @@ - - - - {{ title }} - {{ feedLink }} - {{ 'now' | date('r') }} - Course Catalog - http://blogs.law.harvard.edu/tech/rss - +{% extends 'base.xml.twig' %} +{% block items %} {%~ for topic in subjectTopics|merge(departmentTopics, divisionTopics, requirementTopics) %} {{ topic.displayname }} @@ -16,5 +9,4 @@ {{ osidTypeToString(topic.genustype) }} {% endfor %} - - +{% endblock %} From 86e7c07d7773d99c16e4893c4844e99c0af9eba3 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 15:18:58 -0400 Subject: [PATCH 077/173] #47: Ensure that the catalog_id is passed into view_topic URLs. --- src/Controller/Courses.php | 18 ++++++++---------- src/Controller/Offerings.php | 14 ++++++++++++++ templates/courses/view.html.twig | 12 ++++++------ templates/offerings/search.html.twig | 8 ++++---- templates/offerings/search.xml.twig | 2 +- templates/partials/offering.xml.twig | 16 ++++++++-------- 6 files changed, 41 insertions(+), 29 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 1c93bf3b..5ede1390 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -76,9 +76,11 @@ public function listAction($catalog = NULL) $catalogId = $this->osidIdMap->fromString($catalog); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); $data['title'] = 'Courses in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $data['title'] = 'Courses in All Catalogs'; + $data['catalog_id'] = NULL; } $lookupSession->useFederatedCourseCatalogView(); @@ -100,16 +102,12 @@ public function view($course, $term = NULL) $data['offerings'] = $this->osidDataLoader->getCourseOfferingsData($data['course'], $data['term']); // Set the selected Catalog Id. - // $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); - // $catalogIds = $catalogSession->getCatalogIdsByCourse($id); - // if ($catalogIds->hasNext()) { - // $this->setSelectedCatalogId($catalogIds->getNextId()); - // } - - // $this->view->menuIsCourses = true; - - // Bookmarked Courses and Schedules - // $data['bookmarks_CourseId'] = $course->getId(); + $data['catalog_id'] = NULL; + $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); + $catalogIds = $catalogSession->getCatalogIdsByCourse($data['course']->getId()); + if ($catalogIds->hasNext()) { + $data['catalog_id'] = $catalogIds->getNextId(); + } return $this->render('courses/view.html.twig', $data); diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 9b323832..23778a50 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -101,6 +101,7 @@ public function listAction(string $catalog, string $term) { $data = []; $catalogId = $this->osidIdMap->fromString($catalog); + $data['catalog_id'] = $catalogId; $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); $data['title'] = $lookupSession->getCourseCatalog()->getDisplayName(); $lookupSession->useFederatedCourseCatalogView(); @@ -253,6 +254,17 @@ public function viewxmlAction($id) $offeringData['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); $data['offerings'] = [$offeringData]; + // Set the selected Catalog Id. + $catalogSession = $this->osidRuntime->getCourseManager()->getCourseOfferingCatalogSession(); + $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($offering->getId()); + if ($catalogIds->hasNext()) { + $catalogId = $catalogIds->getNextId(); + $data['catalog_id'] = $catalogId; + } + else { + $data['catalog_id'] = NULL; + } + $data['title'] = $offering->getDisplayName(); $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); @@ -290,6 +302,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); $data['title'] = 'Search in '.$offeringSearchSession->getCourseCatalog()->getDisplayName(); + $data['catalog_id'] = $catalogId; } else { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); @@ -297,6 +310,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $data['title'] = 'Search in All Catalogs'; + $data['catalog_id'] = NULL; } $termLookupSession->useFederatedCourseCatalogView(); $offeringSearchSession->useFederatedCourseCatalogView(); diff --git a/templates/courses/view.html.twig b/templates/courses/view.html.twig index 861e521e..d066d4a3 100755 --- a/templates/courses/view.html.twig +++ b/templates/courses/view.html.twig @@ -12,28 +12,28 @@
Subject:
{% for topic in subjectTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Department:
{% for topic in departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Division:
{% for topic in divisionTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -41,7 +41,7 @@
Additional Details:
{% for topic in blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -50,7 +50,7 @@
Levels:
{% for topic in levelTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index 89532371..e0d5f0b3 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -234,7 +234,7 @@
Course Modality:
{% for topic in item.instructionMethodTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -245,14 +245,14 @@
Department:
{% for topic in item.departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in item.requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -260,7 +260,7 @@
Additional Details:
{% for topic in item.blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} diff --git a/templates/offerings/search.xml.twig b/templates/offerings/search.xml.twig index 38373983..7b65198b 100755 --- a/templates/offerings/search.xml.twig +++ b/templates/offerings/search.xml.twig @@ -12,6 +12,6 @@ {% endif %} {% for offering in offerings %} -{{ include('partials/offering.xml.twig', offering, with_context = false) }} +{{ include('partials/offering.xml.twig', offering | merge({catalog_id: catalog_id}), with_context = false) }} {% endfor %} {% endblock %} diff --git a/templates/partials/offering.xml.twig b/templates/partials/offering.xml.twig index 87f3b5ae..3a3be6c8 100644 --- a/templates/partials/offering.xml.twig +++ b/templates/partials/offering.xml.twig @@ -16,34 +16,34 @@ {{ include('partials/term.xml.twig', {term: offering.term, key: 'term'}) }} {%- for topic in subjectTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in departmentTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in divisionTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in requirementTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- if blockTopics is not empty %} {%- for topic in blockTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {% endif %} {%- if levelTopics is not empty %} {%- for topic in levelTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor ~%} {% endif %} {%- if instructors is not null %} {%- for instructor in instructors %} - {{ instructor.displayname }} + {{ instructor.displayname }} {% endfor %} {% endif %} {%- if location %} - {{ location.displayname }} + {{ location.displayname }} {% elseif offering.locationinfo %} {{ offering.locationinfo }} {% endif %} From 4b43ee5b67c1282f11a6369ae90d21d799e64087 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 16:23:58 -0400 Subject: [PATCH 078/173] #47: Fix template after data was reorganized. --- templates/partials/offering_list.xml.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/partials/offering_list.xml.twig b/templates/partials/offering_list.xml.twig index c560bbd9..3ae2e18d 100755 --- a/templates/partials/offering_list.xml.twig +++ b/templates/partials/offering_list.xml.twig @@ -1,7 +1,8 @@ {% if offerings is not empty %} {% set currentTerm = null %} -{% for offering in offerings %} +{% for item in offerings %} +{% set offering = item.offering %} {% if currentTerm is null or currentTerm.id != offering.termid %} {% if currentTerm is not null %} From f4a0600b9155e92a52797ee23a054685037b74c2 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 24 Oct 2024 16:28:10 -0400 Subject: [PATCH 079/173] #47: Add some basic sanity checks of URLs based on Midd data. These should be reworked to use PHPUnit and be based on the test data set, but for now they at least ensure that I didn't break templates as I refactor them. --- tests/MiddDataUrls/test-urls | 32 +++++++ tests/MiddDataUrls/test-urls.txt | 148 +++++++++++++++++++++++++++++++ 2 files changed, 180 insertions(+) create mode 100755 tests/MiddDataUrls/test-urls create mode 100644 tests/MiddDataUrls/test-urls.txt diff --git a/tests/MiddDataUrls/test-urls b/tests/MiddDataUrls/test-urls new file mode 100755 index 00000000..fa397402 --- /dev/null +++ b/tests/MiddDataUrls/test-urls @@ -0,0 +1,32 @@ +#!/usr/bin/env php + false, + 'verify' => false, +]); + +$successful = 0; +$failed = 0; +foreach ($urls as $url) { + try { + $response = $client->get($url); + $successful++; + } + catch (RequestException $e) { + $failed++; + print $url . "\n\t"; + print $e->getCode() . ' ' . $e->getMessage() . "\n"; + } +} +print "\n".count($urls)." URLs tested: $successful succeeded, $failed failed.\n"; diff --git a/tests/MiddDataUrls/test-urls.txt b/tests/MiddDataUrls/test-urls.txt new file mode 100644 index 00000000..26f5171c --- /dev/null +++ b/tests/MiddDataUrls/test-urls.txt @@ -0,0 +1,148 @@ +https://coursecatalog.lndo.site/ +https://coursecatalog.lndo.site/bookmarks/add/course.BIOL0145 +https://coursecatalog.lndo.site/bookmarks/add/course.BIOL0146 +https://coursecatalog.lndo.site/bookmarks/remove/course.BIOL0145 +https://coursecatalog.lndo.site/bookmarks/remove/course.BIOL0146 +https://coursecatalog.lndo.site/catalogs +https://coursecatalog.lndo.site/catalogs/list +https://coursecatalog.lndo.site/catalogs/listxml +https://coursecatalog.lndo.site/catalogs/view/catalog.MCUG +https://coursecatalog.lndo.site/catalogs/viewxml/catalog.MCUG +https://coursecatalog.lndo.site/courses/byidxml/catalog.MCUG?id[]=courses.ENAM0203 +https://coursecatalog.lndo.site/courses/instructorxml/74B64E9044F9B3A5047B8555CB148C91/catalog.MCUG +https://coursecatalog.lndo.site/courses/instructorxml/8724BFF3B8EDED3EF4589B469BDCB965/catalog.MCUG +https://coursecatalog.lndo.site/courses/instructorxml/8724BFF3B8EDED3EF4589B469BDCB965 +https://coursecatalog.lndo.site/courses/instructorxml/resource.person.74B64E9044F9B3A5047B8555CB148C91 +https://coursecatalog.lndo.site/courses/instructorxml/resource.person.74B64E9044F9B3A5047B8555CB148C91/catalog.MCUG +https://coursecatalog.lndo.site/courses/list/catalog.MCUG +https://coursecatalog.lndo.site/courses/searchxml/catalog.MCUG?keywords=IGST%200254 +https://coursecatalog.lndo.site/courses/topicxml/catalog.MCUG?topic[]=topic.department.MAST&topic[]=topic.department.MATH +https://coursecatalog.lndo.site/courses/topicxml/catalog.MCUG?topic[]=topic.department.MAST&topic[]=topic.department.MATHz +https://coursecatalog.lndo.site/courses/view/course.AMST0206 +https://coursecatalog.lndo.site/courses/view/course.AMST0206/term.200790 +https://coursecatalog.lndo.site/courses/view/course.AMST0206/term.201920 +https://coursecatalog.lndo.site/courses/view/course.AMST0206/term.202490 +https://coursecatalog.lndo.site/courses/view/course.AMST0226 +https://coursecatalog.lndo.site/courses/view/course.AMST0227 +https://coursecatalog.lndo.site/courses/view/course.BIOL0145 +https://coursecatalog.lndo.site/courses/view/course.BIOL0145/term.202490 +https://coursecatalog.lndo.site/courses/view/course.BIOL0314 +https://coursecatalog.lndo.site/courses/view/course.BIOL0314/term.202490 +https://coursecatalog.lndo.site/courses/view/course.ENAM0206 +https://coursecatalog.lndo.site/courses/view/course.ENAM0206/term.200790 +https://coursecatalog.lndo.site/courses/view/course.ENAM0206/term.202190 +https://coursecatalog.lndo.site/courses/view/course.ENAM0206/term.202490 +https://coursecatalog.lndo.site/courses/view/course.ENGL0206 +https://coursecatalog.lndo.site/courses/view/course.ENGL0206/term.202490 +https://coursecatalog.lndo.site/courses/view/course.SPAN0101/term.202490 +https://coursecatalog.lndo.site/courses/view/course.SPAN0103/term.202490 +https://coursecatalog.lndo.site/courses/viewxml/course.BIOL0314/term.202490 +https://coursecatalog.lndo.site/courses/viewxml/course.ENAM0206/term.200790 +https://coursecatalog.lndo.site/courses/viewxml/course.ENAM0206/term.202190 +https://coursecatalog.lndo.site/courses/viewxml/course.WRPR0203 +https://coursecatalog.lndo.site/favicon.ico +https://coursecatalog.lndo.site/offerings/list/catalog.MCUG/term.202490 +https://coursecatalog.lndo.site/offerings/list/catalog.SA/term.202490 +https://coursecatalog.lndo.site/offerings/search +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=1 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=2 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=3 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=5 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202420&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202420&department=topic.subject.ECON&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.department.ALAC&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.department.AMLT&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=2 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=4 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=2 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.WRPR&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202510&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202510&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202510&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202420&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202420&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM&search=Search +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&search=Search +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=topic.department.BIOL&requirement%5B%5D=topic.requirement.LNG&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM&search=Search +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400&search=Search +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202510 +https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202510&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM&search=Search +https://coursecatalog.lndo.site/offerings/search?term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM&type%5B%5D=genera%3Aoffering.PRC&type%5B%5D=genera%3Aoffering.WKS +https://coursecatalog.lndo.site/offerings/searchxml/catalog.MCUG?term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&search=Search +https://coursecatalog.lndo.site/offerings/view/section.200790.92263 +https://coursecatalog.lndo.site/offerings/view/section.200790.92270 +https://coursecatalog.lndo.site/offerings/view/section.201920.22325 +https://coursecatalog.lndo.site/offerings/view/section.202190.92538 +https://coursecatalog.lndo.site/offerings/view/section.202390.90071 +https://coursecatalog.lndo.site/offerings/view/section.202390.92385 +https://coursecatalog.lndo.site/offerings/view/section.202490.91654 +https://coursecatalog.lndo.site/offerings/view/section.202490.91756 +https://coursecatalog.lndo.site/offerings/view/section.202490.92136 +https://coursecatalog.lndo.site/offerings/view/section.202490.92331 +https://coursecatalog.lndo.site/offerings/view/section.202490.92332 +https://coursecatalog.lndo.site/offerings/view/section.202490.92415 +https://coursecatalog.lndo.site/offerings/view/section.202490.92419 +https://coursecatalog.lndo.site/offerings/view/section.202490.92486 +https://coursecatalog.lndo.site/offerings/view/section.202490.92487 +https://coursecatalog.lndo.site/offerings/view/section.202520.21262 +https://coursecatalog.lndo.site/offerings/viewxml/section.202490.92487 +https://coursecatalog.lndo.site/resources/listcampusestxt +https://coursecatalog.lndo.site/resources/listcampusestxt/catalog.MCUG +https://coursecatalog.lndo.site/resources/view/resource.person.3415A6AFA51EDCD9F9CD4013A2C68E36/term.202390?catalog=catalog.MCUG +https://coursecatalog.lndo.site/resources/view/resource.person.604CEF681674D80FFA4E6601001E065F/term.202490 +https://coursecatalog.lndo.site/resources/view/resource.person.74B64E9044F9B3A5047B8555CB148C91 +https://coursecatalog.lndo.site/resources/view/resource.person.74B64E9044F9B3A5047B8555CB148C91/term.202490 +https://coursecatalog.lndo.site/resources/view/resource.person.B6C2B366F82A8E5B3CCCBC38FFE7BF4B +https://coursecatalog.lndo.site/resources/view/resource.person.B6C2B366F82A8E5B3CCCBC38FFE7BF4B/term.202490 +https://coursecatalog.lndo.site/resources/view/resource.place.room.AXN.219/term.202390?catalog=catalog.MCUG +https://coursecatalog.lndo.site/resources/view/resource.place.room.MBH.338 +https://coursecatalog.lndo.site/resources/view/resource.place.room.MBH.338/term.202490 +https://coursecatalog.lndo.site/resources/view/resource.place.room.MNR.317/term.202490 +https://coursecatalog.lndo.site/terms/details/term.202490 +https://coursecatalog.lndo.site/terms/details/term.202490/catalog.SA +https://coursecatalog.lndo.site/terms/detailsxml/term.202490 +https://coursecatalog.lndo.site/terms/detailsxml/term.202490/catalog.SA +https://coursecatalog.lndo.site/terms/list +https://coursecatalog.lndo.site/terms/list/catalog.MCUG +https://coursecatalog.lndo.site/terms/list/catalog.SA +https://coursecatalog.lndo.site/terms/listxml/catalog.SA +https://coursecatalog.lndo.site/terms/view/term.202465 +https://coursecatalog.lndo.site/terms/view/term.202490 +https://coursecatalog.lndo.site/terms/view/term.202490/catalog.MCUG +https://coursecatalog.lndo.site/terms/view/term.202490/catalog.SA +https://coursecatalog.lndo.site/terms/view/term.202490?catalog=catalog.MCUG +https://coursecatalog.lndo.site/terms/view/term.202548 +https://coursecatalog.lndo.site/topics/list +https://coursecatalog.lndo.site/topics/list/catalog.MCUG +https://coursecatalog.lndo.site/topics/list/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.subject +https://coursecatalog.lndo.site/topics/listsubjectstxt +https://coursecatalog.lndo.site/topics/listsubjectstxt/catalog.MCUG +https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG +https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG/?type=urn:inet:middlebury.edu:genera:topic.subject +https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.requirement +https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.subject +https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG?type=urn:inet:middlebury.edu:genera:topic.requirement +https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG?type=urn:inet:middlebury.edu:genera:topic.subject +https://coursecatalog.lndo.site/topics/listxml?type=urn:inet:middlebury.edu:genera:topic.subject +https://coursecatalog.lndo.site/topics/recent/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.subject +https://coursecatalog.lndo.site/topics/recentxml/catalog.MCUG +https://coursecatalog.lndo.site/topics/recentxml/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.subject +https://coursecatalog.lndo.site/topics/view/topic.department.AMST/catalog.MCUG +https://coursecatalog.lndo.site/topics/view/topic.department.AMST/catalog.MCUG/term.202390 +https://coursecatalog.lndo.site/topics/view/topic.division.INTR/catalog.MCUG/term.202390 +https://coursecatalog.lndo.site/topics/view/topic.instruction_method.PERS/catalog.MCUG/term.202390 +https://coursecatalog.lndo.site/topics/view/topic.level.UG/catalog.MCUG/term.202390 +https://coursecatalog.lndo.site/topics/view/topic.requirement.AMR/catalog.MCUG/term.202390 +https://coursecatalog.lndo.site/topics/view/topic.requirement.HIS/catalog.MCUG/term.202390 +https://coursecatalog.lndo.site/topics/view/topic.requirement.SOC/catalog.MCUG/term.202390 +https://coursecatalog.lndo.site/topics/view/topic.subject.AMLT/catalog.MCUG +https://coursecatalog.lndo.site/topics/view/topic.subject.AMST/catalog.MCUG +https://coursecatalog.lndo.site/topics/view/topic.subject.AMST/catalog.MCUG/term.202390 +https://coursecatalog.lndo.site/topics/view/topic.subject.GREK/catalog.MCUG +https://coursecatalog.lndo.site/topics/viewxml/topic.subject.AMST/catalog.MCUG From 0bc37bcd03d6e9dd8b4aa29bc91df10a725ca4fa Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 29 Oct 2024 11:13:13 -0400 Subject: [PATCH 080/173] #47: Redirect blind requests to /favicon.ico to the asset path. --- src/Controller/Redirect.php | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 src/Controller/Redirect.php diff --git a/src/Controller/Redirect.php b/src/Controller/Redirect.php new file mode 100644 index 00000000..120de27e --- /dev/null +++ b/src/Controller/Redirect.php @@ -0,0 +1,40 @@ +redirect($this->assetMapper->getPublicPath('favicon.ico')); + } +} From 85d28122b8b30cdbeb6124c7b85f7ebb7fc51261 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 29 Oct 2024 11:35:21 -0400 Subject: [PATCH 081/173] #47: require php-cs-fixer in --dev rather than relying on global install Config was added in bb2a9720e82eb7a0623b5374b098ee2d6416b90f. Can now be run with: lando ssh -c "vendor/bin/php-cs-fixer check -v" lando ssh -c "vendor/bin/php-cs-fixer fix" --- .gitignore | 4 + .php-cs-fixer.dist.php | 2 + composer.json | 1 + composer.lock | 1751 +++++++++++++++++++++++++++++++--------- symfony.lock | 12 + 5 files changed, 1403 insertions(+), 367 deletions(-) diff --git a/.gitignore b/.gitignore index 42dacfc6..2977cd7a 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,7 @@ vendor/ /public/assets/ /assets/vendor/ ###< symfony/asset-mapper ### +###> friendsofphp/php-cs-fixer ### +/.php-cs-fixer.php +/.php-cs-fixer.cache +###< friendsofphp/php-cs-fixer ### diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php index 15af8f2e..b8b7e5ae 100644 --- a/.php-cs-fixer.dist.php +++ b/.php-cs-fixer.dist.php @@ -5,6 +5,8 @@ ->notPath([ 'vendor', '#^library#', + '#^application/library/harmoni/Primitives/Collections-Text/SafeHTML/classes/HTMLSax3#', + '#^var#', ]) ; diff --git a/composer.json b/composer.json index b8645daf..e0bb8b99 100644 --- a/composer.json +++ b/composer.json @@ -87,6 +87,7 @@ } }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.64", "phpunit/phpunit": "^9.5", "symfony/browser-kit": "6.4.*", "symfony/css-selector": "6.4.*", diff --git a/composer.lock b/composer.lock index e441cfd3..1e7306ab 100644 --- a/composer.lock +++ b/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": "9c729b55beb1d635f76607a2921d6a24", + "content-hash": "05ddfe19ed179978147737059ee823a7", "packages": [ { "name": "brick/math", @@ -8101,35 +8101,108 @@ ], "packages-dev": [ { - "name": "masterminds/html5", - "version": "2.9.0", + "name": "clue/ndjson-react", + "version": "v1.3.0", "source": { "type": "git", - "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6" + "url": "https://github.com/clue/reactphp-ndjson.git", + "reference": "392dc165fce93b5bb5c637b67e59619223c931b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0", + "reference": "392dc165fce93b5bb5c637b67e59619223c931b0", "shasum": "" }, "require": { - "ext-dom": "*", - "php": ">=5.3.0" + "php": ">=5.3", + "react/stream": "^1.2" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9" + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35", + "react/event-loop": "^1.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Clue\\React\\NDJson\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christian Lück", + "email": "christian@clue.engineering" + } + ], + "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.", + "homepage": "https://github.com/clue/reactphp-ndjson", + "keywords": [ + "NDJSON", + "json", + "jsonlines", + "newline", + "reactphp", + "streaming" + ], + "support": { + "issues": "https://github.com/clue/reactphp-ndjson/issues", + "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0" + }, + "funding": [ + { + "url": "https://clue.engineering/support", + "type": "custom" + }, + { + "url": "https://github.com/clue", + "type": "github" + } + ], + "time": "2022-12-23T10:58:28+00:00" + }, + { + "name": "composer/pcre", + "version": "3.3.1", + "source": { + "type": "git", + "url": "https://github.com/composer/pcre.git", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" + }, + "dist": { + "type": "zip", + "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.11.10", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { "psr-4": { - "Masterminds\\": "src" + "Composer\\Pcre\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -8138,122 +8211,898 @@ ], "authors": [ { - "name": "Matt Butcher", - "email": "technosophos@gmail.com" + "name": "Jordi Boggiano", + "email": "j.boggiano@seld.be", + "homepage": "http://seld.be" + } + ], + "description": "PCRE wrapping library that offers type-safe preg_* replacements.", + "keywords": [ + "PCRE", + "preg", + "regex", + "regular expression" + ], + "support": { + "issues": "https://github.com/composer/pcre/issues", + "source": "https://github.com/composer/pcre/tree/3.3.1" + }, + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" }, { - "name": "Matt Farina", - "email": "matt@mattfarina.com" + "url": "https://github.com/composer", + "type": "github" }, { - "name": "Asmir Mustafic", - "email": "goetas@gmail.com" + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" } ], - "description": "An HTML5 parser and serializer.", - "homepage": "http://masterminds.github.io/html5-php", + "time": "2024-08-27T18:44:43+00:00" + }, + { + "name": "composer/xdebug-handler", + "version": "3.0.5", + "source": { + "type": "git", + "url": "https://github.com/composer/xdebug-handler.git", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", + "shasum": "" + }, + "require": { + "composer/pcre": "^1 || ^2 || ^3", + "php": "^7.2.5 || ^8.0", + "psr/log": "^1 || ^2 || ^3" + }, + "require-dev": { + "phpstan/phpstan": "^1.0", + "phpstan/phpstan-strict-rules": "^1.1", + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Composer\\XdebugHandler\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "John Stevenson", + "email": "john-stevenson@blueyonder.co.uk" + } + ], + "description": "Restarts a process without Xdebug.", "keywords": [ - "HTML5", - "dom", - "html", - "parser", - "querypath", - "serializer", - "xml" + "Xdebug", + "performance" ], "support": { - "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.9.0" + "irc": "ircs://irc.libera.chat:6697/composer", + "issues": "https://github.com/composer/xdebug-handler/issues", + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, - "time": "2024-03-31T07:05:07+00:00" + "funding": [ + { + "url": "https://packagist.com", + "type": "custom" + }, + { + "url": "https://github.com/composer", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/composer/composer", + "type": "tidelift" + } + ], + "time": "2024-05-06T16:37:16+00:00" }, { - "name": "myclabs/deep-copy", - "version": "1.12.0", + "name": "evenement/evenement", + "version": "v3.0.2", "source": { "type": "git", - "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "url": "https://github.com/igorw/evenement.git", + "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc", + "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc", "shasum": "" }, "require": { - "php": "^7.1 || ^8.0" + "php": ">=7.0" }, - "conflict": { - "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3 <3.2.2" + "require-dev": { + "phpunit/phpunit": "^9 || ^6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Evenement\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + } + ], + "description": "Événement is a very simple event dispatching library for PHP", + "keywords": [ + "event-dispatcher", + "event-emitter" + ], + "support": { + "issues": "https://github.com/igorw/evenement/issues", + "source": "https://github.com/igorw/evenement/tree/v3.0.2" + }, + "time": "2023-08-08T05:53:35+00:00" + }, + { + "name": "fidry/cpu-core-counter", + "version": "1.2.0", + "source": { + "type": "git", + "url": "https://github.com/theofidry/cpu-core-counter.git", + "reference": "8520451a140d3f46ac33042715115e290cf5785f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" }, "require-dev": { - "doctrine/collections": "^1.6.8", - "doctrine/common": "^2.13.3 || ^3.2.2", - "phpspec/prophecy": "^1.10", - "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + "fidry/makefile": "^0.2.0", + "fidry/php-cs-fixer-config": "^1.1.2", + "phpstan/extension-installer": "^1.2.0", + "phpstan/phpstan": "^1.9.2", + "phpstan/phpstan-deprecation-rules": "^1.0.0", + "phpstan/phpstan-phpunit": "^1.2.2", + "phpstan/phpstan-strict-rules": "^1.4.4", + "phpunit/phpunit": "^8.5.31 || ^9.5.26", + "webmozarts/strict-phpunit": "^7.5" }, "type": "library", "autoload": { - "files": [ - "src/DeepCopy/deep_copy.php" - ], "psr-4": { - "DeepCopy\\": "src/DeepCopy/" + "Fidry\\CpuCoreCounter\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], - "description": "Create deep copies (clones) of your objects", + "authors": [ + { + "name": "Théo FIDRY", + "email": "theo.fidry@gmail.com" + } + ], + "description": "Tiny utility to get the number of CPU cores.", "keywords": [ - "clone", - "copy", - "duplicate", - "object", - "object graph" + "CPU", + "core" ], "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "issues": "https://github.com/theofidry/cpu-core-counter/issues", + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" }, "funding": [ { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" + "url": "https://github.com/theofidry", + "type": "github" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-08-06T10:04:20+00:00" }, { - "name": "nikic/php-parser", - "version": "v5.3.1", + "name": "friendsofphp/php-cs-fixer", + "version": "v3.64.0", "source": { "type": "git", - "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git", + "reference": "58dd9c931c785a79739310aef5178928305ffa67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", - "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/58dd9c931c785a79739310aef5178928305ffa67", + "reference": "58dd9c931c785a79739310aef5178928305ffa67", "shasum": "" }, "require": { - "ext-ctype": "*", + "clue/ndjson-react": "^1.0", + "composer/semver": "^3.4", + "composer/xdebug-handler": "^3.0.3", + "ext-filter": "*", "ext-json": "*", "ext-tokenizer": "*", - "php": ">=7.4" + "fidry/cpu-core-counter": "^1.0", + "php": "^7.4 || ^8.0", + "react/child-process": "^0.6.5", + "react/event-loop": "^1.0", + "react/promise": "^2.0 || ^3.0", + "react/socket": "^1.0", + "react/stream": "^1.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0", + "symfony/console": "^5.4 || ^6.0 || ^7.0", + "symfony/event-dispatcher": "^5.4 || ^6.0 || ^7.0", + "symfony/filesystem": "^5.4 || ^6.0 || ^7.0", + "symfony/finder": "^5.4 || ^6.0 || ^7.0", + "symfony/options-resolver": "^5.4 || ^6.0 || ^7.0", + "symfony/polyfill-mbstring": "^1.28", + "symfony/polyfill-php80": "^1.28", + "symfony/polyfill-php81": "^1.28", + "symfony/process": "^5.4 || ^6.0 || ^7.0", + "symfony/stopwatch": "^5.4 || ^6.0 || ^7.0" }, "require-dev": { - "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^9.0" + "facile-it/paraunit": "^1.3 || ^2.3", + "infection/infection": "^0.29.5", + "justinrainbow/json-schema": "^5.2", + "keradus/cli-executor": "^2.1", + "mikey179/vfsstream": "^1.6.11", + "php-coveralls/php-coveralls": "^2.7", + "php-cs-fixer/accessible-object": "^1.1", + "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5", + "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5", + "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2", + "symfony/var-dumper": "^5.4 || ^6.0 || ^7.0", + "symfony/yaml": "^5.4 || ^6.0 || ^7.0" + }, + "suggest": { + "ext-dom": "For handling output formats in XML", + "ext-mbstring": "For handling non-UTF8 characters." + }, + "bin": [ + "php-cs-fixer" + ], + "type": "application", + "autoload": { + "psr-4": { + "PhpCsFixer\\": "src/" + }, + "exclude-from-classmap": [ + "src/Fixer/Internal/*" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Dariusz Rumiński", + "email": "dariusz.ruminski@gmail.com" + } + ], + "description": "A tool to automatically fix PHP code style", + "keywords": [ + "Static code analysis", + "fixer", + "standards", + "static analysis" + ], + "support": { + "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues", + "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.64.0" + }, + "funding": [ + { + "url": "https://github.com/keradus", + "type": "github" + } + ], + "time": "2024-08-30T23:09:38+00:00" + }, + { + "name": "masterminds/html5", + "version": "2.9.0", + "source": { + "type": "git", + "url": "https://github.com/Masterminds/html5-php.git", + "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.7-dev" + } + }, + "autoload": { + "psr-4": { + "Masterminds\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Matt Butcher", + "email": "technosophos@gmail.com" + }, + { + "name": "Matt Farina", + "email": "matt@mattfarina.com" + }, + { + "name": "Asmir Mustafic", + "email": "goetas@gmail.com" + } + ], + "description": "An HTML5 parser and serializer.", + "homepage": "http://masterminds.github.io/html5-php", + "keywords": [ + "HTML5", + "dom", + "html", + "parser", + "querypath", + "serializer", + "xml" + ], + "support": { + "issues": "https://github.com/Masterminds/html5-php/issues", + "source": "https://github.com/Masterminds/html5-php/tree/2.9.0" + }, + "time": "2024-03-31T07:05:07+00:00" + }, + { + "name": "myclabs/deep-copy", + "version": "1.12.0", + "source": { + "type": "git", + "url": "https://github.com/myclabs/DeepCopy.git", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "shasum": "" + }, + "require": { + "php": "^7.1 || ^8.0" + }, + "conflict": { + "doctrine/collections": "<1.6.8", + "doctrine/common": "<2.13.3 || >=3 <3.2.2" + }, + "require-dev": { + "doctrine/collections": "^1.6.8", + "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", + "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" + }, + "type": "library", + "autoload": { + "files": [ + "src/DeepCopy/deep_copy.php" + ], + "psr-4": { + "DeepCopy\\": "src/DeepCopy/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Create deep copies (clones) of your objects", + "keywords": [ + "clone", + "copy", + "duplicate", + "object", + "object graph" + ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], + "time": "2024-06-12T14:39:25+00:00" + }, + { + "name": "nikic/php-parser", + "version": "v5.3.1", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/8eea230464783aa9671db8eea6f8c6ac5285794b", + "reference": "8eea230464783aa9671db8eea6f8c6ac5285794b", + "shasum": "" + }, + "require": { + "ext-ctype": "*", + "ext-json": "*", + "ext-tokenizer": "*", + "php": ">=7.4" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.0-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + }, + "time": "2024-10-08T18:51:32+00:00" + }, + { + "name": "phar-io/manifest", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "54750ef60c58e43759730615a392c31c80e23176" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-phar": "*", + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" + }, + { + "name": "phar-io/version", + "version": "3.2.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "shasum": "" + }, + "require": { + "php": "^7.2 || ^8.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.2.1" + }, + "time": "2022-02-21T01:04:05+00:00" + }, + { + "name": "phpunit/php-code-coverage", + "version": "9.2.32", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-libxml": "*", + "ext-xmlwriter": "*", + "nikic/php-parser": "^4.19.1 || ^5.1.0", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.6" + }, + "suggest": { + "ext-pcov": "PHP extension that provides line coverage", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "9.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2024-08-22T04:23:01+00:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "3.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "keywords": [ + "filesystem", + "iterator" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2021-12-02T12:48:52+00:00" + }, + { + "name": "phpunit/php-invoker", + "version": "3.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "keywords": [ + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:58:55+00:00" + }, + { + "name": "phpunit/php-text-template", + "version": "2.0.4", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T05:33:50+00:00" + }, + { + "name": "phpunit/php-timer", + "version": "5.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" }, - "bin": [ - "bin/php-parse" - ], "type": "library", "extra": { "branch-alias": { @@ -8261,9 +9110,9 @@ } }, "autoload": { - "psr-4": { - "PhpParser\\": "lib/PhpParser" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -8271,49 +9120,88 @@ ], "authors": [ { - "name": "Nikita Popov" + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "A PHP parser written in PHP", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ - "parser", - "php" + "timer" ], "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.3.1" + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" }, - "time": "2024-10-08T18:51:32+00:00" + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:16:10+00:00" }, { - "name": "phar-io/manifest", - "version": "2.0.4", + "name": "phpunit/phpunit", + "version": "9.6.21", "source": { "type": "git", - "url": "https://github.com/phar-io/manifest.git", - "reference": "54750ef60c58e43759730615a392c31c80e23176" + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", - "reference": "54750ef60c58e43759730615a392c31c80e23176", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", + "ext-json": "*", "ext-libxml": "*", - "ext-phar": "*", + "ext-mbstring": "*", + "ext-xml": "*", "ext-xmlwriter": "*", - "phar-io/version": "^3.0.1", - "php": "^7.2 || ^8.0" + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", + "php": ">=7.3", + "phpunit/php-code-coverage": "^9.2.32", + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", + "sebastian/comparator": "^4.0.8", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", + "sebastian/version": "^3.0.2" }, + "suggest": { + "ext-soap": "To be able to generate mocks based on WSDL files", + "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + }, + "bin": [ + "phpunit" + ], "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "9.6-dev" } }, "autoload": { + "files": [ + "src/Framework/Assert/Functions.php" + ], "classmap": [ "src/" ] @@ -8323,507 +9211,569 @@ "BSD-3-Clause" ], "authors": [ - { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" - }, - { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" - }, { "name": "Sebastian Bergmann", "email": "sebastian@phpunit.de", - "role": "Developer" + "role": "lead" } ], - "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.4" + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "security": "https://github.com/sebastianbergmann/phpunit/security/policy", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" }, "funding": [ { - "url": "https://github.com/theseer", + "url": "https://phpunit.de/sponsors.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", + "type": "tidelift" } ], - "time": "2024-03-03T12:33:53+00:00" + "time": "2024-09-19T10:50:18+00:00" }, { - "name": "phar-io/version", - "version": "3.2.1", + "name": "react/cache", + "version": "v1.2.0", "source": { "type": "git", - "url": "https://github.com/phar-io/version.git", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74" + "url": "https://github.com/reactphp/cache.git", + "reference": "d47c472b64aa5608225f47965a484b75c7817d5b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74", - "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74", + "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b", + "reference": "d47c472b64aa5608225f47965a484b75c7817d5b", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": ">=5.3.0", + "react/promise": "^3.0 || ^2.0 || ^1.1" + }, + "require-dev": { + "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35" }, "type": "library", "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "React\\Cache\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Arne Blankerts", - "email": "arne@blankerts.de", - "role": "Developer" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" }, { - "name": "Sebastian Heuer", - "email": "sebastian@phpeople.de", - "role": "Developer" + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" }, { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "Developer" + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Library for handling version information and constraints", + "description": "Async, Promise-based cache interface for ReactPHP", + "keywords": [ + "cache", + "caching", + "promise", + "reactphp" + ], "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.2.1" + "issues": "https://github.com/reactphp/cache/issues", + "source": "https://github.com/reactphp/cache/tree/v1.2.0" }, - "time": "2022-02-21T01:04:05+00:00" + "funding": [ + { + "url": "https://opencollective.com/reactphp", + "type": "open_collective" + } + ], + "time": "2022-11-30T15:59:55+00:00" }, { - "name": "phpunit/php-code-coverage", - "version": "9.2.32", + "name": "react/child-process", + "version": "v0.6.5", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" + "url": "https://github.com/reactphp/child-process.git", + "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", - "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", + "url": "https://api.github.com/repos/reactphp/child-process/zipball/e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", + "reference": "e71eb1aa55f057c7a4a0d08d06b0b0a484bead43", "shasum": "" }, "require": { - "ext-dom": "*", - "ext-libxml": "*", - "ext-xmlwriter": "*", - "nikic/php-parser": "^4.19.1 || ^5.1.0", - "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.6", - "phpunit/php-text-template": "^2.0.4", - "sebastian/code-unit-reverse-lookup": "^2.0.3", - "sebastian/complexity": "^2.0.3", - "sebastian/environment": "^5.1.5", - "sebastian/lines-of-code": "^1.0.4", - "sebastian/version": "^3.0.2", - "theseer/tokenizer": "^1.2.3" + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.0", + "react/event-loop": "^1.2", + "react/stream": "^1.2" }, "require-dev": { - "phpunit/phpunit": "^9.6" - }, - "suggest": { - "ext-pcov": "PHP extension that provides line coverage", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35", + "react/socket": "^1.8", + "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-main": "9.2.x-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "React\\ChildProcess\\": "src" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", - "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "description": "Event-driven library for executing child processes with ReactPHP.", "keywords": [ - "coverage", - "testing", - "xunit" + "event-driven", + "process", + "reactphp" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" + "issues": "https://github.com/reactphp/child-process/issues", + "source": "https://github.com/reactphp/child-process/tree/v0.6.5" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", + "url": "https://github.com/WyriHaximus", + "type": "github" + }, + { + "url": "https://github.com/clue", "type": "github" } ], - "time": "2024-08-22T04:23:01+00:00" + "time": "2022-09-16T13:41:56+00:00" }, { - "name": "phpunit/php-file-iterator", - "version": "3.0.6", + "name": "react/dns", + "version": "v1.13.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf" + "url": "https://github.com/reactphp/dns.git", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", - "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf", + "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", + "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=5.3.0", + "react/cache": "^1.0 || ^0.6 || ^0.5", + "react/event-loop": "^1.2", + "react/promise": "^3.2 || ^2.7 || ^1.2.1" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/async": "^4.3 || ^3 || ^2", + "react/promise-timer": "^1.11" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.0-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "React\\Dns\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "FilterIterator implementation that filters files based on a list of suffixes.", - "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", + "description": "Async DNS resolver for ReactPHP", "keywords": [ - "filesystem", - "iterator" + "async", + "dns", + "dns-resolver", + "reactphp" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6" + "issues": "https://github.com/reactphp/dns/issues", + "source": "https://github.com/reactphp/dns/tree/v1.13.0" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", - "type": "github" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2021-12-02T12:48:52+00:00" + "time": "2024-06-13T14:18:03+00:00" }, { - "name": "phpunit/php-invoker", - "version": "3.1.1", + "name": "react/event-loop", + "version": "v1.5.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" + "url": "https://github.com/reactphp/event-loop.git", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", - "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", + "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=5.3.0" }, "require-dev": { - "ext-pcntl": "*", - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, "suggest": { - "ext-pcntl": "*" + "ext-pcntl": "For signal handling support when using the StreamSelectLoop" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.1-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "React\\EventLoop\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Invoke callables with a timeout", - "homepage": "https://github.com/sebastianbergmann/php-invoker/", + "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.", "keywords": [ - "process" + "asynchronous", + "event-loop" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-invoker/issues", - "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + "issues": "https://github.com/reactphp/event-loop/issues", + "source": "https://github.com/reactphp/event-loop/tree/v1.5.0" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", - "type": "github" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2020-09-28T05:58:55+00:00" + "time": "2023-11-13T13:48:05+00:00" }, { - "name": "phpunit/php-text-template", - "version": "2.0.4", + "name": "react/promise", + "version": "v3.2.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" + "url": "https://github.com/reactphp/promise.git", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", - "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", "shasum": "" }, "require": { - "php": ">=7.3" + "php": ">=7.1.0" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpunit/phpunit": "^9.6 || ^7.5" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "React\\Promise\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "description": "A lightweight implementation of CommonJS Promises/A for PHP", "keywords": [ - "template" + "promise", + "promises" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + "issues": "https://github.com/reactphp/promise/issues", + "source": "https://github.com/reactphp/promise/tree/v3.2.0" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", - "type": "github" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2020-10-26T05:33:50+00:00" + "time": "2024-05-24T10:39:05+00:00" }, { - "name": "phpunit/php-timer", - "version": "5.0.3", + "name": "react/socket", + "version": "v1.16.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" + "url": "https://github.com/reactphp/socket.git", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", - "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", + "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1", "shasum": "" }, "require": { - "php": ">=7.3" + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.0", + "react/dns": "^1.13", + "react/event-loop": "^1.2", + "react/promise": "^3.2 || ^2.6 || ^1.2.1", + "react/stream": "^1.4" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36", + "react/async": "^4.3 || ^3.3 || ^2", + "react/promise-stream": "^1.4", + "react/promise-timer": "^1.11" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0-dev" - } - }, "autoload": { - "classmap": [ - "src/" - ] + "psr-4": { + "React\\Socket\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP", "keywords": [ - "timer" + "Connection", + "Socket", + "async", + "reactphp", + "stream" ], "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + "issues": "https://github.com/reactphp/socket/issues", + "source": "https://github.com/reactphp/socket/tree/v1.16.0" }, "funding": [ { - "url": "https://github.com/sebastianbergmann", - "type": "github" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2020-10-26T13:16:10+00:00" + "time": "2024-07-26T10:38:09+00:00" }, { - "name": "phpunit/phpunit", - "version": "9.6.21", + "name": "react/stream", + "version": "v1.4.0", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" + "url": "https://github.com/reactphp/stream.git", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d", + "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.5.0 || ^2", - "ext-dom": "*", - "ext-json": "*", - "ext-libxml": "*", - "ext-mbstring": "*", - "ext-xml": "*", - "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.0", - "phar-io/manifest": "^2.0.4", - "phar-io/version": "^3.2.1", - "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.32", - "phpunit/php-file-iterator": "^3.0.6", - "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.4", - "phpunit/php-timer": "^5.0.3", - "sebastian/cli-parser": "^1.0.2", - "sebastian/code-unit": "^1.0.8", - "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.6", - "sebastian/environment": "^5.1.5", - "sebastian/exporter": "^4.0.6", - "sebastian/global-state": "^5.0.7", - "sebastian/object-enumerator": "^4.0.4", - "sebastian/resource-operations": "^3.0.4", - "sebastian/type": "^3.2.1", - "sebastian/version": "^3.0.2" + "evenement/evenement": "^3.0 || ^2.0 || ^1.0", + "php": ">=5.3.8", + "react/event-loop": "^1.2" }, - "suggest": { - "ext-soap": "To be able to generate mocks based on WSDL files", - "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage" + "require-dev": { + "clue/stream-filter": "~1.2", + "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36" }, - "bin": [ - "phpunit" - ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "9.6-dev" - } - }, "autoload": { - "files": [ - "src/Framework/Assert/Functions.php" - ], - "classmap": [ - "src/" - ] + "psr-4": { + "React\\Stream\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "name": "Christian Lück", + "email": "christian@clue.engineering", + "homepage": "https://clue.engineering/" + }, + { + "name": "Cees-Jan Kiewiet", + "email": "reactphp@ceesjankiewiet.nl", + "homepage": "https://wyrihaximus.net/" + }, + { + "name": "Jan Sorgalla", + "email": "jsorgalla@gmail.com", + "homepage": "https://sorgalla.com/" + }, + { + "name": "Chris Boden", + "email": "cboden@gmail.com", + "homepage": "https://cboden.dev/" } ], - "description": "The PHP Unit Testing framework.", - "homepage": "https://phpunit.de/", + "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP", "keywords": [ - "phpunit", - "testing", - "xunit" + "event-driven", + "io", + "non-blocking", + "pipe", + "reactphp", + "readable", + "stream", + "writable" ], "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" + "issues": "https://github.com/reactphp/stream/issues", + "source": "https://github.com/reactphp/stream/tree/v1.4.0" }, "funding": [ { - "url": "https://phpunit.de/sponsors.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit", - "type": "tidelift" + "url": "https://opencollective.com/reactphp", + "type": "open_collective" } ], - "time": "2024-09-19T10:50:18+00:00" + "time": "2024-06-11T12:45:25+00:00" }, { "name": "sebastian/cli-parser", @@ -10154,6 +11104,73 @@ ], "time": "2024-08-29T22:50:23+00:00" }, + { + "name": "symfony/options-resolver", + "version": "v6.4.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/options-resolver.git", + "reference": "0a62a9f2504a8dd27083f89d21894ceb01cc59db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0a62a9f2504a8dd27083f89d21894ceb01cc59db", + "reference": "0a62a9f2504a8dd27083f89d21894ceb01cc59db", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/deprecation-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\OptionsResolver\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an improved replacement for the array_replace PHP function", + "homepage": "https://symfony.com", + "keywords": [ + "config", + "configuration", + "options" + ], + "support": { + "source": "https://github.com/symfony/options-resolver/tree/v6.4.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-09-25T14:18:03+00:00" + }, { "name": "symfony/phpunit-bridge", "version": "v7.1.4", @@ -10441,5 +11458,5 @@ "ext-iconv": "*" }, "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } diff --git a/symfony.lock b/symfony.lock index 8f9a2825..9a908804 100644 --- a/symfony.lock +++ b/symfony.lock @@ -35,6 +35,18 @@ "migrations/.gitignore" ] }, + "friendsofphp/php-cs-fixer": { + "version": "3.64", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "3.0", + "ref": "be2103eb4a20942e28a6dd87736669b757132435" + }, + "files": [ + ".php-cs-fixer.dist.php" + ] + }, "knplabs/knp-paginator-bundle": { "version": "v6.6.1" }, From 6d8939538346393b8812de16a443566ff84657c2 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 29 Oct 2024 11:46:53 -0400 Subject: [PATCH 082/173] #47: Run php-cs-fixer to match Symfony coding standards. --- .../library/apc/course/CourseManager.php | 5 +- src/Controller/Bookmarks.php | 26 +-- src/Controller/Catalogs.php | 27 +-- src/Controller/Courses.php | 61 +++--- src/Controller/Login.php | 7 +- src/Controller/Offerings.php | 94 ++++----- src/Controller/Redirect.php | 12 +- src/Controller/Resources.php | 37 ++-- src/Controller/Terms.php | 44 ++--- src/Controller/Topics.php | 111 ++++++----- src/Helper/RecentCourses/Instructor.php | 1 - .../RecentCourses/RecentCoursesAbstract.php | 2 - src/Paginator/CourseOfferingSearchAdaptor.php | 25 ++- src/Paginator/OfferingSearchSubscriber.php | 2 +- src/Security/SamlUser.php | 14 +- src/Service/Bookmarks.php | 15 +- .../Osid/AbstractOsidIdentifierMap.php | 12 +- src/Service/Osid/DataLoader.php | 178 +++++++++--------- src/Service/Osid/IdMap.php | 1 - src/Service/Osid/Runtime.php | 14 +- src/Service/Osid/TermHelper.php | 20 +- src/Service/Osid/TopicHelper.php | 9 +- src/Service/Osid/TypeHelper.php | 7 +- src/Twig/BookmarksExtension.php | 6 +- src/Twig/DateRangeFormatter.php | 5 +- src/Twig/OsidIdExtension.php | 23 ++- src/Twig/TimeHelper.php | 6 +- 27 files changed, 382 insertions(+), 382 deletions(-) diff --git a/application/library/apc/course/CourseManager.php b/application/library/apc/course/CourseManager.php index 0189df78..4544ac37 100755 --- a/application/library/apc/course/CourseManager.php +++ b/application/library/apc/course/CourseManager.php @@ -39,9 +39,10 @@ public function __construct() * Allow access to the underlying database for test setup/tear down. * * @return PDO - * The backing database. + * The backing database */ - public function getDB() { + public function getDB() + { return $this->manager->getDB(); } diff --git a/src/Controller/Bookmarks.php b/src/Controller/Bookmarks.php index 2196fb22..e5ba1d14 100755 --- a/src/Controller/Bookmarks.php +++ b/src/Controller/Bookmarks.php @@ -1,19 +1,15 @@ bookmarks->add($this->osidIdMap->fromString($course)); echo ''; - } - catch (\Exception $e) { - echo '' . $e->getMessage() . ''; + } catch (\Exception $e) { + echo ''.$e->getMessage().''; } echo ''; $response = new Response(ob_get_clean()); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } /** * Remove a course bookmark. * - * @return - * * @since 7/29/10 */ - #[Route('/bookmarks/remove/{course}', name: 'remove_bookmark')] - public function remove(string $course) - { + #[Route('/bookmarks/remove/{course}', name: 'remove_bookmark')] + public function remove(string $course) + { ob_start(); echo ''; echo ''; @@ -66,13 +58,13 @@ public function remove(string $course) } $this->bookmarks->remove($this->osidIdMap->fromString($course)); echo ''; - } - catch (\Exception $e) { - echo '' . $e->getMessage() . ''; + } catch (\Exception $e) { + echo ''.$e->getMessage().''; } echo ''; $response = new Response(ob_get_clean()); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } } diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index af071bd0..587ccfd8 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -26,33 +26,33 @@ */ class Catalogs extends AbstractController { - /** - * @var \App\Service\Osid\Runtime + * @var Runtime */ private $osidRuntime; /** - * @var \App\Service\Osid\IdMap + * @var IdMap */ private $osidIdMap; /** - * @var \App\Service\Osid\TermHelper + * @var TermHelper */ private $osidTermHelper; /** * Construct a new Catalogs controller. * - * @param \App\Service\Osid\Runtime $osidRuntime - * The osid.runtime service. - * @param \App\Service\Osid\IdMap $osidIdMap - * The osid.id_map service. - * @param \App\Service\Osid\TermHelper $osidTermHelper - * The osid.term_helper service. + * @param Runtime $osidRuntime + * The osid.runtime service. + * @param IdMap $osidIdMap + * The osid.id_map service. + * @param TermHelper $osidTermHelper + * The osid.term_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper) + { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; @@ -70,6 +70,7 @@ public function listAction() while ($catalogs->hasNext()) { $data['catalogs'][] = $catalogs->getNextCourseCatalog(); } + return $this->render('catalogs/list.html.twig', $data); } @@ -94,11 +95,12 @@ public function listxmlAction() ); $response = new Response($this->renderView('catalogs/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/catalogs/view/{catalog}/{term}', name: 'view_catalog')] - public function viewAction(string $catalog, $term = NULL) + public function viewAction(string $catalog, $term = null) { $catalogId = $this->osidIdMap->fromString($catalog); if ($term) { @@ -139,6 +141,7 @@ public function viewxmlAction(string $catalog) ); $response = new Response($this->renderView('catalogs/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } } diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 5ede1390..0c08f11f 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -26,40 +26,40 @@ */ class Courses extends AbstractController { - /** - * @var \App\Service\Osid\Runtime + * @var Runtime */ private $osidRuntime; /** - * @var \App\Service\Osid\IdMap + * @var IdMap */ private $osidIdMap; /** - * @var \App\Service\Osid\TermHelper + * @var TermHelper */ private $osidTermHelper; /** - * @var \App\Service\Osid\DataLoader + * @var DataLoader */ private $osidDataLoader; /** * Construct a new Catalogs controller. * - * @param \App\Service\Osid\Runtime $osidRuntime - * The osid.runtime service. - * @param \App\Service\Osid\IdMap $osidIdMap - * The osid.id_map service. - * @param \App\Service\Osid\TermHelper $osidTermHelper - * The osid.term_helper service. - * @param \App\Service\Osid\DataLoader $osidDataLoader - * The osid.topic_helper service. + * @param Runtime $osidRuntime + * The osid.runtime service. + * @param IdMap $osidIdMap + * The osid.id_map service. + * @param TermHelper $osidTermHelper + * The osid.term_helper service. + * @param DataLoader $osidDataLoader + * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader) + { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; @@ -67,7 +67,7 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $ } #[Route('/courses/list/{catalog}', name: 'list_courses')] - public function listAction($catalog = NULL) + public function listAction($catalog = null) { $data = [ 'courses' => [], @@ -80,7 +80,7 @@ public function listAction($catalog = NULL) } else { $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $data['title'] = 'Courses in All Catalogs'; - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $lookupSession->useFederatedCourseCatalogView(); @@ -96,13 +96,13 @@ public function listAction($catalog = NULL) } #[Route('/courses/view/{course}/{term}', name: 'view_course')] - public function view($course, $term = NULL) + public function view($course, $term = null) { $data = $this->osidDataLoader->getCourseDataByIdString($course, $term); $data['offerings'] = $this->osidDataLoader->getCourseOfferingsData($data['course'], $data['term']); // Set the selected Catalog Id. - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); $catalogIds = $catalogSession->getCatalogIdsByCourse($data['course']->getId()); if ($catalogIds->hasNext()) { @@ -110,11 +110,10 @@ public function view($course, $term = NULL) } return $this->render('courses/view.html.twig', $data); - } #[Route('/courses/viewxml/{course}/{term}', name: 'view_course_xml')] - public function viewxml($course, $term = NULL) + public function viewxml($course, $term = null) { $data = []; $courseData = $this->osidDataLoader->getCourseDataByIdString($course, $term); @@ -127,6 +126,7 @@ public function viewxml($course, $term = NULL) $response = new Response($this->renderView('courses/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } @@ -184,7 +184,7 @@ public function searchxmlAction(Request $request, $catalog) foreach ($courses as $courseIdString => $course) { $data['courses'][] = $this->osidDataLoader->getCourseData($course); } - $data['title'] = 'Course Search: "' . $keywords . '"'; + $data['title'] = 'Course Search: "'.$keywords.'"'; $data['feedLink'] = $this->generateUrl( 'search_courses_xml', [ @@ -196,6 +196,7 @@ public function searchxmlAction(Request $request, $catalog) $response = new Response($this->renderView('courses/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } @@ -291,12 +292,11 @@ public function topicxmlAction(Request $request, $catalog) try { $topic = $topicLookup->getTopic($topicId); $topicNames[] = $topic->getDisplayName(); - } - catch (\osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { $topicNames[] = $this->osidIdMap->toString($topicId); } } - $data['title'] = 'Courses in ' . implode(', ', $topicNames); + $data['title'] = 'Courses in '.implode(', ', $topicNames); $data['feedLink'] = $this->generateUrl( 'list_courses_by_topic', [ @@ -310,6 +310,7 @@ public function topicxmlAction(Request $request, $catalog) $response = new Response($this->renderView('courses/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } @@ -386,6 +387,7 @@ public function byidxmlAction(Request $request, $catalog) $response = new Response($this->renderView('courses/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } @@ -398,10 +400,9 @@ public function byidxmlAction(Request $request, $catalog) * a. Get the cross-listed sections from SSB_XLST * b. Take the section plus its cross-listed sections, get their course * entries and merge them into a single result. - * */ #[Route('/courses/instructorxml/{instructor}/{catalog}', name: 'list_courses_by_instructor')] - public function instructorxmlAction(Request $request, $instructor, $catalog = NULL) + public function instructorxmlAction(Request $request, $instructor, $catalog = null) { if (!$catalog) { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); @@ -446,8 +447,7 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = NU if (preg_match('/^resource\.person\./', $instructor)) { $instructorId = $this->osidIdMap->fromString($instructor); - } - else { + } else { $instructorId = $this->osidIdMap->fromString('resource.person.'.$instructor); } $resourceLookup = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); @@ -488,7 +488,7 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = NU ]; foreach ($recentCourses->getPrimaryCourses() as $course) { $courseData = $this->osidDataLoader->getCourseData($course); - $courseData['include_alternates_in_title'] = TRUE; + $courseData['include_alternates_in_title'] = true; $courseData['terms'] = $this->osidDataLoader->getRecentTermDataForCourse($currentTerm, $recentCourses, $course); $courseData['alternates'] = $this->osidDataLoader->getRecentCourseAlternates($recentCourses, $course); $courseData['offerings'] = []; @@ -507,8 +507,7 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = NU $response = new Response($this->renderView('courses/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } - - } diff --git a/src/Controller/Login.php b/src/Controller/Login.php index 368e60b9..494d2f1a 100644 --- a/src/Controller/Login.php +++ b/src/Controller/Login.php @@ -14,7 +14,8 @@ class Login extends AbstractController { public function __construct( private readonly FirewallMapInterface $firewallMap, - ) {} + ) { + } #[Route('/login', name: 'login')] public function __invoke(Request $request, Auth $auth): RedirectResponse @@ -26,7 +27,7 @@ public function __invoke(Request $request, Auth $auth): RedirectResponse // is below the application's base URL or take into account // other routing details, but this seems like a basic sanity check. if ($request->getHttpHost() != parse_url($returnTo, PHP_URL_HOST)) { - throw new \InvalidArgumentException("returnTo must match the current host"); + throw new \InvalidArgumentException('returnTo must match the current host'); } // Set the session variable that the Nbgrp/OneloginSamlBundle is // looking for. @@ -38,7 +39,7 @@ public function __invoke(Request $request, Auth $auth): RedirectResponse } // Execute the Nbgrp/OneloginSamlBundle's login action. $nbgrpLogin = new NbgrpLogin($this->firewallMap); + return $nbgrpLogin($request, $auth); } - } diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 23778a50..383f0d73 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -27,47 +27,47 @@ */ class Offerings extends AbstractController { - /** - * @var \App\Service\Osid\Runtime + * @var Runtime */ private $osidRuntime; /** - * @var \App\Service\Osid\IdMap + * @var IdMap */ private $osidIdMap; /** - * @var \App\Service\Osid\TermHelper + * @var TermHelper */ private $osidTermHelper; /** - * @var \App\Service\Osid\DataLoader + * @var DataLoader */ private $osidDataLoader; /** - * @var \App\Service\Osid\TypeHelper + * @var TypeHelper */ private $osidTypeHelper; /** * Construct a new Catalogs controller. * - * @param \App\Service\Osid\Runtime $osidRuntime - * The osid.runtime service. - * @param \App\Service\Osid\IdMap $osidIdMap - * The osid.id_map service. - * @param \App\Service\Osid\TermHelper $osidTermHelper - * The osid.term_helper service. - * @param \App\Service\Osid\DataLoader $osidDataLoader - * The osid.topic_helper service. - * @param \App\Service\Osid\TypeHelper $osidTypeHelper - * The osid type helper service. + * @param Runtime $osidRuntime + * The osid.runtime service. + * @param IdMap $osidIdMap + * The osid.id_map service. + * @param TermHelper $osidTermHelper + * The osid.term_helper service. + * @param DataLoader $osidDataLoader + * The osid.topic_helper service. + * @param TypeHelper $osidTypeHelper + * The osid type helper service */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader, TypeHelper $osidTypeHelper) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader, TypeHelper $osidTypeHelper) + { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; @@ -144,7 +144,7 @@ public function listAction(string $catalog, string $term) * @since 10/21/09 */ #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings_xml')] - public function searchxml(Request $request, string $catalog = NULL, string $term = NULL) + public function searchxml(Request $request, ?string $catalog = null, ?string $term = null) { [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog, $term); // Actually run the query. @@ -184,25 +184,26 @@ public function searchxml(Request $request, string $catalog = NULL, string $term $response = new Response($this->renderView('offerings/search.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/offerings/search/{catalog}', name: 'search_offerings')] - public function search(Request $request, PaginatorInterface $paginator, string $catalog = NULL) + public function search(Request $request, PaginatorInterface $paginator, ?string $catalog = null) { [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog); $data['form_action'] = $this->generateUrl('search_offerings', ['catalog' => $catalog]); // Run the query if submitted. - $data['paginator'] = NULL; + $data['paginator'] = null; if ($request->get('search')) { $data['searchParams']['search'] = $request->get('search'); $data['paginator'] = $paginator->paginate( new CourseOfferingSearchAdaptor( $searchSession, $query, - NULL, + null, [$this, 'getOfferingData'], ), $request->query->getInt('page', 1), /* page number */ @@ -216,7 +217,6 @@ public function search(Request $request, PaginatorInterface $paginator, string $ $data['selectedCatalogId'] = $searchSession->getCourseCatalogId(); $data['menuIsSearch'] = true; - return $this->render('offerings/search.html.twig', $data); } @@ -237,9 +237,8 @@ public function viewAction($id) if ($catalogIds->hasNext()) { $catalogId = $catalogIds->getNextId(); $data['catalog_id'] = $catalogId; - } - else { - $data['catalog_id'] = NULL; + } else { + $data['catalog_id'] = null; } return $this->render('offerings/view.html.twig', $data); @@ -260,37 +259,37 @@ public function viewxmlAction($id) if ($catalogIds->hasNext()) { $catalogId = $catalogIds->getNextId(); $data['catalog_id'] = $catalogId; - } - else { - $data['catalog_id'] = NULL; + } else { + $data['catalog_id'] = null; } $data['title'] = $offering->getDisplayName(); $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); - $data['previousTerm'] = NULL; + $data['previousTerm'] = null; $data['term'] = $offering->getTerm(); - $data['nextTerm'] = NULL; - $data['terms'] = NULL; + $data['nextTerm'] = null; + $data['terms'] = null; $response = new Response($this->renderView('offerings/search.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } /** * Run a search query and provide the data suitable for templating. * - * @param \Symfony\Component\HttpFoundation\Request $request - * The request that contains the search parameters. - * @param string|NULL $catalog - * The catalog to search in or NULL for all catalogs. + * @param Request $request + * The request that contains the search parameters + * @param string|null $catalog + * The catalog to search in or NULL for all catalogs * * @return array - * The parts of the search preparation in an array: data, searchSession, - * and query. + * The parts of the search preparation in an array: data, searchSession, + * and query */ - protected function prepareSearch(Request $request, string $catalog = NULL) + protected function prepareSearch(Request $request, ?string $catalog = null) { $term = $request->get('term'); $data = []; @@ -310,7 +309,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $data['title'] = 'Search in All Catalogs'; - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $termLookupSession->useFederatedCourseCatalogView(); $offeringSearchSession->useFederatedCourseCatalogView(); @@ -436,7 +435,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) $data['genusTypes'] = []; while ($genusTypes->hasNext()) { $data['genusTypes'][] = $genusTypes->getNextType(); - }; + } // Campuses -- only include if we have more than one. $campuses = $resourceLookupSession->getResourcesByGenusType($this->campusType); @@ -482,7 +481,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) } } - $data['selectedDepartmentId'] = NULL; + $data['selectedDepartmentId'] = null; if ($request->get('department')) { if (is_array($request->get('department'))) { $departments = $request->get('department'); @@ -503,7 +502,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) } } - $data['selectedSubjectId'] = NULL; + $data['selectedSubjectId'] = null; if ($request->get('subject')) { if (is_array($request->get('subject'))) { $subjects = $request->get('subject'); @@ -524,7 +523,7 @@ protected function prepareSearch(Request $request, string $catalog = NULL) } } - $data['selectedDivisionId'] = NULL; + $data['selectedDivisionId'] = null; if ($request->get('division')) { if (is_array($request->get('division'))) { $divisions = $request->get('division'); @@ -797,15 +796,16 @@ protected function prepareSearch(Request $request, string $catalog = NULL) * Callback to get offering data for paginated search results. * * @param \osid_course_CourseOffering $offering - * The course. + * The course * * @return array - * An array of data about the course offering. + * An array of data about the course offering */ - public function getOfferingData(\osid_course_CourseOffering $offering) { + public function getOfferingData(\osid_course_CourseOffering $offering) + { $data = $this->osidDataLoader->getOfferingData($offering); $data['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); + return $data; } - } diff --git a/src/Controller/Redirect.php b/src/Controller/Redirect.php index 120de27e..b60802bc 100644 --- a/src/Controller/Redirect.php +++ b/src/Controller/Redirect.php @@ -2,28 +2,26 @@ namespace App\Controller; -use Symfony\Component\AssetMapper\AssetMapperInterface; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; +use Symfony\Component\AssetMapper\AssetMapperInterface; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; -use Symfony\Component\Routing\Generator\UrlGeneratorInterface; /** * A controller for application path redirects. */ class Redirect extends AbstractController { - /** * Construct a new Redirect controller. * - * @param \Symfony\Component\AssetMapper\AssetMapperInterface $assetMapper - * The asset mapper service. + * @param AssetMapperInterface $assetMapper + * The asset mapper service */ public function __construct( private AssetMapperInterface $assetMapper, - ) { } + ) { + } /** * Redirect blind requests to /favicon.ico to our asset path. diff --git a/src/Controller/Resources.php b/src/Controller/Resources.php index 134f2052..ebdf294c 100755 --- a/src/Controller/Resources.php +++ b/src/Controller/Resources.php @@ -9,7 +9,6 @@ use App\Service\Osid\DataLoader; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; -use App\Service\Osid\TermHelper; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; @@ -23,33 +22,33 @@ */ class Resources extends AbstractController { - /** - * @var \App\Service\Osid\Runtime + * @var Runtime */ private $osidRuntime; /** - * @var \App\Service\Osid\IdMap + * @var IdMap */ private $osidIdMap; /** - * @var \App\Service\Osid\DataLoader + * @var DataLoader */ private $osidDataLoader; /** * Construct a new Catalogs controller. * - * @param \App\Service\Osid\Runtime $osidRuntime - * The osid.runtime service. - * @param \App\Service\Osid\IdMap $osidIdMap - * The osid.id_map service. - * @param \App\Service\Osid\DataLoader $osidDataLoader - * The osid.topic_helper service. + * @param Runtime $osidRuntime + * The osid.runtime service. + * @param IdMap $osidIdMap + * The osid.id_map service. + * @param DataLoader $osidDataLoader + * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) + { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidDataLoader = $osidDataLoader; @@ -57,7 +56,7 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $ } #[Route('/resources/view/{resource}/{term}', name: 'view_resource')] - public function viewAction(Request $request, $resource, $term = NULL) + public function viewAction(Request $request, $resource, $term = null) { $id = $this->osidIdMap->fromString($resource); $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); @@ -76,9 +75,8 @@ public function viewAction(Request $request, $resource, $term = NULL) $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $data['term'] = $termLookupSession->getTerm($termId); - } - else { - $data['term'] = NULL; + } else { + $data['term'] = null; } $data['offeringsTitle'] = 'Sections'; @@ -96,7 +94,7 @@ public function viewAction(Request $request, $resource, $term = NULL) } // Match a location id elseif (preg_match('/^resource\.place\./', $resource)) { - $query->matchLocationId($id, TRUE); + $query->matchLocationId($id, true); $offerings = $offeringSearchSession->getCourseOfferingsByQuery($query); } if (isset($offerings)) { @@ -104,7 +102,7 @@ public function viewAction(Request $request, $resource, $term = NULL) $i = 0; while ($offerings->hasNext() && $i < $data['offering_display_limit']) { $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); - $i++; + ++$i; } } @@ -115,7 +113,7 @@ public function viewAction(Request $request, $resource, $term = NULL) * List all department topics as a text file with each line being Id|DisplayName. */ #[Route('/resources/listcampusestxt/{catalog}', name: 'list_campuses_txt')] - public function listcampusestxt(Request $request, $catalog = NULL) + public function listcampusestxt(Request $request, $catalog = null) { $data = []; if ($catalog) { @@ -136,6 +134,7 @@ public function listcampusestxt(Request $request, $catalog = NULL) $response = new Response($this->renderView('resources/list.txt.twig', $data)); $response->headers->set('Content-Type', 'text/plain; charset=utf-8'); + return $response; } } diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index abf3bedd..6d2b4ae9 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -9,7 +9,6 @@ use App\Service\Osid\DataLoader; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; -use App\Service\Osid\TermHelper; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -23,33 +22,33 @@ */ class Terms extends AbstractController { - /** - * @var \App\Service\Osid\Runtime + * @var Runtime */ private $osidRuntime; /** - * @var \App\Service\Osid\IdMap + * @var IdMap */ private $osidIdMap; /** - * @var \App\Service\Osid\DataLoader + * @var DataLoader */ private $osidDataLoader; /** * Construct a new Catalogs controller. * - * @param \App\Service\Osid\Runtime $osidRuntime - * The osid.runtime service. - * @param \App\Service\Osid\IdMap $osidIdMap - * The osid.id_map service. - * @param \App\Service\Osid\DataLoader $osidDataLoader - * The data loader service. + * @param Runtime $osidRuntime + * The osid.runtime service. + * @param IdMap $osidIdMap + * The osid.id_map service. + * @param DataLoader $osidDataLoader + * The data loader service */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) + { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidDataLoader = $osidDataLoader; @@ -59,7 +58,7 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $ * Print out a list of all terms. */ #[Route('/terms/list/{catalog}', name: 'list_terms')] - public function listAction($catalog = NULL) + public function listAction($catalog = null) { $data = []; if ($catalog) { @@ -70,7 +69,7 @@ public function listAction($catalog = NULL) } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $data['title'] = 'Terms in All Catalogs'; - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $lookupSession->useFederatedCourseCatalogView(); @@ -79,6 +78,7 @@ public function listAction($catalog = NULL) while ($terms->hasNext()) { $data['terms'][] = $terms->getNextTerm(); } + return $this->render('terms/list.html.twig', $data); } @@ -86,7 +86,7 @@ public function listAction($catalog = NULL) * Print out an XML list of all terms. */ #[Route('/terms/listxml/{catalog}', name: 'list_terms_xml')] - public function listxmlAction($catalog = NULL) + public function listxmlAction($catalog = null) { $data = []; if ($catalog) { @@ -97,7 +97,7 @@ public function listxmlAction($catalog = NULL) } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $data['title'] = 'Terms in All Catalogs'; - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $lookupSession->useFederatedCourseCatalogView(); @@ -109,11 +109,12 @@ public function listxmlAction($catalog = NULL) $data['feedLink'] = $this->generateUrl('list_terms_xml', ['catalog' => $catalog], UrlGeneratorInterface::ABSOLUTE_URL); $response = new Response($this->renderView('terms/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/terms/view/{term}/{catalog}', name: 'view_term')] - public function viewAction($term, $catalog = NULL) + public function viewAction($term, $catalog = null) { $data = []; $id = $this->osidIdMap->fromString($term); @@ -144,7 +145,7 @@ public function viewAction($term, $catalog = NULL) * View term details. */ #[Route('/terms/details/{term}/{catalog}', name: 'view_term_details')] - public function detailsAction($term, $catalog = NULL) + public function detailsAction($term, $catalog = null) { $id = $this->osidIdMap->fromString($term); $data = []; @@ -156,7 +157,7 @@ public function detailsAction($term, $catalog = NULL) } else { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $data['term'] = $termLookupSession->getTerm($id); @@ -167,7 +168,7 @@ public function detailsAction($term, $catalog = NULL) * View a catalog details. */ #[Route('/terms/detailsxml/{term}/{catalog}', name: 'view_term_details_xml')] - public function detailsxmlAction($term, $catalog = NULL) + public function detailsxmlAction($term, $catalog = null) { $id = $this->osidIdMap->fromString($term); $data = []; @@ -179,7 +180,7 @@ public function detailsxmlAction($term, $catalog = NULL) } else { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $data['term'] = $termLookupSession->getTerm($id); @@ -187,6 +188,7 @@ public function detailsxmlAction($term, $catalog = NULL) $response = new Response($this->renderView('terms/details.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } } diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index d46df8fc..1fe5dbcb 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -9,7 +9,6 @@ use App\Service\Osid\DataLoader; use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; -use App\Service\Osid\TermHelper; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -23,34 +22,33 @@ */ class Topics extends AbstractController { - /** - * @var \App\Service\Osid\Runtime + * @var Runtime */ private $osidRuntime; /** - * @var \App\Service\Osid\IdMap + * @var IdMap */ private $osidIdMap; /** - * @var \App\Service\Osid\DataLoader + * @var DataLoader */ private $osidDataLoader; - /** * Construct a new Catalogs controller. * - * @param \App\Service\Osid\Runtime $osidRuntime - * The osid.runtime service. - * @param \App\Service\Osid\IdMap $osidIdMap - * The osid.id_map service. - * @param \App\Service\Osid\DataLoader $osidDataLoader - * The osid.topic_helper service. + * @param Runtime $osidRuntime + * The osid.runtime service. + * @param IdMap $osidIdMap + * The osid.id_map service. + * @param DataLoader $osidDataLoader + * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) + { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidDataLoader = $osidDataLoader; @@ -60,9 +58,10 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $ * Print out a list of all topics. */ #[Route('/topics/list/{catalog}/{type}', name: 'list_topics')] - public function listAction(string $catalog = NULL, string $type = NULL) + public function listAction(?string $catalog = null, ?string $type = null) { $data = $this->getTopicData($catalog, $type); + return $this->render('topics/list.html.twig', $data); } @@ -70,7 +69,7 @@ public function listAction(string $catalog = NULL, string $type = NULL) * Print out an XML list of all catalogs. */ #[Route('/topics/listxml/{catalog}/{type}', name: 'list_topics_xml')] - public function listxmlAction(string $catalog = NULL, string $type = NULL) + public function listxmlAction(?string $catalog = null, ?string $type = null) { $data = $this->getTopicData($catalog, $type); $data['feedLink'] = $this->generateUrl( @@ -83,6 +82,7 @@ public function listxmlAction(string $catalog = NULL, string $type = NULL) ); $response = new Response($this->renderView('topics/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } @@ -90,9 +90,10 @@ public function listxmlAction(string $catalog = NULL, string $type = NULL) * Print out a list of all topics. */ #[Route('/topics/recent/{catalog}/{type}', name: 'list_recent_topics')] - public function recentAction(string $catalog = NULL, string $type = NULL) + public function recentAction(?string $catalog = null, ?string $type = null) { $data = $this->getRecentTopicData($catalog, $type); + return $this->render('topics/list.html.twig', $data); } @@ -100,7 +101,7 @@ public function recentAction(string $catalog = NULL, string $type = NULL) * Print out an XML list of all catalogs. */ #[Route('/topics/recentxml/{catalog}/{type}', name: 'list_recent_topics_xml')] - public function recentxmlAction(string $catalog = NULL, string $type = NULL) + public function recentxmlAction(?string $catalog = null, ?string $type = null) { $data = $this->getRecentTopicData($catalog, $type); $data['feedLink'] = $this->generateUrl( @@ -113,11 +114,12 @@ public function recentxmlAction(string $catalog = NULL, string $type = NULL) ); $response = new Response($this->renderView('topics/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } #[Route('/topics/view/{topic}/{catalog}/{term}', name: 'view_topic')] - public function view($topic, $catalog = NULL, $term = NULL) + public function view($topic, $catalog = null, $term = null) { $data = []; $id = $this->osidIdMap->fromString($topic); @@ -131,15 +133,14 @@ public function view($topic, $catalog = NULL, $term = NULL) $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); $offeringLookupSession->useIsolatedCourseCatalogView(); $data['catalog_id'] = $catalogId; - } - else { + } else { $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $topicLookupSession->useFederatedCourseCatalogView(); $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $offeringLookupSession->useFederatedCourseCatalogView(); - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $data['topic'] = $topicLookupSession->getTopic($id); @@ -158,8 +159,8 @@ public function view($topic, $catalog = NULL, $term = NULL) ); } else { $offerings = $offeringLookupSession->getCourseOfferingsByTopic($id); - $data['term'] = NULL; - $data['offeringsForAllTermsUrl'] = NULL; + $data['term'] = null; + $data['offeringsForAllTermsUrl'] = null; } // Don't do the work to display all offerings if we have a very large @@ -173,7 +174,7 @@ public function view($topic, $catalog = NULL, $term = NULL) $i = 0; while ($offerings->hasNext() && $i < $data['offering_display_limit']) { $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); - $i++; + ++$i; } } @@ -184,7 +185,7 @@ public function view($topic, $catalog = NULL, $term = NULL) * Print out an XML listing of a topic. */ #[Route('/topics/viewxml/{topic}/{catalog}', name: 'view_topic_xml')] - public function viewxmlAction(string $topic, string $catalog = NULL) + public function viewxmlAction(string $topic, ?string $catalog = null) { $data = []; @@ -196,7 +197,7 @@ public function viewxmlAction(string $topic, string $catalog = NULL) } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $data['title'] = 'Topics in All Catalogs'; - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $lookupSession->useFederatedCourseCatalogView(); @@ -214,6 +215,7 @@ public function viewxmlAction(string $topic, string $catalog = NULL) ); $response = new Response($this->renderView('topics/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + return $response; } @@ -221,7 +223,7 @@ public function viewxmlAction(string $topic, string $catalog = NULL) * List all subject topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listsubjectstxt/{catalog}', name: 'list_subjects_txt')] - public function listsubjectstxtAction($catalog = NULL) + public function listsubjectstxtAction($catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'), @@ -233,7 +235,7 @@ public function listsubjectstxtAction($catalog = NULL) * List all requirement topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listrequirementstxt/{catalog}', name: 'list_requirements_txt')] - public function listrequirementstxtAction($catalog = NULL) + public function listrequirementstxtAction($catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'), @@ -245,7 +247,7 @@ public function listrequirementstxtAction($catalog = NULL) * List all level topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listlevelstxt/{catalog}', name: 'list_levels_txt')] - public function listlevelstxtAction($catalog = NULL) + public function listlevelstxtAction($catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'), @@ -257,7 +259,7 @@ public function listlevelstxtAction($catalog = NULL) * List all block topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listblockstxt/{catalog}', name: 'list_blocks_txt')] - public function listblockstxtAction($catalog = NULL) + public function listblockstxtAction($catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'), @@ -269,7 +271,7 @@ public function listblockstxtAction($catalog = NULL) * List all instruction-methods topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listinstructionmethodstxt/{catalog}', name: 'list_instructionmethods_txt')] - public function listinstructionmethodstxtAction($catalog = NULL) + public function listinstructionmethodstxtAction($catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'), @@ -281,7 +283,7 @@ public function listinstructionmethodstxtAction($catalog = NULL) * List all department topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listdepartmentstxt/{catalog}', name: 'list_departments_txt')] - public function listdepartmentstxtAction($catalog = NULL) + public function listdepartmentstxtAction($catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'), @@ -293,13 +295,15 @@ public function listdepartmentstxtAction($catalog = NULL) * Answer an array of topic data for an optional catalog and type. * * @param string $catalog - * The catalog id to search within. - * @param string $type - * The type id to search within. + * The catalog id to search within + * @param string $type + * The type id to search within + * * @return array - * The topic data ready for templating. + * The topic data ready for templating */ - protected function getTopicData(string $catalog = NULL, string $type = NULL) { + protected function getTopicData(?string $catalog = null, ?string $type = null) + { $data = []; if ($catalog) { $catalogId = $this->osidIdMap->fromString($catalog); @@ -309,19 +313,20 @@ protected function getTopicData(string $catalog = NULL, string $type = NULL) { } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $data['title'] = 'Topics in All Catalogs'; - $data['catalog_id'] = NULL; + $data['catalog_id'] = null; } $lookupSession->useFederatedCourseCatalogView(); if ($type) { $genusType = $this->osidIdMap->typeFromString($type); $topics = $lookupSession->getTopicsByGenusType($genusType); - $data['title'] .= ' of type ' . $type; + $data['title'] .= ' of type '.$type; } else { $topics = $lookupSession->getTopics(); } $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); + return $data; } @@ -329,13 +334,15 @@ protected function getTopicData(string $catalog = NULL, string $type = NULL) { * Answer an array of recent topic data for an optional catalog and type. * * @param string $catalog - * The catalog id to search within. - * @param string $type - * The type id to search within. + * The catalog id to search within + * @param string $type + * The type id to search within + * * @return array - * The topic data ready for templating. + * The topic data ready for templating */ - protected function getRecentTopicData(string $catalog = NULL, string $type = NULL) { + protected function getRecentTopicData(?string $catalog = null, ?string $type = null) + { if ($catalog) { $catalogId = $this->osidIdMap->fromString($catalog); $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); @@ -367,7 +374,7 @@ protected function getRecentTopicData(string $catalog = NULL, string $type = NUL if ($type) { $genusType = $this->osidIdMap->typeFromString($type); $query->matchGenusType($genusType, true); - $data['title'] .= ' of type ' . $type; + $data['title'] .= ' of type '.$type; } $topics = $searchSession->getTopicsByQuery($query); @@ -396,14 +403,14 @@ protected function DateTime_getTimestamp(\DateTime $dt) * Render a text feed for a given topic type. * * @param \osid_type_Type $genusType - * The type of topics to list. - * @param string $catalog - * An optional catalog to limit results to. + * The type of topics to list + * @param string $catalog + * An optional catalog to limit results to * - * @return \Symfony\Component\HttpFoundation\Response - * The rendered response. + * @return Response + * The rendered response */ - private function renderTextList(\osid_type_Type $genusType, string $catalog = NULL) + private function renderTextList(\osid_type_Type $genusType, ?string $catalog = null) { $data = []; @@ -422,7 +429,7 @@ private function renderTextList(\osid_type_Type $genusType, string $catalog = NU $response = new Response($this->renderView('topics/list.txt.twig', $data)); $response->headers->set('Content-Type', 'text/plain; charset=utf-8'); + return $response; } - } diff --git a/src/Helper/RecentCourses/Instructor.php b/src/Helper/RecentCourses/Instructor.php index 62ddebe8..b187d743 100755 --- a/src/Helper/RecentCourses/Instructor.php +++ b/src/Helper/RecentCourses/Instructor.php @@ -16,7 +16,6 @@ */ class Instructor implements RecentCoursesInterface { - protected $osidIdMap; protected $groups = []; protected $recentInterval; diff --git a/src/Helper/RecentCourses/RecentCoursesAbstract.php b/src/Helper/RecentCourses/RecentCoursesAbstract.php index e8116438..ea62c5a7 100755 --- a/src/Helper/RecentCourses/RecentCoursesAbstract.php +++ b/src/Helper/RecentCourses/RecentCoursesAbstract.php @@ -16,7 +16,6 @@ */ abstract class RecentCoursesAbstract implements RecentCoursesInterface { - protected $osidIdMap; protected $groups; private $terms; @@ -28,7 +27,6 @@ abstract class RecentCoursesAbstract implements RecentCoursesInterface /** * Constructor. - * */ public function __construct(IdMap $osidIdMap, \osid_course_CourseList $courses) { diff --git a/src/Paginator/CourseOfferingSearchAdaptor.php b/src/Paginator/CourseOfferingSearchAdaptor.php index 105c5e52..df394463 100755 --- a/src/Paginator/CourseOfferingSearchAdaptor.php +++ b/src/Paginator/CourseOfferingSearchAdaptor.php @@ -21,26 +21,26 @@ class CourseOfferingSearchAdaptor * Constructor. * * @param \osid_course_CourseOfferingSearchSession $session - * The search session to run searches against. - * @param \osid_course_CourseOfferingQuery $query - * The search query to run to find offerings. - * @param \osid_course_CourseOfferingSearch $search - * An optional search criteria (sorting, limits, etc) to apply to the - * query. - * @param callable $itemsCallback - * An optional callback to apply to each item returned by getItems(). + * The search session to run searches against + * @param \osid_course_CourseOfferingQuery $query + * The search query to run to find offerings + * @param \osid_course_CourseOfferingSearch $search + * An optional search criteria (sorting, limits, etc) to apply to the + * query + * @param callable $itemsCallback + * An optional callback to apply to each item returned by getItems() */ public function __construct( \osid_course_CourseOfferingSearchSession $session, \osid_course_CourseOfferingQuery $query, - ?\osid_course_CourseOfferingSearch $search = NULL, - ?callable $itemsCallback = NULL, + ?\osid_course_CourseOfferingSearch $search = null, + ?callable $itemsCallback = null, ) { $this->session = $session; $this->query = $query; $this->itemsCallback = $itemsCallback; - if (NULL === $search) { + if (null === $search) { $this->search = $this->session->getCourseOfferingSearch(); } else { $this->search = $search; @@ -83,8 +83,7 @@ public function getItems($offset, $itemCountPerPage) $offering = $list->getNextCourseOffering(); if ($this->itemsCallback) { $items[] = call_user_func($this->itemsCallback, $offering); - } - else { + } else { $items[] = $offering; } } diff --git a/src/Paginator/OfferingSearchSubscriber.php b/src/Paginator/OfferingSearchSubscriber.php index f882106c..ce77065a 100644 --- a/src/Paginator/OfferingSearchSubscriber.php +++ b/src/Paginator/OfferingSearchSubscriber.php @@ -24,7 +24,7 @@ public function items(ItemsEvent $event): void public static function getSubscribedEvents(): array { return [ - 'knp_pager.items' => ['items', 1/* increased priority to override any internal */] + 'knp_pager.items' => ['items', 1/* increased priority to override any internal */], ]; } } diff --git a/src/Security/SamlUser.php b/src/Security/SamlUser.php index adfa23b9..4294d59c 100644 --- a/src/Security/SamlUser.php +++ b/src/Security/SamlUser.php @@ -6,13 +6,13 @@ class SamlUser implements SamlUserInterface { - private $id; private $email; private $givenName; private $surname; - public function __construct(string $id) { + public function __construct(string $id) + { $this->id = $id; } @@ -27,7 +27,6 @@ public function setSamlAttributes(array $attributes): void if (!empty($attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname'][0])) { $this->surname = $attributes['http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname'][0]; } - } /** @@ -44,7 +43,8 @@ public function setSamlAttributes(array $attributes): void * * @return string[] */ - public function getRoles(): array { + public function getRoles(): array + { return ['ROLE_USER']; } @@ -56,14 +56,16 @@ public function getRoles(): array { * * @return void */ - public function eraseCredentials() { + public function eraseCredentials() + { // Nothing to do. } /** * Returns the identifier for this user (e.g. username or email address). */ - public function getUserIdentifier(): string { + public function getUserIdentifier(): string + { return $this->id; } } diff --git a/src/Service/Bookmarks.php b/src/Service/Bookmarks.php index 3993fcd7..6df250c2 100755 --- a/src/Service/Bookmarks.php +++ b/src/Service/Bookmarks.php @@ -23,10 +23,7 @@ class Bookmarks /** * Constructor. * - * @param string $userId - * * @return void - * */ public function __construct( private EntityManagerInterface $entityManager, @@ -39,7 +36,6 @@ public function __construct( * Add a bookmark. * * @return void - * */ public function add(\osid_id_Id $courseId) { @@ -60,7 +56,6 @@ public function add(\osid_id_Id $courseId) * Remove a bookmark. * * @return void - * */ public function remove(\osid_id_Id $courseId) { @@ -77,7 +72,6 @@ public function remove(\osid_id_Id $courseId) * Answer true if the course Id passed is bookmarked. * * @return bool - * */ public function isBookmarked(\osid_id_Id $courseId) { @@ -97,7 +91,6 @@ public function isBookmarked(\osid_id_Id $courseId) * Answer an array of all bookmarked courseIds. * * @return \osid_id_IdList[] - * */ public function getAllBookmarkedCourseIds() { @@ -117,7 +110,6 @@ public function getAllBookmarkedCourseIds() * Answer an array of all bookmarked courses. * * @return \osid_course_CourseList - * */ public function getAllBookmarkedCourses() { @@ -136,7 +128,6 @@ public function getAllBookmarkedCourses() * Answer an array of all bookmarked courses that match a given catalog and term. * * @return \osid_course_CourseList - * */ public function getBookmarkedCoursesInCatalogForTerm(\osid_id_Id $catalogId, \osid_id_Id $termId) { @@ -162,11 +153,13 @@ public function getBookmarkedCoursesInCatalogForTerm(\osid_id_Id $catalogId, \os return $results->getCourses(); } - protected function getUserIdentifier() { + protected function getUserIdentifier() + { $user = $this->security->getUser(); if (!$user) { - throw new \Exception("No authenticated user found."); + throw new \Exception('No authenticated user found.'); } + return $user->getUserIdentifier(); } } diff --git a/src/Service/Osid/AbstractOsidIdentifierMap.php b/src/Service/Osid/AbstractOsidIdentifierMap.php index 57ebe8db..6bd01814 100755 --- a/src/Service/Osid/AbstractOsidIdentifierMap.php +++ b/src/Service/Osid/AbstractOsidIdentifierMap.php @@ -12,7 +12,6 @@ */ abstract class AbstractOsidIdentifierMap { - /** * @var string */ @@ -22,9 +21,10 @@ abstract class AbstractOsidIdentifierMap * Set up the mapping service. * * @param string $idAuthorityToShorten - * The Identifier authority to shorten. + * The Identifier authority to shorten */ - public function __construct(string $idAuthorityToShorten) { + public function __construct(string $idAuthorityToShorten) + { $this->idAuthorityToShorten = $idAuthorityToShorten; } @@ -39,10 +39,8 @@ protected function getIdAuthorityToShorten() { if (isset($this->idAuthorityToShorten)) { return $this->idAuthorityToShorten; - } - else { - return FALSE; + } else { + return false; } } - } diff --git a/src/Service/Osid/DataLoader.php b/src/Service/Osid/DataLoader.php index 77654bad..95130720 100644 --- a/src/Service/Osid/DataLoader.php +++ b/src/Service/Osid/DataLoader.php @@ -10,41 +10,42 @@ * Used by controllers to process and annotate OSID data-model results with * additional data for templating. */ -class DataLoader { - +class DataLoader +{ /** - * @var \App\Service\Osid\Runtime + * @var Runtime */ private $osidRuntime; /** - * @var \App\Service\Osid\IdMap + * @var IdMap */ private $osidIdMap; /** - * @var \App\Service\Osid\TermHelper + * @var TermHelper */ private $osidTermHelper; /** - * @var \App\Service\Osid\TopicHelper + * @var TopicHelper */ private $osidTopicHelper; /** * Construct a new Catalogs controller. * - * @param \App\Service\Osid\Runtime $osidRuntime - * The osid.runtime service. - * @param \App\Service\Osid\IdMap $osidIdMap - * The osid.id_map service. - * @param \App\Service\Osid\TermHelper $osidTermHelper - * The osid.term_helper service. - * @param \App\Service\Osid\TopicHelper $osidTopicHelper - * The osid.topic_helper service. + * @param Runtime $osidRuntime + * The osid.runtime service. + * @param IdMap $osidIdMap + * The osid.id_map service. + * @param TermHelper $osidTermHelper + * The osid.term_helper service. + * @param TopicHelper $osidTopicHelper + * The osid.topic_helper service. */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, TopicHelper $osidTopicHelper) { + public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, TopicHelper $osidTopicHelper) + { $this->osidRuntime = $osidRuntime; $this->osidIdMap = $osidIdMap; $this->osidTermHelper = $osidTermHelper; @@ -59,15 +60,15 @@ public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $ * Answer an array of course data suitable for templating. * * @param string $idString - * The course id string. + * The course id string * @param string $termIdString - * A reference term's id string if one is being used for filtering - * offerings. + * A reference term's id string if one is being used for filtering + * offerings * * @return array - * An array of data about the course. + * An array of data about the course */ - public function getCourseDataByIdString($idString, $termIdString = NULL) + public function getCourseDataByIdString($idString, $termIdString = null) { $id = $this->osidIdMap->fromString($idString); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); @@ -78,9 +79,8 @@ public function getCourseDataByIdString($idString, $termIdString = NULL) $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $term = $termLookupSession->getTerm($termId); - } - else { - $term = NULL; + } else { + $term = null; } return $this->getCourseData($lookupSession->getCourse($id), $term); @@ -90,31 +90,33 @@ public function getCourseDataByIdString($idString, $termIdString = NULL) * Answer an array of course data suitable for templating. * * @param \osid_course_Course $course - * The course. - * @param \osid_course_Term $term - * A reference term if one is being used for filtering offerings. + * The course + * @param \osid_course_Term $term + * A reference term if one is being used for filtering offerings * * @return array - * An array of data about the course. + * An array of data about the course */ - public function getCourseData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + public function getCourseData(\osid_course_Course $course, ?\osid_course_Term $term = null) + { $data = []; $data['course'] = $course; $data['term'] = $term; // Optional add-on data that can be populated by other methods. - $data['is_primary'] = TRUE; - $data['alternates'] = NULL; + $data['is_primary'] = true; + $data['alternates'] = null; $data['offerings'] = []; $data['terms'] = []; - $data['include_alternates_in_title'] = TRUE; + $data['include_alternates_in_title'] = true; // Load the topics into our view $data = array_merge($data, $this->getTopics($course->getTopics())); // Alternate status. - $data['is_primary'] = TRUE; + $data['is_primary'] = true; if ($course->hasRecordType($this->alternateType)) { $record = $course->getCourseRecord($this->alternateType); $data['is_primary'] = $record->isPrimary(); } + return $data; } @@ -122,13 +124,14 @@ public function getCourseData(\osid_course_Course $course, \osid_course_Term|NUL * Answer a list of all alternates for a course. * * @param \osid_course_Course $course - * The course to get alternates for. + * The course to get alternates for * * @return \osid_course_Course[] - * The courses, annotated with additional is_primary values. + * The courses, annotated with additional is_primary values */ - public function getAllCourseAlternates(\osid_course_Course $course) { - $data = NULL; + public function getAllCourseAlternates(\osid_course_Course $course) + { + $data = null; if ($course->hasRecordType($this->alternateType)) { $record = $course->getCourseRecord($this->alternateType); $data = []; @@ -136,43 +139,46 @@ public function getAllCourseAlternates(\osid_course_Course $course) { $alternates = $record->getAlternates(); while ($alternates->hasNext()) { $alternate = $alternates->getNextCourse(); - $alternate->is_primary = FALSE; + $alternate->is_primary = false; if ($alternate->hasRecordType($this->alternateType)) { $alternateRecord = $alternate->getCourseRecord($this->alternateType); if ($alternateRecord->isPrimary()) { - $alternate->is_primary = TRUE; + $alternate->is_primary = true; } } $data[] = $alternate; } } } + return $data; } /** * Answer a list of alternates for a course filtered to recent ones. * - * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses - * The helper used to filter to recent courses. - * @param \osid_course_Course $course - * The course to get alternates for. + * @param RecentCoursesInterface $recentCourses + * The helper used to filter to recent courses + * @param \osid_course_Course $course + * The course to get alternates for * * @return \osid_course_Course[] - * The courses, annotated with additional is_primary values. + * The courses, annotated with additional is_primary values */ - public function getRecentCourseAlternates(RecentCoursesInterface $recentCourses, $course) { - $data = NULL; + public function getRecentCourseAlternates(RecentCoursesInterface $recentCourses, $course) + { + $data = null; foreach ($recentCourses->getAlternatesForCourse($course) as $alternate) { - $alternate->is_primary = FALSE; + $alternate->is_primary = false; if ($alternate->hasRecordType($this->alternateType)) { $alternateRecord = $alternate->getCourseRecord($this->alternateType); if ($alternateRecord->isPrimary()) { - $alternate->is_primary = TRUE; + $alternate->is_primary = true; } } $data[] = $alternate; } + return $data; } @@ -180,14 +186,15 @@ public function getRecentCourseAlternates(RecentCoursesInterface $recentCourses, * Answer an array of course offering data suitable for templating. * * @param \osid_course_Course $course - * The course offerings are associated with. - * @param \osid_course_Term $term - * A reference term if one is being used for filtering offerings. + * The course offerings are associated with + * @param \osid_course_Term $term + * A reference term if one is being used for filtering offerings * * @return array - * An array of course offering data. + * An array of course offering data */ - public function getCourseOfferingsData(\osid_course_Course $course, \osid_course_Term|NULL $term = NULL) { + public function getCourseOfferingsData(\osid_course_Course $course, ?\osid_course_Term $term = null) + { $data = []; $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $offeringLookupSession->useFederatedCourseCatalogView(); @@ -210,18 +217,19 @@ public function getCourseOfferingsData(\osid_course_Course $course, \osid_course /** * Answer an array of data that includes the term and past/current/future. * - * @param \osid_course_Term $currentTerm - * The current term to compare against. - * @param \App\Helper\RecentCourses\RecentCoursesInterface $recentCourses - * The helper used to filter to recent courses. - * @param \osid_course_Course $course - * The course to get alternates for. + * @param \osid_course_Term $currentTerm + * The current term to compare against + * @param RecentCoursesInterface $recentCourses + * The helper used to filter to recent courses + * @param \osid_course_Course $course + * The course to get alternates for * * @return array - * An array of term data. Sub-keys are 'term' (the Term object) and - * 'type' (current/future/past). + * An array of term data. Sub-keys are 'term' (the Term object) and + * 'type' (current/future/past). */ - public function getRecentTermDataForCourse(\osid_course_Term $currentTerm, RecentCoursesInterface $recentCourses, \osid_course_Course $course) { + public function getRecentTermDataForCourse(\osid_course_Term $currentTerm, RecentCoursesInterface $recentCourses, \osid_course_Course $course) + { $now = $this->DateTime_getTimestamp(new \DateTime()); $currentTermId = $currentTerm->getId(); $currentEndTime = $this->DateTime_getTimestamp($currentTerm->getEndTime()); @@ -244,6 +252,7 @@ public function getRecentTermDataForCourse(\osid_course_Term $currentTerm, Recen ]; } } + return $data; } @@ -251,10 +260,10 @@ public function getRecentTermDataForCourse(\osid_course_Term $currentTerm, Recen * Answer a timestamp in GMT give a DateTime. * * @param \DateTime $dt - * The DateTime to get a timestamp for. + * The DateTime to get a timestamp for * * @return int - * The GMT timestamp. + * The GMT timestamp */ public function DateTime_getTimestamp(\DateTime $dt) { @@ -307,16 +316,17 @@ public function getTopics(\osid_course_TopicList $topicList) * Answer an array of course offering data suitable for templating. * * @param string $idString - * The course offering id string. + * The course offering id string * * @return array - * An array of data about the course offering. + * An array of data about the course offering */ public function getOfferingDataByIdString($idString) { $id = $this->osidIdMap->fromString($idString); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $lookupSession->useFederatedCourseCatalogView(); + return $this->getOfferingData($lookupSession->getCourseOffering($id)); } @@ -324,12 +334,13 @@ public function getOfferingDataByIdString($idString) * Answer an array of course offering data suitable for templating. * * @param \osid_course_CourseOffering $offering - * The course. + * The course * * @return array - * An array of data about the course offering. + * An array of data about the course offering */ - public function getOfferingData(\osid_course_CourseOffering $offering) { + public function getOfferingData(\osid_course_CourseOffering $offering) + { $id = $offering->getId(); // Templates can access basic getter methods on the offering itself. @@ -341,20 +352,20 @@ public function getOfferingData(\osid_course_CourseOffering $offering) { $this->osidTopicHelper->asTypedArray($offering->getTopics()) ); - $data['location'] = NULL; + $data['location'] = null; if ($offering->hasLocation()) { $data['location'] = $offering->getLocation(); } - $data['weekly_schedule'] = NULL; + $data['weekly_schedule'] = null; $weeklyScheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); if ($offering->hasRecordType($weeklyScheduleType)) { $data['weekly_schedule'] = $offering->getCourseOfferingRecord($weeklyScheduleType); } // Instructors - $data['instructors'] = NULL; - $data['instructor_names'] = NULL; + $data['instructors'] = null; + $data['instructor_names'] = null; $instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); if ($offering->hasRecordType($instructorsType)) { $instructorsRecord = $offering->getCourseOfferingRecord($instructorsType); @@ -376,8 +387,8 @@ public function getOfferingData(\osid_course_CourseOffering $offering) { } // Alternates. - $data['is_primary'] = TRUE; - $data['alternates'] = NULL; + $data['is_primary'] = true; + $data['alternates'] = null; if ($offering->hasRecordType($this->alternateType)) { $record = $offering->getCourseOfferingRecord($this->alternateType); $data['is_primary'] = $record->isPrimary(); @@ -385,8 +396,8 @@ public function getOfferingData(\osid_course_CourseOffering $offering) { } // Availability link. @todo - $data['availabilityLink'] = NULL; - //$this->getAvailabilityLink($this->offering); + $data['availabilityLink'] = null; + // $this->getAvailabilityLink($this->offering); $data['properties'] = []; $properties = $offering->getProperties(); @@ -410,13 +421,14 @@ public function getOfferingData(\osid_course_CourseOffering $offering) { * Answer an array of course offering alternates suitable for templating. * * @param \osid_course_CourseOffering $offering - * The course. + * The course * * @return array - * An array of alternates for the course offering. + * An array of alternates for the course offering */ - public function getOfferingAlternates(\osid_course_CourseOffering $offering) { - $data = NULL; + public function getOfferingAlternates(\osid_course_CourseOffering $offering) + { + $data = null; if ($offering->hasRecordType($this->alternateType)) { $record = $offering->getCourseOfferingRecord($this->alternateType); @@ -425,20 +437,18 @@ public function getOfferingAlternates(\osid_course_CourseOffering $offering) { $alternates = $record->getAlternates(); while ($alternates->hasNext()) { $alternate = $alternates->getNextCourseOffering(); - $alternate->is_primary = FALSE; + $alternate->is_primary = false; if ($alternate->hasRecordType($this->alternateType)) { $alternateRecord = $alternate->getCourseOfferingRecord($this->alternateType); if ($alternateRecord->isPrimary()) { - $alternate->is_primary = TRUE; + $alternate->is_primary = true; } } $data[] = $alternate; } - } } return $data; } - } diff --git a/src/Service/Osid/IdMap.php b/src/Service/Osid/IdMap.php index 2402e02d..813c5199 100755 --- a/src/Service/Osid/IdMap.php +++ b/src/Service/Osid/IdMap.php @@ -10,7 +10,6 @@ */ class IdMap extends AbstractOsidIdentifierMap { - /** * Get and OSID id object from a string. * diff --git a/src/Service/Osid/Runtime.php b/src/Service/Osid/Runtime.php index bd7f9fa0..f9023709 100644 --- a/src/Service/Osid/Runtime.php +++ b/src/Service/Osid/Runtime.php @@ -12,7 +12,6 @@ */ class Runtime { - private $runtimeManager; private $courseManager; private $configPath; @@ -22,11 +21,12 @@ class Runtime * Create a new OSID service instance. * * @param string $configPath - * The path to the Osid Configuration XML file. + * The path to the Osid Configuration XML file * @param string $courseImpl - * The OSID CourseManager implementation class to use. + * The OSID CourseManager implementation class to use */ - public function __construct(string $configPath, string $courseImpl = 'banner_course_CourseManager') { + public function __construct(string $configPath, string $courseImpl = 'banner_course_CourseManager') + { $this->setConfigPath($configPath); $this->courseImpl = $courseImpl; } @@ -78,11 +78,9 @@ public function getCourseManager() if (class_exists($this->courseImpl)) { $runtimeManager = $this->getRuntimeManager(); $this->courseManager = $runtimeManager->getManager(\osid_OSID::COURSE(), $this->courseImpl, '3.0.0'); + } else { + throw new \InvalidArgumentException('Unknown CourseManger implementation class: '.$this->courseImpl); } - else { - throw new \InvalidArgumentException("Unknown CourseManger implementation class: " . $this->courseImpl); - } - } return $this->courseManager; diff --git a/src/Service/Osid/TermHelper.php b/src/Service/Osid/TermHelper.php index 013fa697..ebe7a1d5 100755 --- a/src/Service/Osid/TermHelper.php +++ b/src/Service/Osid/TermHelper.php @@ -12,28 +12,28 @@ */ class TermHelper { - /** - * @var \App\Service\Osid\Runtime - * The Runtime service. + * @var Runtime + * The Runtime service */ private $runtime; /** - * @var \App\Service\Osid\IdMap - * The IdMap service. + * @var IdMap + * The IdMap service */ private $idMap; /** * Create a new instance of this service. * - * @param \App\Service\Osid\Runtime - * The Runtime service. - * @param \App\Service\Osid\IdMap - * The IdMap service. + * @param Runtime + * The Runtime service + * @param IdMap + * The IdMap service */ - public function __construct(Runtime $runtime, IdMap $idMap) { + public function __construct(Runtime $runtime, IdMap $idMap) + { $this->runtime = $runtime; $this->idMap = $idMap; } diff --git a/src/Service/Osid/TopicHelper.php b/src/Service/Osid/TopicHelper.php index dfdb245e..79ba7122 100755 --- a/src/Service/Osid/TopicHelper.php +++ b/src/Service/Osid/TopicHelper.php @@ -16,7 +16,7 @@ class TopicHelper * Answer an array containing the list items. * * @param osid_course_TopicList $topicList - * The topic list to convert. + * The topic list to convert * * @return array */ @@ -33,10 +33,10 @@ public function topicListAsArray(\osid_course_TopicList $topicList) /** * Return an array of topics matching a type. * - * @param array $topics - * An array of osid_course_TopicList objects. + * @param array $topics + * An array of osid_course_TopicList objects * @param osid_type_Type $type - * The type of topic to filter for. + * The type of topic to filter for * * @return array */ @@ -58,7 +58,6 @@ public function filterTopicsByType(array $topics, \osid_type_Type $type) * @param osid_course_TopicList $topicList * * @return array - * */ public function asTypedArray(\osid_course_TopicList $topicList) { diff --git a/src/Service/Osid/TypeHelper.php b/src/Service/Osid/TypeHelper.php index d7135922..b93ab44a 100755 --- a/src/Service/Osid/TypeHelper.php +++ b/src/Service/Osid/TypeHelper.php @@ -12,7 +12,6 @@ */ class TypeHelper { - /** * @var array */ @@ -22,9 +21,10 @@ class TypeHelper * Set up the service. * * @param array $defaultOfferingGenusTypesToSearch - * The default genus types to search. + * The default genus types to search */ - public function __construct(array $defaultOfferingGenusTypesToSearch) { + public function __construct(array $defaultOfferingGenusTypesToSearch) + { $this->defaultOfferingGenusTypesToSearch = $defaultOfferingGenusTypesToSearch; } @@ -42,6 +42,7 @@ public function getDefaultGenusTypes() foreach ($this->defaultOfferingGenusTypesToSearch as $typeString) { $types[] = new \phpkit_type_URNInetType($typeString); } + return $types; } } diff --git a/src/Twig/BookmarksExtension.php b/src/Twig/BookmarksExtension.php index 591df6ee..09e01202 100644 --- a/src/Twig/BookmarksExtension.php +++ b/src/Twig/BookmarksExtension.php @@ -1,6 +1,7 @@ format('U') - $start->format('U'))/60/60/24/7); + return ceil(abs($end->format('U') - $start->format('U')) / 60 / 60 / 24 / 7); } } diff --git a/src/Twig/OsidIdExtension.php b/src/Twig/OsidIdExtension.php index 5c5da835..a8cb5c97 100644 --- a/src/Twig/OsidIdExtension.php +++ b/src/Twig/OsidIdExtension.php @@ -1,6 +1,7 @@ idMap = $idMap; } @@ -56,19 +57,21 @@ public function osidIdInArray(\osid_id_Id $id, iterable $ids): bool { foreach ($ids as $comparison) { if ($id->isEqual($comparison)) { - return TRUE; + return true; } } - return FALSE; + + return false; } public function osidTypeInArray(\osid_type_Type $type, iterable $types): bool { foreach ($types as $comparison) { if ($type->isEqual($comparison)) { - return TRUE; + return true; } } - return FALSE; + + return false; } } diff --git a/src/Twig/TimeHelper.php b/src/Twig/TimeHelper.php index 72b389fa..bb1b0872 100755 --- a/src/Twig/TimeHelper.php +++ b/src/Twig/TimeHelper.php @@ -16,7 +16,6 @@ */ class TimeHelper extends AbstractExtension { - public function getFilters(): array { return [ @@ -35,9 +34,10 @@ public function getFunctions(): array * Answer a 24-hour time string from an integer number of seconds. * * @param int $seconds - * Seconds since midnight. + * Seconds since midnight + * * @return string - * A string in am/pm format. + * A string in am/pm format */ public function secondsToTime($seconds) { From c6b0d9abf9a2e39e0d905dbf4c0e168c9cbdeea7 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 29 Oct 2024 12:30:22 -0400 Subject: [PATCH 083/173] #47: Update to short constructor syntax and remove unneeded verbosity. --- config/services.yaml | 13 ----- src/Controller/Catalogs.php | 35 ++---------- src/Controller/Courses.php | 44 +++------------ src/Controller/Offerings.php | 54 +++---------------- src/Controller/Redirect.php | 6 --- src/Controller/Resources.php | 35 ++---------- src/Controller/Terms.php | 35 ++---------- src/Controller/Topics.php | 35 ++---------- src/Helper/RecentCourses/All.php | 6 ++- src/Helper/RecentCourses/Instructor.php | 11 ++-- .../RecentCourses/RecentCoursesAbstract.php | 10 ++-- src/Paginator/CourseOfferingSearchAdaptor.php | 11 ++-- src/Security/SamlUser.php | 7 ++- .../Osid/AbstractOsidIdentifierMap.php | 11 ++-- src/Service/Osid/DataLoader.php | 44 +++------------ src/Service/Osid/Runtime.php | 6 ++- src/Service/Osid/TermHelper.php | 28 ++-------- src/Service/Osid/TypeHelper.php | 11 ++-- src/Twig/OsidIdExtension.php | 18 ++----- 19 files changed, 77 insertions(+), 343 deletions(-) diff --git a/config/services.yaml b/config/services.yaml index 2a1f7096..1cec247e 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -60,16 +60,3 @@ services: App\Paginator\OfferingSearchSubscriber: tags: - { name: 'kernel.event_subscriber' } - - - # Service aliases. - osid.runtime: - class: App\Service\Osid\Runtime - osid.id_map: - class: App\Service\Osid\IdMap - osid.type_map: - class: App\Service\Osid\TypeMap - osid.term_helper: - class: App\Service\Osid\TermHelper - osid.topic_helper: - class: App\Service\Osid\TopicHelper diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index 587ccfd8..2569d66d 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -26,36 +26,11 @@ */ class Catalogs extends AbstractController { - /** - * @var Runtime - */ - private $osidRuntime; - - /** - * @var IdMap - */ - private $osidIdMap; - - /** - * @var TermHelper - */ - private $osidTermHelper; - - /** - * Construct a new Catalogs controller. - * - * @param Runtime $osidRuntime - * The osid.runtime service. - * @param IdMap $osidIdMap - * The osid.id_map service. - * @param TermHelper $osidTermHelper - * The osid.term_helper service. - */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper) - { - $this->osidRuntime = $osidRuntime; - $this->osidIdMap = $osidIdMap; - $this->osidTermHelper = $osidTermHelper; + public function __construct( + private Runtime $osidRuntime, + private IdMap $osidIdMap, + private TermHelper $osidTermHelper, + ) { } #[Route('/catalogs/list', name: 'list_catalogs')] diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 0c08f11f..75b88fc8 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -26,44 +26,12 @@ */ class Courses extends AbstractController { - /** - * @var Runtime - */ - private $osidRuntime; - - /** - * @var IdMap - */ - private $osidIdMap; - - /** - * @var TermHelper - */ - private $osidTermHelper; - - /** - * @var DataLoader - */ - private $osidDataLoader; - - /** - * Construct a new Catalogs controller. - * - * @param Runtime $osidRuntime - * The osid.runtime service. - * @param IdMap $osidIdMap - * The osid.id_map service. - * @param TermHelper $osidTermHelper - * The osid.term_helper service. - * @param DataLoader $osidDataLoader - * The osid.topic_helper service. - */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader) - { - $this->osidRuntime = $osidRuntime; - $this->osidIdMap = $osidIdMap; - $this->osidTermHelper = $osidTermHelper; - $this->osidDataLoader = $osidDataLoader; + public function __construct( + private Runtime $osidRuntime, + private IdMap $osidIdMap, + private TermHelper $osidTermHelper, + private DataLoader $osidDataLoader, + ) { } #[Route('/courses/list/{catalog}', name: 'list_courses')] diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 383f0d73..63f9216b 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -27,53 +27,13 @@ */ class Offerings extends AbstractController { - /** - * @var Runtime - */ - private $osidRuntime; - - /** - * @var IdMap - */ - private $osidIdMap; - - /** - * @var TermHelper - */ - private $osidTermHelper; - - /** - * @var DataLoader - */ - private $osidDataLoader; - - /** - * @var TypeHelper - */ - private $osidTypeHelper; - - /** - * Construct a new Catalogs controller. - * - * @param Runtime $osidRuntime - * The osid.runtime service. - * @param IdMap $osidIdMap - * The osid.id_map service. - * @param TermHelper $osidTermHelper - * The osid.term_helper service. - * @param DataLoader $osidDataLoader - * The osid.topic_helper service. - * @param TypeHelper $osidTypeHelper - * The osid type helper service - */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, DataLoader $osidDataLoader, TypeHelper $osidTypeHelper) - { - $this->osidRuntime = $osidRuntime; - $this->osidIdMap = $osidIdMap; - $this->osidTermHelper = $osidTermHelper; - $this->osidDataLoader = $osidDataLoader; - $this->osidTypeHelper = $osidTypeHelper; - + public function __construct( + private Runtime $osidRuntime, + private IdMap $osidIdMap, + private TermHelper $osidTermHelper, + private DataLoader $osidDataLoader, + private TypeHelper $osidTypeHelper, + ) { $this->wildcardStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:wildcard'); $this->booleanStringMatchType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:search:boolean'); $this->instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); diff --git a/src/Controller/Redirect.php b/src/Controller/Redirect.php index b60802bc..97e8eb67 100644 --- a/src/Controller/Redirect.php +++ b/src/Controller/Redirect.php @@ -12,12 +12,6 @@ */ class Redirect extends AbstractController { - /** - * Construct a new Redirect controller. - * - * @param AssetMapperInterface $assetMapper - * The asset mapper service - */ public function __construct( private AssetMapperInterface $assetMapper, ) { diff --git a/src/Controller/Resources.php b/src/Controller/Resources.php index ebdf294c..06feec84 100755 --- a/src/Controller/Resources.php +++ b/src/Controller/Resources.php @@ -22,36 +22,11 @@ */ class Resources extends AbstractController { - /** - * @var Runtime - */ - private $osidRuntime; - - /** - * @var IdMap - */ - private $osidIdMap; - - /** - * @var DataLoader - */ - private $osidDataLoader; - - /** - * Construct a new Catalogs controller. - * - * @param Runtime $osidRuntime - * The osid.runtime service. - * @param IdMap $osidIdMap - * The osid.id_map service. - * @param DataLoader $osidDataLoader - * The osid.topic_helper service. - */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) - { - $this->osidRuntime = $osidRuntime; - $this->osidIdMap = $osidIdMap; - $this->osidDataLoader = $osidDataLoader; + public function __construct( + private Runtime $osidRuntime, + private IdMap $osidIdMap, + private DataLoader $osidDataLoader, + ) { $this->instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); } diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index 6d2b4ae9..64ffba5b 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -22,36 +22,11 @@ */ class Terms extends AbstractController { - /** - * @var Runtime - */ - private $osidRuntime; - - /** - * @var IdMap - */ - private $osidIdMap; - - /** - * @var DataLoader - */ - private $osidDataLoader; - - /** - * Construct a new Catalogs controller. - * - * @param Runtime $osidRuntime - * The osid.runtime service. - * @param IdMap $osidIdMap - * The osid.id_map service. - * @param DataLoader $osidDataLoader - * The data loader service - */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) - { - $this->osidRuntime = $osidRuntime; - $this->osidIdMap = $osidIdMap; - $this->osidDataLoader = $osidDataLoader; + public function __construct( + private Runtime $osidRuntime, + private IdMap $osidIdMap, + private DataLoader $osidDataLoader, + ) { } /** diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index 1fe5dbcb..52def0a7 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -22,36 +22,11 @@ */ class Topics extends AbstractController { - /** - * @var Runtime - */ - private $osidRuntime; - - /** - * @var IdMap - */ - private $osidIdMap; - - /** - * @var DataLoader - */ - private $osidDataLoader; - - /** - * Construct a new Catalogs controller. - * - * @param Runtime $osidRuntime - * The osid.runtime service. - * @param IdMap $osidIdMap - * The osid.id_map service. - * @param DataLoader $osidDataLoader - * The osid.topic_helper service. - */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, DataLoader $osidDataLoader) - { - $this->osidRuntime = $osidRuntime; - $this->osidIdMap = $osidIdMap; - $this->osidDataLoader = $osidDataLoader; + public function __construct( + private Runtime $osidRuntime, + private IdMap $osidIdMap, + private DataLoader $osidDataLoader, + ) { } /** diff --git a/src/Helper/RecentCourses/All.php b/src/Helper/RecentCourses/All.php index 5f3a04dd..2178319d 100755 --- a/src/Helper/RecentCourses/All.php +++ b/src/Helper/RecentCourses/All.php @@ -25,8 +25,10 @@ class All extends RecentCoursesAbstract * * @since 11/16/09 */ - public function __construct(IdMap $osidIdMap, \osid_course_CourseList $courses) - { + public function __construct( + IdMap $osidIdMap, + \osid_course_CourseList $courses, + ) { $this->termsCache = []; parent::__construct($osidIdMap, $courses); } diff --git a/src/Helper/RecentCourses/Instructor.php b/src/Helper/RecentCourses/Instructor.php index b187d743..cd6dc50a 100755 --- a/src/Helper/RecentCourses/Instructor.php +++ b/src/Helper/RecentCourses/Instructor.php @@ -16,24 +16,23 @@ */ class Instructor implements RecentCoursesInterface { - protected $osidIdMap; protected $groups = []; protected $recentInterval; protected $alternatesType; - protected $courseLookupSession; /** * Constructor. * * @return void */ - public function __construct(IdMap $osidIdMap, \osid_course_CourseOfferingSearchResults $offerings, \osid_course_CourseLookupSession $courseLookupSession) - { - $this->osidIdMap = $osidIdMap; + public function __construct( + protected IdMap $osidIdMap, + \osid_course_CourseOfferingSearchResults $offerings, + protected \osid_course_CourseLookupSession $courseLookupSession, + ) { $this->recentInterval = new \DateInterval('P4Y'); $this->alternatesType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->groupCourseOfferings($offerings); - $this->courseLookupSession = $courseLookupSession; } /** diff --git a/src/Helper/RecentCourses/RecentCoursesAbstract.php b/src/Helper/RecentCourses/RecentCoursesAbstract.php index ea62c5a7..06c4276b 100755 --- a/src/Helper/RecentCourses/RecentCoursesAbstract.php +++ b/src/Helper/RecentCourses/RecentCoursesAbstract.php @@ -16,26 +16,24 @@ */ abstract class RecentCoursesAbstract implements RecentCoursesInterface { - protected $osidIdMap; protected $groups; private $terms; protected $alternateType; protected $recentInterval; - private $courses; private $initialized = false; /** * Constructor. */ - public function __construct(IdMap $osidIdMap, \osid_course_CourseList $courses) - { - $this->osidIdMap = $osidIdMap; + public function __construct( + protected IdMap $osidIdMap, + private \osid_course_CourseList $courses, + ) { $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->groups = []; $this->terms = []; $this->recentInterval = new \DateInterval('P4Y'); - $this->courses = $courses; } /** diff --git a/src/Paginator/CourseOfferingSearchAdaptor.php b/src/Paginator/CourseOfferingSearchAdaptor.php index df394463..76c82712 100755 --- a/src/Paginator/CourseOfferingSearchAdaptor.php +++ b/src/Paginator/CourseOfferingSearchAdaptor.php @@ -17,6 +17,8 @@ */ class CourseOfferingSearchAdaptor { + private $itemsCallback; + /** * Constructor. * @@ -31,20 +33,17 @@ class CourseOfferingSearchAdaptor * An optional callback to apply to each item returned by getItems() */ public function __construct( - \osid_course_CourseOfferingSearchSession $session, - \osid_course_CourseOfferingQuery $query, + private \osid_course_CourseOfferingSearchSession $session, + private \osid_course_CourseOfferingQuery $query, ?\osid_course_CourseOfferingSearch $search = null, ?callable $itemsCallback = null, ) { - $this->session = $session; - $this->query = $query; - $this->itemsCallback = $itemsCallback; - if (null === $search) { $this->search = $this->session->getCourseOfferingSearch(); } else { $this->search = $search; } + $this->itemsCallback = $itemsCallback; } /** diff --git a/src/Security/SamlUser.php b/src/Security/SamlUser.php index 4294d59c..17786f59 100644 --- a/src/Security/SamlUser.php +++ b/src/Security/SamlUser.php @@ -6,14 +6,13 @@ class SamlUser implements SamlUserInterface { - private $id; private $email; private $givenName; private $surname; - public function __construct(string $id) - { - $this->id = $id; + public function __construct( + private string $id, + ) { } public function setSamlAttributes(array $attributes): void diff --git a/src/Service/Osid/AbstractOsidIdentifierMap.php b/src/Service/Osid/AbstractOsidIdentifierMap.php index 6bd01814..40c5abad 100755 --- a/src/Service/Osid/AbstractOsidIdentifierMap.php +++ b/src/Service/Osid/AbstractOsidIdentifierMap.php @@ -12,20 +12,15 @@ */ abstract class AbstractOsidIdentifierMap { - /** - * @var string - */ - private $idAuthorityToShorten; - /** * Set up the mapping service. * * @param string $idAuthorityToShorten * The Identifier authority to shorten */ - public function __construct(string $idAuthorityToShorten) - { - $this->idAuthorityToShorten = $idAuthorityToShorten; + public function __construct( + private string $idAuthorityToShorten, + ) { } /** diff --git a/src/Service/Osid/DataLoader.php b/src/Service/Osid/DataLoader.php index 95130720..1ce8bd96 100644 --- a/src/Service/Osid/DataLoader.php +++ b/src/Service/Osid/DataLoader.php @@ -12,44 +12,12 @@ */ class DataLoader { - /** - * @var Runtime - */ - private $osidRuntime; - - /** - * @var IdMap - */ - private $osidIdMap; - - /** - * @var TermHelper - */ - private $osidTermHelper; - - /** - * @var TopicHelper - */ - private $osidTopicHelper; - - /** - * Construct a new Catalogs controller. - * - * @param Runtime $osidRuntime - * The osid.runtime service. - * @param IdMap $osidIdMap - * The osid.id_map service. - * @param TermHelper $osidTermHelper - * The osid.term_helper service. - * @param TopicHelper $osidTopicHelper - * The osid.topic_helper service. - */ - public function __construct(Runtime $osidRuntime, IdMap $osidIdMap, TermHelper $osidTermHelper, TopicHelper $osidTopicHelper) - { - $this->osidRuntime = $osidRuntime; - $this->osidIdMap = $osidIdMap; - $this->osidTermHelper = $osidTermHelper; - $this->osidTopicHelper = $osidTopicHelper; + public function __construct( + private Runtime $osidRuntime, + private IdMap $osidIdMap, + private TermHelper $osidTermHelper, + private TopicHelper $osidTopicHelper, + ) { $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); $this->locationType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:location'); diff --git a/src/Service/Osid/Runtime.php b/src/Service/Osid/Runtime.php index f9023709..46badfbf 100644 --- a/src/Service/Osid/Runtime.php +++ b/src/Service/Osid/Runtime.php @@ -25,8 +25,10 @@ class Runtime * @param string $courseImpl * The OSID CourseManager implementation class to use */ - public function __construct(string $configPath, string $courseImpl = 'banner_course_CourseManager') - { + public function __construct( + string $configPath, + string $courseImpl = 'banner_course_CourseManager', + ) { $this->setConfigPath($configPath); $this->courseImpl = $courseImpl; } diff --git a/src/Service/Osid/TermHelper.php b/src/Service/Osid/TermHelper.php index ebe7a1d5..50af0115 100755 --- a/src/Service/Osid/TermHelper.php +++ b/src/Service/Osid/TermHelper.php @@ -12,30 +12,10 @@ */ class TermHelper { - /** - * @var Runtime - * The Runtime service - */ - private $runtime; - - /** - * @var IdMap - * The IdMap service - */ - private $idMap; - - /** - * Create a new instance of this service. - * - * @param Runtime - * The Runtime service - * @param IdMap - * The IdMap service - */ - public function __construct(Runtime $runtime, IdMap $idMap) - { - $this->runtime = $runtime; - $this->idMap = $idMap; + public function __construct( + private Runtime $runtime, + private IdMap $idMap, + ) { } /** diff --git a/src/Service/Osid/TypeHelper.php b/src/Service/Osid/TypeHelper.php index b93ab44a..9535d25f 100755 --- a/src/Service/Osid/TypeHelper.php +++ b/src/Service/Osid/TypeHelper.php @@ -12,20 +12,15 @@ */ class TypeHelper { - /** - * @var array - */ - private $defaultOfferingGenusTypesToSearch = []; - /** * Set up the service. * * @param array $defaultOfferingGenusTypesToSearch * The default genus types to search */ - public function __construct(array $defaultOfferingGenusTypesToSearch) - { - $this->defaultOfferingGenusTypesToSearch = $defaultOfferingGenusTypesToSearch; + public function __construct( + private array $defaultOfferingGenusTypesToSearch, + ) { } /** diff --git a/src/Twig/OsidIdExtension.php b/src/Twig/OsidIdExtension.php index a8cb5c97..9cb430a6 100644 --- a/src/Twig/OsidIdExtension.php +++ b/src/Twig/OsidIdExtension.php @@ -10,21 +10,9 @@ class OsidIdExtension extends AbstractExtension { - /** - * @var IdMap - * The IdMap service - */ - private $idMap; - - /** - * Create a new instance of this service. - * - * @param IdMap - * The IdMap service - */ - public function __construct(IdMap $idMap) - { - $this->idMap = $idMap; + public function __construct( + private IdMap $idMap, + ) { } public function getFunctions(): array From 09d25e2703a171275c208e719c13346b6061c8e9 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Tue, 29 Oct 2024 12:46:32 -0400 Subject: [PATCH 084/173] #47: Set list_catalogs as the root route. --- config/routes.yaml | 8 ++++++++ src/Controller/Catalogs.php | 1 + 2 files changed, 9 insertions(+) diff --git a/config/routes.yaml b/config/routes.yaml index 004377bf..b9c11ebc 100644 --- a/config/routes.yaml +++ b/config/routes.yaml @@ -6,3 +6,11 @@ controllers: nbgrp_saml: resource: "@NbgrpOneloginSamlBundle/Resources/config/routes.php" + +catalogs: + path: /catalogs + controller: Symfony\Bundle\FrameworkBundle\Controller\RedirectController + defaults: + route: 'list_catalogs' + # redirections are temporary by default (code 302) but you can make them permanent (code 301) + permanent: true diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index 2569d66d..4cf83d5a 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -33,6 +33,7 @@ public function __construct( ) { } + #[Route('/', name: 'home')] #[Route('/catalogs/list', name: 'list_catalogs')] public function listAction() { From c9b6b7b9b55dbe5fb4f9706277bf1139dbf18ceb Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 30 Oct 2024 11:17:44 -0400 Subject: [PATCH 085/173] #47: Osid Ids now be used instead of strings in routing/URLs/Controllers. Massaging via type-hinting/checks prevents the need for lots of conversion to/from string representations. --- config/services.yaml | 7 + src/Controller/Catalogs.php | 17 ++- src/Controller/Courses.php | 47 +++---- src/Controller/Offerings.php | 41 +++--- src/Controller/Resources.php | 24 ++-- src/Controller/Terms.php | 58 ++++---- src/Controller/Topics.php | 84 +++++------ src/Routing/OsidRouter.php | 131 ++++++++++++++++++ src/Routing/OsidValueResolver.php | 49 +++++++ src/Service/Osid/DataLoader.php | 23 ++- src/Twig/OsidIdExtension.php | 6 +- templates/catalogs/list.html.twig | 2 +- templates/catalogs/list.xml.twig | 2 +- templates/courses/list.html.twig | 2 +- templates/courses/view.html.twig | 16 +-- templates/offerings/search.html.twig | 18 +-- templates/offerings/view.html.twig | 24 ++-- templates/partials/course.xml.twig | 18 +-- templates/partials/offering.xml.twig | 20 +-- templates/partials/offering_list.xml.twig | 2 +- templates/partials/offerings.html.twig | 2 +- templates/partials/term.xml.twig | 2 +- templates/resources/view.html.twig | 2 +- .../schedules/bookmark_control.html.twig | 4 +- templates/terms/list.html.twig | 2 +- templates/terms/list.xml.twig | 2 +- templates/topics/list.html.twig | 8 +- templates/topics/list.xml.twig | 2 +- 28 files changed, 390 insertions(+), 225 deletions(-) create mode 100644 src/Routing/OsidRouter.php create mode 100644 src/Routing/OsidValueResolver.php diff --git a/config/services.yaml b/config/services.yaml index 1cec247e..90fb8076 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -25,6 +25,13 @@ services: # add more service definitions when explicit configuration is needed # please note that last definitions always *replace* previous ones + App\Routing\OsidRouter: + decorates: 'router' + App\Routing\OsidValueResolver: + tags: + - controller.argument_value_resolver: + name: osid_id + priority: 150 App\Service\Osid\Runtime: arguments: $configPath: '../configuration.plist' diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index 4cf83d5a..d0aab1e2 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -76,25 +76,24 @@ public function listxmlAction() } #[Route('/catalogs/view/{catalog}/{term}', name: 'view_catalog')] - public function viewAction(string $catalog, $term = null) + public function viewAction(\osid_id_Id $catalog, ?\osid_id_Id $term = null) { - $catalogId = $this->osidIdMap->fromString($catalog); if ($term) { try { // Verify that the term is valid in this catalog $termLookup = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookup->useFederatedCourseCatalogView(); - $termId = $termLookup->getTerm($this->osidIdMap->fromString($term))->getId(); + $termLookup->getTerm($term); } catch (\osid_NotFoundException $e) { } } - if (!isset($termId)) { - $termId = $this->osidTermHelper->getNextOrLatestTermId($catalogId); + if (!isset($term)) { + $term = $this->osidTermHelper->getNextOrLatestTermId($catalog); } return $this->redirectToRoute('search_offerings', [ - 'catalog' => $this->osidIdMap->toString($catalogId), - 'term' => $this->osidIdMap->toString($termId), + 'catalog' => $catalog, + 'term' => $term, ]); } @@ -102,12 +101,12 @@ public function viewAction(string $catalog, $term = null) * Print out an XML listing of a catalog. */ #[Route('/catalogs/viewxml/{catalog}', name: 'view_catalog_xml')] - public function viewxmlAction(string $catalog) + public function viewxmlAction(\osid_id_Id $catalog) { $data = []; $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); $data['title'] = 'View Catalog'; - $data['catalogs'] = [$lookupSession->getCourseCatalog($this->osidIdMap->fromString($catalog))]; + $data['catalogs'] = [$lookupSession->getCourseCatalog($catalog)]; $data['feedLink'] = $this->generateUrl( 'list_catalogs_xml', [ diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 75b88fc8..ebcbb900 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -35,16 +35,15 @@ public function __construct( } #[Route('/courses/list/{catalog}', name: 'list_courses')] - public function listAction($catalog = null) + public function listAction(?\osid_id_Id $catalog = null) { $data = [ 'courses' => [], ]; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalog); $data['title'] = 'Courses in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $data['title'] = 'Courses in All Catalogs'; @@ -64,9 +63,9 @@ public function listAction($catalog = null) } #[Route('/courses/view/{course}/{term}', name: 'view_course')] - public function view($course, $term = null) + public function view(\osid_id_Id $course, ?\osid_id_Id $term = null) { - $data = $this->osidDataLoader->getCourseDataByIdString($course, $term); + $data = $this->osidDataLoader->getCourseDataById($course, $term); $data['offerings'] = $this->osidDataLoader->getCourseOfferingsData($data['course'], $data['term']); // Set the selected Catalog Id. @@ -81,10 +80,10 @@ public function view($course, $term = null) } #[Route('/courses/viewxml/{course}/{term}', name: 'view_course_xml')] - public function viewxml($course, $term = null) + public function viewxml(\osid_id_Id $course, ?\osid_id_Id $term = null) { $data = []; - $courseData = $this->osidDataLoader->getCourseDataByIdString($course, $term); + $courseData = $this->osidDataLoader->getCourseDataById($course, $term); $courseData['offerings'] = $this->osidDataLoader->getCourseOfferingsData($courseData['course'], $courseData['term']); $courseData['alternates'] = $this->osidDataLoader->getAllCourseAlternates($courseData['course']); $data['courses'] = [$courseData]; @@ -99,7 +98,7 @@ public function viewxml($course, $term = null) } #[Route('/courses/searchxml/{catalog}', name: 'search_courses_xml')] - public function searchxmlAction(Request $request, $catalog) + public function searchxmlAction(Request $request, \osid_id_Id $catalog) { if (!$catalog) { header('HTTP/1.1 400 Bad Request'); @@ -107,8 +106,7 @@ public function searchxmlAction(Request $request, $catalog) exit; } try { - $catalogId = $this->osidIdMap->fromString($catalog); - $searchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); + $searchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalog); } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -169,7 +167,7 @@ public function searchxmlAction(Request $request, $catalog) } #[Route('/courses/topicxml/{catalog}', name: 'list_courses_by_topic')] - public function topicxmlAction(Request $request, $catalog) + public function topicxmlAction(Request $request, \osid_id_Id $catalog) { if (!$catalog) { header('HTTP/1.1 400 Bad Request'); @@ -177,10 +175,9 @@ public function topicxmlAction(Request $request, $catalog) exit; } try { - $catalogId = $this->osidIdMap->fromString($catalog); - $searchSession = $this->osidRuntime->getCourseManager()->getCourseSearchSessionForCatalog($catalogId); + $searchSession = $this->osidRuntime->getCourseManager()->getCourseSearchSessionForCatalog($catalog); - $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -283,7 +280,7 @@ public function topicxmlAction(Request $request, $catalog) } #[Route('/courses/byidxml/{catalog}', name: 'list_courses_by_ids')] - public function byidxmlAction(Request $request, $catalog) + public function byidxmlAction(Request $request, \osid_id_Id $catalog) { if (!$catalog) { header('HTTP/1.1 400 Bad Request'); @@ -291,9 +288,8 @@ public function byidxmlAction(Request $request, $catalog) exit; } try { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); - $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalog); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -370,7 +366,7 @@ public function byidxmlAction(Request $request, $catalog) * entries and merge them into a single result. */ #[Route('/courses/instructorxml/{instructor}/{catalog}', name: 'list_courses_by_instructor')] - public function instructorxmlAction(Request $request, $instructor, $catalog = null) + public function instructorxmlAction(Request $request, string $instructor, ?\osid_id_Id $catalog = null) { if (!$catalog) { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); @@ -380,8 +376,8 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = nu // Allow term current/past to be limited to a certain catalog while courses are fetched from many if ($request->get('term_catalog')) { - $catalogId = $this->osidIdMap->fromString($request->get('term_catalog')); - $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $catalog = $this->osidIdMap->fromString($request->get('term_catalog')); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); } // fall back to terms from any catalog. else { @@ -390,11 +386,10 @@ public function instructorxmlAction(Request $request, $instructor, $catalog = nu } } else { try { - $catalogId = $this->osidIdMap->fromString($catalog); - $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); - $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalog); + $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalog); - $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); } catch (\osid_InvalidArgumentException $e) { throw new \osid_InvalidArgumentException('The catalog id specified was not of the correct format.'); } catch (\osid_NotFoundException $e) { diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 63f9216b..8373f2d4 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -57,12 +57,11 @@ public function __construct( * Print out a list of all courses. */ #[Route('/offerings/list/{catalog}/{term}', name: 'list_offerings')] - public function listAction(string $catalog, string $term) + public function listAction(\osid_id_Id $catalog, string $term) { $data = []; - $catalogId = $this->osidIdMap->fromString($catalog); - $data['catalog_id'] = $catalogId; - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $data['catalog_id'] = $catalog; + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalog); $data['title'] = $lookupSession->getCourseCatalog()->getDisplayName(); $lookupSession->useFederatedCourseCatalogView(); @@ -104,7 +103,7 @@ public function listAction(string $catalog, string $term) * @since 10/21/09 */ #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings_xml')] - public function searchxml(Request $request, ?string $catalog = null, ?string $term = null) + public function searchxml(Request $request, ?\osid_id_Id $catalog = null, ?\osid_id_Id $term = null) { [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog, $term); // Actually run the query. @@ -149,11 +148,16 @@ public function searchxml(Request $request, ?string $catalog = null, ?string $te } #[Route('/offerings/search/{catalog}', name: 'search_offerings')] - public function search(Request $request, PaginatorInterface $paginator, ?string $catalog = null) + public function search(Request $request, PaginatorInterface $paginator, ?\osid_id_Id $catalog = null) { [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog); - $data['form_action'] = $this->generateUrl('search_offerings', ['catalog' => $catalog]); + $data['form_action'] = $this->generateUrl( + 'search_offerings', + [ + 'catalog' => $catalog, + ] + ); // Run the query if submitted. $data['paginator'] = null; @@ -181,9 +185,9 @@ public function search(Request $request, PaginatorInterface $paginator, ?string } #[Route('/offerings/view/{id}', name: 'view_offering')] - public function viewAction($id) + public function viewAction(\osid_id_Id $id) { - $data = $this->osidDataLoader->getOfferingDataByIdString($id); + $data = $this->osidDataLoader->getOfferingDataById($id); $data['alternates'] = $this->osidDataLoader->getOfferingAlternates($data['offering']); // Bookmarked Courses and Schedules @@ -205,10 +209,10 @@ public function viewAction($id) } #[Route('/offerings/viewxml/{id}', name: 'view_offering_xml')] - public function viewxmlAction($id) + public function viewxmlAction(\osid_id_Id $id) { $data = []; - $offeringData = $this->osidDataLoader->getOfferingDataByIdString($id); + $offeringData = $this->osidDataLoader->getOfferingDataById($id); $offering = $offeringData['offering']; $offeringData['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); $data['offerings'] = [$offeringData]; @@ -249,19 +253,18 @@ public function viewxmlAction($id) * The parts of the search preparation in an array: data, searchSession, * and query */ - protected function prepareSearch(Request $request, ?string $catalog = null) + protected function prepareSearch(Request $request, ?\osid_id_Id $catalog = null) { $term = $request->get('term'); $data = []; if ($catalog) { - $catalogId = $catalogId = $this->osidIdMap->fromString($catalog); - $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); - $topicSearchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalog); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalog); + $topicSearchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalog); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalog); $data['title'] = 'Search in '.$offeringSearchSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); diff --git a/src/Controller/Resources.php b/src/Controller/Resources.php index 06feec84..d5c6e03f 100755 --- a/src/Controller/Resources.php +++ b/src/Controller/Resources.php @@ -31,25 +31,22 @@ public function __construct( } #[Route('/resources/view/{resource}/{term}', name: 'view_resource')] - public function viewAction(Request $request, $resource, $term = null) + public function viewAction(Request $request, \osid_id_Id $resource, ?\osid_id_Id $term = null) { - $id = $this->osidIdMap->fromString($resource); $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $lookupSession->useFederatedBinView(); - $data['resource'] = $lookupSession->getResource($id); + $data['resource'] = $lookupSession->getResource($resource); $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringSearchSession->useFederatedCourseCatalogView(); $query = $offeringSearchSession->getCourseOfferingQuery(); if ($term) { - $termId = $this->osidIdMap->fromString($term); - - $query->matchTermId($termId, true); + $query->matchTermId($term, true); $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $data['term'] = $termLookupSession->getTerm($termId); + $data['term'] = $termLookupSession->getTerm($term); } else { $data['term'] = null; } @@ -60,16 +57,16 @@ public function viewAction(Request $request, $resource, $term = null) $data['offering_display_limit'] = 100; // Match the instructor Id - if (preg_match('/^resource\.person\./', $resource)) { + if (preg_match('/^resource\.person\./', $this->osidIdMap->toString($resource))) { if ($query->hasRecordType($this->instructorType)) { $queryRecord = $query->getCourseOfferingQueryRecord($this->instructorType); - $queryRecord->matchInstructorId($id, true); + $queryRecord->matchInstructorId($resource, true); $offerings = $offeringSearchSession->getCourseOfferingsByQuery($query); } } // Match a location id - elseif (preg_match('/^resource\.place\./', $resource)) { - $query->matchLocationId($id, true); + elseif (preg_match('/^resource\.place\./', $this->osidIdMap->toString($resource))) { + $query->matchLocationId($resource, true); $offerings = $offeringSearchSession->getCourseOfferingsByQuery($query); } if (isset($offerings)) { @@ -88,12 +85,11 @@ public function viewAction(Request $request, $resource, $term = null) * List all department topics as a text file with each line being Id|DisplayName. */ #[Route('/resources/listcampusestxt/{catalog}', name: 'list_campuses_txt')] - public function listcampusestxt(Request $request, $catalog = null) + public function listcampusestxt(Request $request, ?\osid_id_Id $catalog = null) { $data = []; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); + $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalog); $data['title'] = 'Resources in '.$lookupSession->getBin()->getDisplayName(); } else { $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index 64ffba5b..f883e7cd 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -33,14 +33,13 @@ public function __construct( * Print out a list of all terms. */ #[Route('/terms/list/{catalog}', name: 'list_terms')] - public function listAction($catalog = null) + public function listAction(?\osid_id_Id $catalog = null) { $data = []; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $data['title'] = 'Terms in All Catalogs'; @@ -61,14 +60,13 @@ public function listAction($catalog = null) * Print out an XML list of all terms. */ #[Route('/terms/listxml/{catalog}', name: 'list_terms_xml')] - public function listxmlAction($catalog = null) + public function listxmlAction(?\osid_id_Id $catalog = null) { $data = []; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $data['title'] = 'Terms in All Catalogs'; @@ -89,16 +87,13 @@ public function listxmlAction($catalog = null) } #[Route('/terms/view/{term}/{catalog}', name: 'view_term')] - public function viewAction($term, $catalog = null) + public function viewAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) { $data = []; - $id = $this->osidIdMap->fromString($term); - if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); $termLookupSession->useIsolatedCourseCatalogView(); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalog); $offeringLookupSession->useIsolatedCourseCatalogView(); } else { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); @@ -106,8 +101,8 @@ public function viewAction($term, $catalog = null) $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $offeringLookupSession->useFederatedCourseCatalogView(); } - $data['term'] = $termLookupSession->getTerm($id); - $offerings = $offeringLookupSession->getCourseOfferingsByTerm($id); + $data['term'] = $termLookupSession->getTerm($term); + $offerings = $offeringLookupSession->getCourseOfferingsByTerm($term); $data['offerings'] = []; while ($offerings->hasNext()) { $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); @@ -120,21 +115,19 @@ public function viewAction($term, $catalog = null) * View term details. */ #[Route('/terms/details/{term}/{catalog}', name: 'view_term_details')] - public function detailsAction($term, $catalog = null) + public function detailsAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) { - $id = $this->osidIdMap->fromString($term); $data = []; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); $termLookupSession->useIsolatedCourseCatalogView(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $data['catalog_id'] = null; } - $data['term'] = $termLookupSession->getTerm($id); + $data['term'] = $termLookupSession->getTerm($term); return $this->render('terms/details.html.twig', $data); } @@ -143,23 +136,28 @@ public function detailsAction($term, $catalog = null) * View a catalog details. */ #[Route('/terms/detailsxml/{term}/{catalog}', name: 'view_term_details_xml')] - public function detailsxmlAction($term, $catalog = null) + public function detailsxmlAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) { - $id = $this->osidIdMap->fromString($term); $data = []; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); $termLookupSession->useIsolatedCourseCatalogView(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $data['catalog_id'] = null; } - $data['term'] = $termLookupSession->getTerm($id); - - $data['feedLink'] = $this->generateUrl('view_term_details_xml', ['term' => $term, 'catalog' => $catalog], UrlGeneratorInterface::ABSOLUTE_URL); + $data['term'] = $termLookupSession->getTerm($term); + + $data['feedLink'] = $this->generateUrl( + 'view_term_details_xml', + [ + 'term' => $term, + 'catalog' => $catalog, + ], + UrlGeneratorInterface::ABSOLUTE_URL + ); $response = new Response($this->renderView('terms/details.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index 52def0a7..c232b744 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -33,7 +33,7 @@ public function __construct( * Print out a list of all topics. */ #[Route('/topics/list/{catalog}/{type}', name: 'list_topics')] - public function listAction(?string $catalog = null, ?string $type = null) + public function listAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) { $data = $this->getTopicData($catalog, $type); @@ -44,7 +44,7 @@ public function listAction(?string $catalog = null, ?string $type = null) * Print out an XML list of all catalogs. */ #[Route('/topics/listxml/{catalog}/{type}', name: 'list_topics_xml')] - public function listxmlAction(?string $catalog = null, ?string $type = null) + public function listxmlAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) { $data = $this->getTopicData($catalog, $type); $data['feedLink'] = $this->generateUrl( @@ -65,7 +65,7 @@ public function listxmlAction(?string $catalog = null, ?string $type = null) * Print out a list of all topics. */ #[Route('/topics/recent/{catalog}/{type}', name: 'list_recent_topics')] - public function recentAction(?string $catalog = null, ?string $type = null) + public function recentAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) { $data = $this->getRecentTopicData($catalog, $type); @@ -76,7 +76,7 @@ public function recentAction(?string $catalog = null, ?string $type = null) * Print out an XML list of all catalogs. */ #[Route('/topics/recentxml/{catalog}/{type}', name: 'list_recent_topics_xml')] - public function recentxmlAction(?string $catalog = null, ?string $type = null) + public function recentxmlAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) { $data = $this->getRecentTopicData($catalog, $type); $data['feedLink'] = $this->generateUrl( @@ -94,20 +94,18 @@ public function recentxmlAction(?string $catalog = null, ?string $type = null) } #[Route('/topics/view/{topic}/{catalog}/{term}', name: 'view_topic')] - public function view($topic, $catalog = null, $term = null) + public function view(\osid_id_Id $topic, ?\osid_id_Id $catalog = null, ?\osid_id_Id $term = null) { $data = []; - $id = $this->osidIdMap->fromString($topic); if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalog); $topicLookupSession->useIsolatedCourseCatalogView(); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); $termLookupSession->useIsolatedCourseCatalogView(); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalog); $offeringLookupSession->useIsolatedCourseCatalogView(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $topicLookupSession->useFederatedCourseCatalogView(); @@ -118,12 +116,11 @@ public function view($topic, $catalog = null, $term = null) $data['catalog_id'] = null; } - $data['topic'] = $topicLookupSession->getTopic($id); + $data['topic'] = $topicLookupSession->getTopic($topic); if ($term) { - $termId = $this->osidIdMap->fromString($term); - $offerings = $offeringLookupSession->getCourseOfferingsByTermByTopic($termId, $id); - $data['term'] = $termLookupSession->getTerm($termId); + $offerings = $offeringLookupSession->getCourseOfferingsByTermByTopic($term, $topic); + $data['term'] = $termLookupSession->getTerm($term); $data['offeringsForAllTermsUrl'] = $this->generateUrl( 'view_topic', [ @@ -133,7 +130,7 @@ public function view($topic, $catalog = null, $term = null) UrlGeneratorInterface::ABSOLUTE_URL ); } else { - $offerings = $offeringLookupSession->getCourseOfferingsByTopic($id); + $offerings = $offeringLookupSession->getCourseOfferingsByTopic($topic); $data['term'] = null; $data['offeringsForAllTermsUrl'] = null; } @@ -160,15 +157,14 @@ public function view($topic, $catalog = null, $term = null) * Print out an XML listing of a topic. */ #[Route('/topics/viewxml/{topic}/{catalog}', name: 'view_topic_xml')] - public function viewxmlAction(string $topic, ?string $catalog = null) + public function viewxmlAction(\osid_id_Id $topic, ?\osid_id_Id $catalog = null) { $data = []; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalog); $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $data['title'] = 'Topics in All Catalogs'; @@ -176,8 +172,7 @@ public function viewxmlAction(string $topic, ?string $catalog = null) } $lookupSession->useFederatedCourseCatalogView(); - $topicId = $this->osidIdMap->fromString($topic); - $topics = new \phpkit_course_ArrayTopicList([$lookupSession->getTopic($topicId)]); + $topics = new \phpkit_course_ArrayTopicList([$lookupSession->getTopic($topic)]); $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); $data['feedLink'] = $this->generateUrl( @@ -198,7 +193,7 @@ public function viewxmlAction(string $topic, ?string $catalog = null) * List all subject topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listsubjectstxt/{catalog}', name: 'list_subjects_txt')] - public function listsubjectstxtAction($catalog = null) + public function listsubjectstxtAction(?\osid_id_Id $catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'), @@ -210,7 +205,7 @@ public function listsubjectstxtAction($catalog = null) * List all requirement topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listrequirementstxt/{catalog}', name: 'list_requirements_txt')] - public function listrequirementstxtAction($catalog = null) + public function listrequirementstxtAction(?\osid_id_Id $catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'), @@ -222,7 +217,7 @@ public function listrequirementstxtAction($catalog = null) * List all level topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listlevelstxt/{catalog}', name: 'list_levels_txt')] - public function listlevelstxtAction($catalog = null) + public function listlevelstxtAction(?\osid_id_Id $catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'), @@ -234,7 +229,7 @@ public function listlevelstxtAction($catalog = null) * List all block topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listblockstxt/{catalog}', name: 'list_blocks_txt')] - public function listblockstxtAction($catalog = null) + public function listblockstxtAction(?\osid_id_Id $catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'), @@ -246,7 +241,7 @@ public function listblockstxtAction($catalog = null) * List all instruction-methods topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listinstructionmethodstxt/{catalog}', name: 'list_instructionmethods_txt')] - public function listinstructionmethodstxtAction($catalog = null) + public function listinstructionmethodstxtAction(?\osid_id_Id $catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'), @@ -258,7 +253,7 @@ public function listinstructionmethodstxtAction($catalog = null) * List all department topics as a text file with each line being Id|DisplayName. */ #[Route('/topics/listdepartmentstxt/{catalog}', name: 'list_departments_txt')] - public function listdepartmentstxtAction($catalog = null) + public function listdepartmentstxtAction(?\osid_id_Id $catalog = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'), @@ -277,14 +272,13 @@ public function listdepartmentstxtAction($catalog = null) * @return array * The topic data ready for templating */ - protected function getTopicData(?string $catalog = null, ?string $type = null) + protected function getTopicData(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) { $data = []; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalog); $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $data['title'] = 'Topics in All Catalogs'; @@ -293,9 +287,8 @@ protected function getTopicData(?string $catalog = null, ?string $type = null) $lookupSession->useFederatedCourseCatalogView(); if ($type) { - $genusType = $this->osidIdMap->typeFromString($type); - $topics = $lookupSession->getTopicsByGenusType($genusType); - $data['title'] .= ' of type '.$type; + $topics = $lookupSession->getTopicsByGenusType($type); + $data['title'] .= ' of type '.$this->osidIdMap->typeToString($type); } else { $topics = $lookupSession->getTopics(); } @@ -316,19 +309,18 @@ protected function getTopicData(?string $catalog = null, ?string $type = null) * @return array * The topic data ready for templating */ - protected function getRecentTopicData(?string $catalog = null, ?string $type = null) + protected function getRecentTopicData(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) { if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalog); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); $data['title'] = 'Topics in '.$searchSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = $catalog; } else { $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSession(); $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $data['title'] = 'Topics in All Catalogs'; - $data['catalog_id'] = $catalogId; + $data['catalog_id'] = null; } $searchSession->useFederatedCourseCatalogView(); $query = $searchSession->getTopicQuery(); @@ -347,9 +339,8 @@ protected function getRecentTopicData(?string $catalog = null, ?string $type = n } if ($type) { - $genusType = $this->osidIdMap->typeFromString($type); - $query->matchGenusType($genusType, true); - $data['title'] .= ' of type '.$type; + $query->matchGenusType($type, true); + $data['title'] .= ' of type '.$this->osidIdMap->typeToString($type); } $topics = $searchSession->getTopicsByQuery($query); @@ -385,13 +376,12 @@ protected function DateTime_getTimestamp(\DateTime $dt) * @return Response * The rendered response */ - private function renderTextList(\osid_type_Type $genusType, ?string $catalog = null) + private function renderTextList(\osid_type_Type $genusType, ?\osid_id_Id $catalog = null) { $data = []; if ($catalog) { - $catalogId = $this->osidIdMap->fromString($catalog); - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalog); } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); } diff --git a/src/Routing/OsidRouter.php b/src/Routing/OsidRouter.php new file mode 100644 index 00000000..376de682 --- /dev/null +++ b/src/Routing/OsidRouter.php @@ -0,0 +1,131 @@ +router->getRouteCollection(); + } + + /** + * Tries to match a URL path with a set of routes. + * + * If the matcher cannot find information, it must throw one of the exceptions documented + * below. + * + * @param string $pathinfo The path info to be parsed (raw format, i.e. not urldecoded) + * + * @throws NoConfigurationException If no routing configuration could be found + * @throws ResourceNotFoundException If the resource could not be found + * @throws MethodNotAllowedException If the resource was found but the request method is not allowed + */ + public function match(string $pathinfo): array + { + return $this->router->match($pathinfo); + } + + /** + * Sets the request context. + * + * @return void + */ + public function setContext(RequestContext $context) + { + return $this->router->setContext($context); + } + + /** + * Gets the request context. + */ + public function getContext(): RequestContext + { + return $this->router->getContext(); + } + + /** + * Warms up the cache. + * + * @param string $cacheDir Where warm-up artifacts should be stored + * @param string|null $buildDir Where read-only artifacts should go; null when called after compile-time + * + * @return string[] A list of classes or files to preload on PHP 7.4+ + */ + public function warmUp(string $cacheDir /* , string $buildDir = null */) + { + return $this->router->warmUp($cachDir); + } + + /** + * Generates a URL or path for a specific route based on the given parameters. + * + * Parameters that reference placeholders in the route pattern will substitute them in the + * path or host. Extra params are added as query string to the URL. + * + * When the passed reference type cannot be generated for the route because it requires a different + * host or scheme than the current one, the method will return a more comprehensive reference + * that includes the required params. For example, when you call this method with $referenceType = ABSOLUTE_PATH + * but the route requires the https scheme whereas the current scheme is http, it will instead return an + * ABSOLUTE_URL with the https scheme and the current host. This makes sure the generated URL matches + * the route in any case. + * + * If there is no route with the given name, the generator must throw the RouteNotFoundException. + * + * The special parameter _fragment will be used as the document fragment suffixed to the final URL. + * + * @throws RouteNotFoundException If the named route doesn't exist + * @throws MissingMandatoryParametersException When some parameters are missing that are mandatory for the route + * @throws InvalidParameterException When a parameter value for a placeholder is not correct because + * it does not match the requirement + */ + public function generate(string $name, array $parameters = [], int $referenceType = self::ABSOLUTE_PATH): string + { + return $this->router->generate($name, $this->stringifyOsidObjects($parameters), $referenceType); + } + + /** + * Convert osid_id_Id or osid_type_Type objects to string representations. + * + * @return array + * The parameters with objects mapped to strings + */ + private function stringifyOsidObjects(array $parameters) + { + foreach ($parameters as $key => $value) { + if (is_object($value)) { + if ($value instanceof \osid_id_Id) { + $parameters[$key] = $this->osidIdMap->toString($value); + } elseif ($value instanceof \osid_type_Type) { + $parameters[$key] = $this->osidIdMap->typeToString($value); + } elseif ($value instanceof \osid_OsidObject) { + $parameters[$key] = $this->osidIdMap->toString($value->getId()); + } + } + } + + return $parameters; + } +} diff --git a/src/Routing/OsidValueResolver.php b/src/Routing/OsidValueResolver.php new file mode 100644 index 00000000..a19daf3d --- /dev/null +++ b/src/Routing/OsidValueResolver.php @@ -0,0 +1,49 @@ +getType(); + if ($argumentType + && (in_array($argumentType, [\osid_id_Id::class, \osid_type_Type::class]) + || is_subclass_of($argumentType, \osid_id_Id::class, true) + || is_subclass_of($argumentType, \osid_type_Type::class, true) + ) + ) { + // get the value from the request, based on the argument name + $value = $request->attributes->get($argument->getName()); + if (!is_string($value)) { + return []; + } + // create and return the value object + if (\osid_id_Id::class == $argumentType || is_subclass_of($argumentType, \osid_id_Id::class, true)) { + return [$this->osidIdMap->fromString($value)]; + } + if (\osid_type_Type::class == $argumentType || is_subclass_of($argumentType, \osid_type_Type::class, true)) { + return [$this->osidIdMap->typeFromString($value)]; + } + } + + return []; + } +} diff --git a/src/Service/Osid/DataLoader.php b/src/Service/Osid/DataLoader.php index 1ce8bd96..ce2eb809 100644 --- a/src/Service/Osid/DataLoader.php +++ b/src/Service/Osid/DataLoader.php @@ -27,23 +27,21 @@ public function __construct( /** * Answer an array of course data suitable for templating. * - * @param string $idString - * The course id string - * @param string $termIdString - * A reference term's id string if one is being used for filtering - * offerings + * @param \osid_id_Id $id + * The course id + * @param \osid_id_Id $termId + * A reference term's id if one is being used for filtering + * offerings * * @return array * An array of data about the course */ - public function getCourseDataByIdString($idString, $termIdString = null) + public function getCourseDataById(\osid_id_Id $id, ?\osid_id_Id $termId = null) { - $id = $this->osidIdMap->fromString($idString); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $lookupSession->useFederatedCourseCatalogView(); - if ($termIdString) { - $termId = $this->osidIdMap->fromString($termIdString); + if ($termId) { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); $term = $termLookupSession->getTerm($termId); @@ -283,15 +281,14 @@ public function getTopics(\osid_course_TopicList $topicList) /** * Answer an array of course offering data suitable for templating. * - * @param string $idString - * The course offering id string + * @param \osid_id_Id $id + * The course offering id * * @return array * An array of data about the course offering */ - public function getOfferingDataByIdString($idString) + public function getOfferingDataById(\osid_id_Id $id) { - $id = $this->osidIdMap->fromString($idString); $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $lookupSession->useFederatedCourseCatalogView(); diff --git a/src/Twig/OsidIdExtension.php b/src/Twig/OsidIdExtension.php index 9cb430a6..4de88048 100644 --- a/src/Twig/OsidIdExtension.php +++ b/src/Twig/OsidIdExtension.php @@ -11,7 +11,7 @@ class OsidIdExtension extends AbstractExtension { public function __construct( - private IdMap $idMap, + private IdMap $osidIdMap, ) { } @@ -28,12 +28,12 @@ public function getFunctions(): array public function osidIdToString(\osid_id_Id $id): string { - return $this->idMap->toString($id); + return $this->osidIdMap->toString($id); } public function osidTypeToString(\osid_type_Type $type): string { - return $this->idMap->typeToString($type); + return $this->osidIdMap->typeToString($type); } public function osidIdsEqual(\osid_id_Id $id1, \osid_id_Id $id2): bool diff --git a/templates/catalogs/list.html.twig b/templates/catalogs/list.html.twig index a516f6d0..148ee85c 100755 --- a/templates/catalogs/list.html.twig +++ b/templates/catalogs/list.html.twig @@ -2,7 +2,7 @@ {% block body %} {% for catalog in catalogs %} -

{{ catalog.displayname }}

+

{{ catalog.displayname }}

{{ catalog.description | raw }}
{% endfor %} {% endblock %} diff --git a/templates/catalogs/list.xml.twig b/templates/catalogs/list.xml.twig index 41f21b2b..ddbc9212 100755 --- a/templates/catalogs/list.xml.twig +++ b/templates/catalogs/list.xml.twig @@ -3,7 +3,7 @@ {%~ for catalog in catalogs %} {{ catalog.displayname }} - {{ url('view_catalog', {catalog: osidIdToString(catalog.id)}) }} + {{ url('view_catalog', {catalog: catalog.id}) }} {{ osidIdToString(catalog.id) }} diff --git a/templates/courses/list.html.twig b/templates/courses/list.html.twig index 8eb0e98f..6f676ed5 100755 --- a/templates/courses/list.html.twig +++ b/templates/courses/list.html.twig @@ -2,7 +2,7 @@ {% block body %} {% for course in courses %} -

{{ course.displayname }} - {{ course.title }}

+

{{ course.displayname }} - {{ course.title }}

{{ course.description | raw }}
{% endfor %} {% endblock %} diff --git a/templates/courses/view.html.twig b/templates/courses/view.html.twig index d066d4a3..7b6800aa 100755 --- a/templates/courses/view.html.twig +++ b/templates/courses/view.html.twig @@ -12,28 +12,28 @@
Subject:
{% for topic in subjectTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Department:
{% for topic in departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Division:
{% for topic in divisionTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -41,7 +41,7 @@
Additional Details:
{% for topic in blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -50,7 +50,7 @@
Levels:
{% for topic in levelTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -59,7 +59,7 @@
Equivalent Courses:
{% for alternate in alternates %} - {{ alternate.displayname }} + {{ alternate.displayname }} {{ alternate.is_primary ? ' * ' }}
{% endfor %} @@ -73,7 +73,7 @@ { offerings: offerings, term: term, - offeringsForAllTermsUrl: url('view_course', {course: osidIdToString(course.id)}), + offeringsForAllTermsUrl: url('view_course', {course: course}), hideOfferingInstructors: FALSE, selectedOffering: NULL }, diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index e0d5f0b3..3bb6dc7f 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -215,13 +215,13 @@ {% for item in paginator %}
- {{ item.offering.displayname }}{{ item.is_primary ? " * " }} + {{ item.offering.displayname }}{{ item.is_primary ? " * " }} {% if item.alternates is not empty %}
Cross-Listed As: {% for alternate in item.alternates %}
- {{ alternate.displayname }} + {{ alternate.displayname }} {{ alternate.is_primary ? ' * ' }} {% endfor %} {% endif %} @@ -234,25 +234,25 @@
Course Modality:
{% for topic in item.instructionMethodTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %}
Term:
-
{{ item.offering.term.displayname }}
+
{{ item.offering.term.displayname }}
Department:
{% for topic in item.departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in item.requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -260,7 +260,7 @@
Additional Details:
{% for topic in item.blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -286,7 +286,7 @@
Instructors:
{% for instructor in item.instructors %} - {{ instructor.displayname }}{{ not loop.last ? ',' }} + {{ instructor.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -294,7 +294,7 @@ {% if item.location %}
Location:
- {{ item.location.displayname }} + {{ item.location.displayname }} {% if item.location.description %} {{ item.location.description }} {% endif %} diff --git a/templates/offerings/view.html.twig b/templates/offerings/view.html.twig index 42c5f534..c74305cb 100755 --- a/templates/offerings/view.html.twig +++ b/templates/offerings/view.html.twig @@ -11,12 +11,12 @@
Term:
-
{{ offering.term.displayname }}
+
{{ offering.term.displayname }}
{% if location %}
Location:
- {{ location.displayname }} + {{ location.displayname }} {% if location.description %} {{ location.description }} {% endif %} @@ -38,7 +38,7 @@
Course Modality:
{% for topic in instructionMethodTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -47,7 +47,7 @@
Instructors:
{% for instructor in instructors %} - {{ instructor.displayname }}{{ not loop.last ? ',' }} + {{ instructor.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -55,28 +55,28 @@
Subject:
{% for topic in subjectTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Department:
{% for topic in departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Division:
{% for topic in divisionTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -84,7 +84,7 @@
Additional Details:
{% for topic in blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -93,7 +93,7 @@
Levels:
{% for topic in levelTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -102,7 +102,7 @@
Cross-Listed As:
{% for alternate in alternates %} - {{ alternate.displayname }} + {{ alternate.displayname }} {{ alternate.is_primary ? ' * ' }}
{% endfor %} @@ -127,6 +127,6 @@

Course

{% endblock %} diff --git a/templates/partials/course.xml.twig b/templates/partials/course.xml.twig index 3677efd5..e66f9adb 100644 --- a/templates/partials/course.xml.twig +++ b/templates/partials/course.xml.twig @@ -1,7 +1,7 @@ {{ course.displayname }}{% if include_alternates_in_title and alternates is not empty %}{% for alternate in alternates %} / {{ alternate.displayname }}{% endfor %}{% endif %} - {{ course.title }} - {{ url('view_course', {'course': osidIdToString(course.id)}) }} - {{ url('view_course', {'course': osidIdToString(course.id)}) }} + {{ url('view_course', {'course': course}) }} + {{ url('view_course', {'course': course}) }} {{ osidIdToString(course.id) }} {{ course.displayname }} @@ -11,7 +11,7 @@ {% endif ~%} {%- if alternates is not empty %} {%- for alternate in alternates %} - + {{ osidIdToString(alternate.id) }} {{ alternate.displayname }} {{ alternate.title }} @@ -24,25 +24,25 @@ {% endfor ~%} {% endif %} {% for topic in subjectTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in departmentTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in divisionTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in requirementTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- if blockTopics is not empty %} {%- for topic in blockTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {% endif %} {%- if levelTopics is not empty %} {%- for topic in levelTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor ~%} {% endif %} {{ include('partials/offering_list.xml.twig', {offerings: offerings}, with_context = false) }} diff --git a/templates/partials/offering.xml.twig b/templates/partials/offering.xml.twig index 3a3be6c8..4134adeb 100644 --- a/templates/partials/offering.xml.twig +++ b/templates/partials/offering.xml.twig @@ -1,6 +1,6 @@ {{ offering.displayname }} - {{ url('view_offering', {'id': osidIdToString(offering.id)}) }} + {{ url('view_offering', {'id': offering}) }} {{ offering.title }} {{ osidIdToString(offering.id) }} @@ -9,41 +9,41 @@ {% endif ~%} {%- if alternates is not empty %} {%- for alternate in alternates %} - {{ alternate.displayname }} + {{ alternate.displayname }} {% endfor ~%} {% endif %} {{ offering.genustype.displayname }} {{ include('partials/term.xml.twig', {term: offering.term, key: 'term'}) }} {%- for topic in subjectTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in departmentTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in divisionTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in requirementTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- if blockTopics is not empty %} {%- for topic in blockTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {% endif %} {%- if levelTopics is not empty %} {%- for topic in levelTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor ~%} {% endif %} {%- if instructors is not null %} {%- for instructor in instructors %} - {{ instructor.displayname }} + {{ instructor.displayname }} {% endfor %} {% endif %} {%- if location %} - {{ location.displayname }} + {{ location.displayname }} {% elseif offering.locationinfo %} {{ offering.locationinfo }} {% endif %} diff --git a/templates/partials/offering_list.xml.twig b/templates/partials/offering_list.xml.twig index 3ae2e18d..b907d51b 100755 --- a/templates/partials/offering_list.xml.twig +++ b/templates/partials/offering_list.xml.twig @@ -10,7 +10,7 @@ {% set currentTerm = offering.term %} {% endif %} - + {{ offering.displayname }} {{ offering.title }} diff --git a/templates/partials/offerings.html.twig b/templates/partials/offerings.html.twig index 636c7490..555ab4ff 100755 --- a/templates/partials/offerings.html.twig +++ b/templates/partials/offerings.html.twig @@ -19,7 +19,7 @@ {% else %}
{% endif %} - {{item.offering.displayname}} + {{item.offering.displayname}} {{ item.offering.genustype.displayname }} {% if item.instructor_names %} ({{ item.instructor_names|join(', ') }}) diff --git a/templates/partials/term.xml.twig b/templates/partials/term.xml.twig index 5292b8d6..cb6de728 100644 --- a/templates/partials/term.xml.twig +++ b/templates/partials/term.xml.twig @@ -1 +1 @@ -{{ term.displayname }} +{{ term.displayname }} diff --git a/templates/resources/view.html.twig b/templates/resources/view.html.twig index 90d4da08..eb032ee4 100755 --- a/templates/resources/view.html.twig +++ b/templates/resources/view.html.twig @@ -9,7 +9,7 @@ { offerings: offerings, term: term, - offeringsForAllTermsUrl: url('view_resource', {resource: osidIdToString(resource.id)}), + offeringsForAllTermsUrl: url('view_resource', {resource: resource.id}), hideOfferingInstructors: FALSE, selectedOffering: NULL }, diff --git a/templates/schedules/bookmark_control.html.twig b/templates/schedules/bookmark_control.html.twig index 3ccf72be..241484d1 100755 --- a/templates/schedules/bookmark_control.html.twig +++ b/templates/schedules/bookmark_control.html.twig @@ -3,14 +3,14 @@

Bookmark this course

- -

{{ term.displayname }}

+

{{ term.displayname }}

{{ term.description }}
{% endfor %} diff --git a/templates/terms/list.xml.twig b/templates/terms/list.xml.twig index 00f8cc8e..381d8347 100755 --- a/templates/terms/list.xml.twig +++ b/templates/terms/list.xml.twig @@ -3,7 +3,7 @@ {%~ for term in terms %} {{ term.displayname }} - {{ url('view_term', {term: osidIdToString(term.id), catalog: catalog_id ? osidIdToString(catalog_id)}) }} + {{ url('view_term', {term: term, catalog: catalog_id}) }} {{ osidIdToString(term.id) }} {{ term.starttime | date('Y-m-d') }} diff --git a/templates/topics/list.html.twig b/templates/topics/list.html.twig index c3aeb80f..4977f5d1 100755 --- a/templates/topics/list.html.twig +++ b/templates/topics/list.html.twig @@ -6,7 +6,7 @@

Subjects:

{% endif %} @@ -15,7 +15,7 @@

Departments:

{% endif %} @@ -24,7 +24,7 @@

Divisions:

{% endif %} @@ -33,7 +33,7 @@

Requirements Fulfilled:

{% endif %} diff --git a/templates/topics/list.xml.twig b/templates/topics/list.xml.twig index 328eb8d6..56a19175 100755 --- a/templates/topics/list.xml.twig +++ b/templates/topics/list.xml.twig @@ -3,7 +3,7 @@ {%~ for topic in subjectTopics|merge(departmentTopics, divisionTopics, requirementTopics) %} {{ topic.displayname }} - {{ url('view_topic', {topic: osidIdToString(topic.id), catalog: catalog_id ? osidIdToString(catalog_id)}) }} + {{ url('view_topic', {topic: topic, catalog: catalog_id}) }} {{ osidIdToString(topic.id) }} {{ osidTypeToString(topic.genustype) }} From d35c17ab9a348370f084a83a6d78e48f37ba0f8b Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 30 Oct 2024 11:54:14 -0400 Subject: [PATCH 086/173] #47: Update additional controller type hinting missed in c9b6b7b9. --- src/Controller/Bookmarks.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Controller/Bookmarks.php b/src/Controller/Bookmarks.php index e5ba1d14..3f67b68c 100755 --- a/src/Controller/Bookmarks.php +++ b/src/Controller/Bookmarks.php @@ -3,7 +3,6 @@ namespace App\Controller; use App\Service\Bookmarks as BookmarksService; -use App\Service\Osid\IdMap; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -12,7 +11,6 @@ class Bookmarks extends AbstractController { public function __construct( private BookmarksService $bookmarks, - private IdMap $osidIdMap, ) { } @@ -20,7 +18,7 @@ public function __construct( * Bookmark a course. */ #[Route('/bookmarks/add/{course}', name: 'add_bookmark')] - public function add(string $course) + public function add(\osid_id_Id $course) { ob_start(); echo ''; @@ -29,7 +27,7 @@ public function add(string $course) if (!$course) { throw new \InvalidArgumentException('No Course Id specified.'); } - $this->bookmarks->add($this->osidIdMap->fromString($course)); + $this->bookmarks->add($course); echo ''; } catch (\Exception $e) { echo ''.$e->getMessage().''; @@ -47,7 +45,7 @@ public function add(string $course) * @since 7/29/10 */ #[Route('/bookmarks/remove/{course}', name: 'remove_bookmark')] - public function remove(string $course) + public function remove(\osid_id_Id $course) { ob_start(); echo ''; @@ -56,7 +54,7 @@ public function remove(string $course) if (!$course) { throw new \InvalidArgumentException('No Course Id specified.'); } - $this->bookmarks->remove($this->osidIdMap->fromString($course)); + $this->bookmarks->remove($course); echo ''; } catch (\Exception $e) { echo ''.$e->getMessage().''; From 82973396817b00e284b8a8454c1986bdf1a00140 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 30 Oct 2024 13:55:51 -0400 Subject: [PATCH 087/173] #47: Normalize osid id arguments to be $xxxId for clarity. --- src/Controller/Bookmarks.php | 16 +- src/Controller/Catalogs.php | 24 +-- src/Controller/Courses.php | 94 +++++------ src/Controller/Offerings.php | 85 +++++----- src/Controller/Resources.php | 28 ++-- src/Controller/Terms.php | 72 ++++----- src/Controller/Topics.php | 150 +++++++++--------- src/Twig/BookmarksExtension.php | 4 +- templates/catalogs/list.html.twig | 2 +- templates/catalogs/list.xml.twig | 2 +- templates/courses/list.html.twig | 2 +- templates/courses/view.html.twig | 18 +-- templates/offerings/search.html.twig | 22 +-- templates/offerings/search.xml.twig | 2 +- templates/offerings/view.html.twig | 26 +-- templates/partials/course.xml.twig | 18 +-- templates/partials/offering.xml.twig | 20 +-- templates/partials/offering_list.xml.twig | 2 +- templates/partials/offerings.html.twig | 2 +- templates/partials/term.xml.twig | 2 +- templates/resources/view.html.twig | 2 +- .../schedules/bookmark_control.html.twig | 10 +- templates/terms/list.html.twig | 2 +- templates/terms/list.xml.twig | 2 +- templates/topics/list.html.twig | 8 +- templates/topics/list.xml.twig | 2 +- templates/topics/view.html.twig | 2 +- 27 files changed, 310 insertions(+), 309 deletions(-) diff --git a/src/Controller/Bookmarks.php b/src/Controller/Bookmarks.php index 3f67b68c..7181c04f 100755 --- a/src/Controller/Bookmarks.php +++ b/src/Controller/Bookmarks.php @@ -17,17 +17,17 @@ public function __construct( /** * Bookmark a course. */ - #[Route('/bookmarks/add/{course}', name: 'add_bookmark')] - public function add(\osid_id_Id $course) + #[Route('/bookmarks/add/{courseId}', name: 'add_bookmark')] + public function add(\osid_id_Id $courseId) { ob_start(); echo ''; echo ''; try { - if (!$course) { + if (!$courseId) { throw new \InvalidArgumentException('No Course Id specified.'); } - $this->bookmarks->add($course); + $this->bookmarks->add($courseId); echo ''; } catch (\Exception $e) { echo ''.$e->getMessage().''; @@ -44,17 +44,17 @@ public function add(\osid_id_Id $course) * * @since 7/29/10 */ - #[Route('/bookmarks/remove/{course}', name: 'remove_bookmark')] - public function remove(\osid_id_Id $course) + #[Route('/bookmarks/remove/{courseId}', name: 'remove_bookmark')] + public function remove(\osid_id_Id $courseId) { ob_start(); echo ''; echo ''; try { - if (!$course) { + if (!$courseId) { throw new \InvalidArgumentException('No Course Id specified.'); } - $this->bookmarks->remove($course); + $this->bookmarks->remove($courseId); echo ''; } catch (\Exception $e) { echo ''.$e->getMessage().''; diff --git a/src/Controller/Catalogs.php b/src/Controller/Catalogs.php index d0aab1e2..7df80556 100755 --- a/src/Controller/Catalogs.php +++ b/src/Controller/Catalogs.php @@ -75,42 +75,42 @@ public function listxmlAction() return $response; } - #[Route('/catalogs/view/{catalog}/{term}', name: 'view_catalog')] - public function viewAction(\osid_id_Id $catalog, ?\osid_id_Id $term = null) + #[Route('/catalogs/view/{catalogId}/{termId}', name: 'view_catalog')] + public function viewAction(\osid_id_Id $catalogId, ?\osid_id_Id $termId = null) { - if ($term) { + if ($termId) { try { // Verify that the term is valid in this catalog $termLookup = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookup->useFederatedCourseCatalogView(); - $termLookup->getTerm($term); + $termLookup->getTerm($termId); } catch (\osid_NotFoundException $e) { } } - if (!isset($term)) { - $term = $this->osidTermHelper->getNextOrLatestTermId($catalog); + if (!isset($termId)) { + $termId = $this->osidTermHelper->getNextOrLatestTermId($catalogId); } return $this->redirectToRoute('search_offerings', [ - 'catalog' => $catalog, - 'term' => $term, + 'catalogId' => $catalogId, + 'termId' => $termId, ]); } /** * Print out an XML listing of a catalog. */ - #[Route('/catalogs/viewxml/{catalog}', name: 'view_catalog_xml')] - public function viewxmlAction(\osid_id_Id $catalog) + #[Route('/catalogs/viewxml/{catalogId}', name: 'view_catalog_xml')] + public function viewxmlAction(\osid_id_Id $catalogId) { $data = []; $lookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); $data['title'] = 'View Catalog'; - $data['catalogs'] = [$lookupSession->getCourseCatalog($catalog)]; + $data['catalogs'] = [$lookupSession->getCourseCatalog($catalogId)]; $data['feedLink'] = $this->generateUrl( 'list_catalogs_xml', [ - 'catalog' => $catalog, + 'catalogId' => $catalogId, ], UrlGeneratorInterface::ABSOLUTE_URL, ); diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index ebcbb900..86d1f2b5 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -34,20 +34,20 @@ public function __construct( ) { } - #[Route('/courses/list/{catalog}', name: 'list_courses')] - public function listAction(?\osid_id_Id $catalog = null) + #[Route('/courses/list/{catalogId}', name: 'list_courses')] + public function listAction(?\osid_id_Id $catalogId = null) { $data = [ 'courses' => [], ]; - if ($catalog) { - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalog); + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); $data['title'] = 'Courses in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $data['title'] = 'Courses in All Catalogs'; - $data['catalog_id'] = null; + $data['catalogId'] = null; } $lookupSession->useFederatedCourseCatalogView(); @@ -62,34 +62,34 @@ public function listAction(?\osid_id_Id $catalog = null) return $this->render('courses/list.html.twig', $data); } - #[Route('/courses/view/{course}/{term}', name: 'view_course')] - public function view(\osid_id_Id $course, ?\osid_id_Id $term = null) + #[Route('/courses/view/{courseId}/{termId}', name: 'view_course')] + public function view(\osid_id_Id $courseId, ?\osid_id_Id $termId = null) { - $data = $this->osidDataLoader->getCourseDataById($course, $term); + $data = $this->osidDataLoader->getCourseDataById($courseId, $termId); $data['offerings'] = $this->osidDataLoader->getCourseOfferingsData($data['course'], $data['term']); // Set the selected Catalog Id. - $data['catalog_id'] = null; + $data['catalogId'] = null; $catalogSession = $this->osidRuntime->getCourseManager()->getCourseCatalogSession(); $catalogIds = $catalogSession->getCatalogIdsByCourse($data['course']->getId()); if ($catalogIds->hasNext()) { - $data['catalog_id'] = $catalogIds->getNextId(); + $data['catalogId'] = $catalogIds->getNextId(); } return $this->render('courses/view.html.twig', $data); } - #[Route('/courses/viewxml/{course}/{term}', name: 'view_course_xml')] - public function viewxml(\osid_id_Id $course, ?\osid_id_Id $term = null) + #[Route('/courses/viewxml/{courseId}/{termId}', name: 'view_course_xml')] + public function viewxml(\osid_id_Id $courseId, ?\osid_id_Id $termId = null) { $data = []; - $courseData = $this->osidDataLoader->getCourseDataById($course, $term); + $courseData = $this->osidDataLoader->getCourseDataById($courseId, $termId); $courseData['offerings'] = $this->osidDataLoader->getCourseOfferingsData($courseData['course'], $courseData['term']); $courseData['alternates'] = $this->osidDataLoader->getAllCourseAlternates($courseData['course']); $data['courses'] = [$courseData]; $data['title'] = $data['courses'][0]['course']->getDisplayName(); - $data['feedLink'] = $this->generateUrl('view_course', ['course' => $course], UrlGeneratorInterface::ABSOLUTE_URL); + $data['feedLink'] = $this->generateUrl('view_course', ['courseId' => $courseId], UrlGeneratorInterface::ABSOLUTE_URL); $response = new Response($this->renderView('courses/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); @@ -97,16 +97,16 @@ public function viewxml(\osid_id_Id $course, ?\osid_id_Id $term = null) return $response; } - #[Route('/courses/searchxml/{catalog}', name: 'search_courses_xml')] - public function searchxmlAction(Request $request, \osid_id_Id $catalog) + #[Route('/courses/searchxml/{catalogId}', name: 'search_courses_xml')] + public function searchxmlAction(Request $request, \osid_id_Id $catalogId) { - if (!$catalog) { + if (!$catalogId) { header('HTTP/1.1 400 Bad Request'); echo 'A catalog must be specified.'; exit; } try { - $searchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalog); + $searchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -154,7 +154,7 @@ public function searchxmlAction(Request $request, \osid_id_Id $catalog) $data['feedLink'] = $this->generateUrl( 'search_courses_xml', [ - 'catalog' => $catalog, + 'catalogId' => $catalogId, 'keywords' => $request->get('keywords'), ], UrlGeneratorInterface::ABSOLUTE_URL @@ -166,18 +166,18 @@ public function searchxmlAction(Request $request, \osid_id_Id $catalog) return $response; } - #[Route('/courses/topicxml/{catalog}', name: 'list_courses_by_topic')] - public function topicxmlAction(Request $request, \osid_id_Id $catalog) + #[Route('/courses/topicxml/{catalogId}', name: 'list_courses_by_topic')] + public function topicxmlAction(Request $request, \osid_id_Id $catalogId) { - if (!$catalog) { + if (!$catalogId) { header('HTTP/1.1 400 Bad Request'); echo 'A catalog must be specified.'; exit; } try { - $searchSession = $this->osidRuntime->getCourseManager()->getCourseSearchSessionForCatalog($catalog); + $searchSession = $this->osidRuntime->getCourseManager()->getCourseSearchSessionForCatalog($catalogId); - $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -265,7 +265,7 @@ public function topicxmlAction(Request $request, \osid_id_Id $catalog) $data['feedLink'] = $this->generateUrl( 'list_courses_by_topic', [ - 'catalog' => $catalog, + 'catalogId' => $catalogId, 'topic' => $request->get('topic'), 'cutoff' => $request->get('cutoff'), 'location' => $request->get('location'), @@ -279,17 +279,17 @@ public function topicxmlAction(Request $request, \osid_id_Id $catalog) return $response; } - #[Route('/courses/byidxml/{catalog}', name: 'list_courses_by_ids')] - public function byidxmlAction(Request $request, \osid_id_Id $catalog) + #[Route('/courses/byidxml/{catalogId}', name: 'list_courses_by_ids')] + public function byidxmlAction(Request $request, \osid_id_Id $catalogId) { - if (!$catalog) { + if (!$catalogId) { header('HTTP/1.1 400 Bad Request'); echo 'A catalog must be specified.'; exit; } try { - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalog); - $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } catch (\osid_InvalidArgumentException $e) { header('HTTP/1.1 400 Bad Request'); echo 'The catalog id specified was not of the correct format.'; @@ -342,7 +342,7 @@ public function byidxmlAction(Request $request, \osid_id_Id $catalog) $data['feedLink'] = $this->generateUrl( 'list_courses_by_ids', [ - 'catalog' => $catalog, + 'catalogId' => $catalogId, 'id' => $request->get('id'), 'cutoff' => $request->get('cutoff'), ], @@ -365,10 +365,10 @@ public function byidxmlAction(Request $request, \osid_id_Id $catalog) * b. Take the section plus its cross-listed sections, get their course * entries and merge them into a single result. */ - #[Route('/courses/instructorxml/{instructor}/{catalog}', name: 'list_courses_by_instructor')] - public function instructorxmlAction(Request $request, string $instructor, ?\osid_id_Id $catalog = null) + #[Route('/courses/instructorxml/{instructorId}/{catalogId}', name: 'list_courses_by_instructor')] + public function instructorxmlAction(Request $request, string $instructorId, ?\osid_id_Id $catalogId = null) { - if (!$catalog) { + if (!$catalogId) { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringSearchSession->useFederatedCourseCatalogView(); $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); @@ -376,8 +376,8 @@ public function instructorxmlAction(Request $request, string $instructor, ?\osid // Allow term current/past to be limited to a certain catalog while courses are fetched from many if ($request->get('term_catalog')) { - $catalog = $this->osidIdMap->fromString($request->get('term_catalog')); - $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + $catalogId = $this->osidIdMap->fromString($request->get('term_catalog')); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } // fall back to terms from any catalog. else { @@ -386,10 +386,10 @@ public function instructorxmlAction(Request $request, string $instructor, ?\osid } } else { try { - $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalog); - $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalog); + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); + $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); - $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); } catch (\osid_InvalidArgumentException $e) { throw new \osid_InvalidArgumentException('The catalog id specified was not of the correct format.'); } catch (\osid_NotFoundException $e) { @@ -398,9 +398,9 @@ public function instructorxmlAction(Request $request, string $instructor, ?\osid } } - $instructor = trim($instructor); + $instructorId = trim($instructorId); - if (!$instructor || !strlen($instructor)) { + if (!$instructorId || !strlen($instructorId)) { // Make sure that this error response is cacheable. $this->setCacheControlHeaders(); $this->getResponse()->sendHeaders(); @@ -408,10 +408,10 @@ public function instructorxmlAction(Request $request, string $instructor, ?\osid throw new \InvalidArgumentException('An instructor must be specified.'); } - if (preg_match('/^resource\.person\./', $instructor)) { - $instructorId = $this->osidIdMap->fromString($instructor); + if (preg_match('/^resource\.person\./', $instructorId)) { + $instructorId = $this->osidIdMap->fromString($instructorId); } else { - $instructorId = $this->osidIdMap->fromString('resource.person.'.$instructor); + $instructorId = $this->osidIdMap->fromString('resource.person.'.$instructorId); } $resourceLookup = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); try { @@ -461,8 +461,8 @@ public function instructorxmlAction(Request $request, string $instructor, ?\osid $data['feedLink'] = $this->generateUrl( 'list_courses_by_instructor', [ - 'instructor' => $instructor, - 'catalog' => $catalog, + 'instructorId' => $instructorId, + 'catalogId' => $catalogId, 'term_catalog' => $request->get('term_catalog'), ], UrlGeneratorInterface::ABSOLUTE_URL diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 8373f2d4..c92f8ecc 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -56,20 +56,20 @@ public function __construct( /** * Print out a list of all courses. */ - #[Route('/offerings/list/{catalog}/{term}', name: 'list_offerings')] - public function listAction(\osid_id_Id $catalog, string $term) + #[Route('/offerings/list/{catalogId}/{termId}', name: 'list_offerings')] + public function listAction(\osid_id_Id $catalogId, string $termId) { $data = []; - $data['catalog_id'] = $catalog; - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalog); + $data['catalogId'] = $catalogId; + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); $data['title'] = $lookupSession->getCourseCatalog()->getDisplayName(); $lookupSession->useFederatedCourseCatalogView(); // Add our parameters to the search query - if ('CURRENT' == $term) { + if ('CURRENT' == $termId) { $termId = $this->osidTermHelper->getNextOrLatestTermId(); } else { - $termId = $this->osidIdMap->fromString($term); + $termId = $this->osidIdMap->fromString($termId); } $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); @@ -102,10 +102,10 @@ public function listAction(\osid_id_Id $catalog, string $term) * * @since 10/21/09 */ - #[Route('/offerings/searchxml/{catalog}/{term}', name: 'search_offerings_xml')] - public function searchxml(Request $request, ?\osid_id_Id $catalog = null, ?\osid_id_Id $term = null) + #[Route('/offerings/searchxml/{catalogId}/{termId}', name: 'search_offerings_xml')] + public function searchxml(Request $request, ?\osid_id_Id $catalogId = null, ?\osid_id_Id $termId = null) { - [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog, $term); + [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalogId, $termId); // Actually run the query. $offerings = $searchSession->getCourseOfferingsByQuery($query); $data['offerings'] = []; @@ -147,15 +147,15 @@ public function searchxml(Request $request, ?\osid_id_Id $catalog = null, ?\osid return $response; } - #[Route('/offerings/search/{catalog}', name: 'search_offerings')] - public function search(Request $request, PaginatorInterface $paginator, ?\osid_id_Id $catalog = null) + #[Route('/offerings/search/{catalogId}', name: 'search_offerings')] + public function search(Request $request, PaginatorInterface $paginator, ?\osid_id_Id $catalogId = null) { - [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalog); + [$data, $searchSession, $query, $termLookupSession] = $this->prepareSearch($request, $catalogId); $data['form_action'] = $this->generateUrl( 'search_offerings', [ - 'catalog' => $catalog, + 'catalogId' => $catalogId, ] ); @@ -184,10 +184,10 @@ public function search(Request $request, PaginatorInterface $paginator, ?\osid_i return $this->render('offerings/search.html.twig', $data); } - #[Route('/offerings/view/{id}', name: 'view_offering')] - public function viewAction(\osid_id_Id $id) + #[Route('/offerings/view/{offeringId}', name: 'view_offering')] + public function viewAction(\osid_id_Id $offeringId) { - $data = $this->osidDataLoader->getOfferingDataById($id); + $data = $this->osidDataLoader->getOfferingDataById($offeringId); $data['alternates'] = $this->osidDataLoader->getOfferingAlternates($data['offering']); // Bookmarked Courses and Schedules @@ -200,19 +200,19 @@ public function viewAction(\osid_id_Id $id) $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($data['offering']->getId()); if ($catalogIds->hasNext()) { $catalogId = $catalogIds->getNextId(); - $data['catalog_id'] = $catalogId; + $data['catalogId'] = $catalogId; } else { - $data['catalog_id'] = null; + $data['catalogId'] = null; } return $this->render('offerings/view.html.twig', $data); } - #[Route('/offerings/viewxml/{id}', name: 'view_offering_xml')] - public function viewxmlAction(\osid_id_Id $id) + #[Route('/offerings/viewxml/{offeringId}', name: 'view_offering_xml')] + public function viewxmlAction(\osid_id_Id $offeringId) { $data = []; - $offeringData = $this->osidDataLoader->getOfferingDataById($id); + $offeringData = $this->osidDataLoader->getOfferingDataById($offeringId); $offering = $offeringData['offering']; $offeringData['alternates'] = $this->osidDataLoader->getOfferingAlternates($offering); $data['offerings'] = [$offeringData]; @@ -222,13 +222,13 @@ public function viewxmlAction(\osid_id_Id $id) $catalogIds = $catalogSession->getCatalogIdsByCourseOffering($offering->getId()); if ($catalogIds->hasNext()) { $catalogId = $catalogIds->getNextId(); - $data['catalog_id'] = $catalogId; + $data['catalogId'] = $catalogId; } else { - $data['catalog_id'] = null; + $data['catalogId'] = null; } $data['title'] = $offering->getDisplayName(); - $data['feedLink'] = $this->generateUrl('view_offering', ['id' => $id], UrlGeneratorInterface::ABSOLUTE_URL); + $data['feedLink'] = $this->generateUrl('view_offering', ['offeringId' => $offeringId], UrlGeneratorInterface::ABSOLUTE_URL); $data['previousTerm'] = null; $data['term'] = $offering->getTerm(); @@ -246,25 +246,25 @@ public function viewxmlAction(\osid_id_Id $id) * * @param Request $request * The request that contains the search parameters - * @param string|null $catalog + * @param string|null $catalogId * The catalog to search in or NULL for all catalogs * * @return array * The parts of the search preparation in an array: data, searchSession, * and query */ - protected function prepareSearch(Request $request, ?\osid_id_Id $catalog = null) + protected function prepareSearch(Request $request, ?\osid_id_Id $catalogId = null) { - $term = $request->get('term'); + $termIdString = $request->get('term'); $data = []; - if ($catalog) { - $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalog); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalog); - $topicSearchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalog); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); - $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalog); + if ($catalogId) { + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSessionForCatalog($catalogId); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $topicSearchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); $data['title'] = 'Search in '.$offeringSearchSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); @@ -272,7 +272,7 @@ protected function prepareSearch(Request $request, ?\osid_id_Id $catalog = null) $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $resourceLookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $data['title'] = 'Search in All Catalogs'; - $data['catalog_id'] = null; + $data['catalogId'] = null; } $termLookupSession->useFederatedCourseCatalogView(); $offeringSearchSession->useFederatedCourseCatalogView(); @@ -282,9 +282,9 @@ protected function prepareSearch(Request $request, ?\osid_id_Id $catalog = null) *********************************************************/ // Term - if ('ANY' == $term) { + if ('ANY' == $termIdString) { // Don't set a term - } elseif (!$term || 'CURRENT' == $term) { + } elseif (!$termIdString || 'CURRENT' == $termIdString) { // When accessing the "current" term via xml, use the term we are in. // When displaying the search interface, use the next upcoming term. if ('searchxml' == $request->get('action')) { @@ -293,7 +293,7 @@ protected function prepareSearch(Request $request, ?\osid_id_Id $catalog = null) $termId = $this->osidTermHelper->getNextOrLatestTermId($offeringSearchSession->getCourseCatalogId()); } } else { - $termId = $this->osidIdMap->fromString($term); + $termId = $this->osidIdMap->fromString($termIdString); } if (isset($termId)) { $data['term'] = $termLookupSession->getTerm($termId); @@ -417,20 +417,21 @@ protected function prepareSearch(Request $request, ?\osid_id_Id $catalog = null) $query = $offeringSearchSession->getCourseOfferingQuery(); $search = $offeringSearchSession->getCourseOfferingSearch(); $data['searchParams'] = [ - 'catalog' => $catalog, - 'term' => $term, + 'catalogId' => $catalogId, + 'termId' => $termId, ]; $data['terms'] = []; $terms = $termLookupSession->getTerms(); + $data['selectedTermId'] = null; while ($terms->hasNext()) { $term = $terms->getNextTerm(); $data['terms'][] = $term; } // Add our parameters to the search query - if ($term) { - $data['searchParams']['term'] = $term; + if ($termIdString) { + $data['searchParams']['termId'] = $termId; if (isset($termId)) { $query->matchTermId($termId, true); diff --git a/src/Controller/Resources.php b/src/Controller/Resources.php index d5c6e03f..fe5f62e7 100755 --- a/src/Controller/Resources.php +++ b/src/Controller/Resources.php @@ -30,23 +30,23 @@ public function __construct( $this->instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); } - #[Route('/resources/view/{resource}/{term}', name: 'view_resource')] - public function viewAction(Request $request, \osid_id_Id $resource, ?\osid_id_Id $term = null) + #[Route('/resources/view/{resourceId}/{termId}', name: 'view_resource')] + public function viewAction(Request $request, \osid_id_Id $resourceId, ?\osid_id_Id $termId = null) { $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $lookupSession->useFederatedBinView(); - $data['resource'] = $lookupSession->getResource($resource); + $data['resource'] = $lookupSession->getResource($resourceId); $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); $offeringSearchSession->useFederatedCourseCatalogView(); $query = $offeringSearchSession->getCourseOfferingQuery(); - if ($term) { - $query->matchTermId($term, true); + if ($termId) { + $query->matchTermId($termId, true); $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $data['term'] = $termLookupSession->getTerm($term); + $data['term'] = $termLookupSession->getTerm($termId); } else { $data['term'] = null; } @@ -57,16 +57,16 @@ public function viewAction(Request $request, \osid_id_Id $resource, ?\osid_id_Id $data['offering_display_limit'] = 100; // Match the instructor Id - if (preg_match('/^resource\.person\./', $this->osidIdMap->toString($resource))) { + if (preg_match('/^resource\.person\./', $this->osidIdMap->toString($resourceId))) { if ($query->hasRecordType($this->instructorType)) { $queryRecord = $query->getCourseOfferingQueryRecord($this->instructorType); - $queryRecord->matchInstructorId($resource, true); + $queryRecord->matchInstructorId($resourceId, true); $offerings = $offeringSearchSession->getCourseOfferingsByQuery($query); } } // Match a location id - elseif (preg_match('/^resource\.place\./', $this->osidIdMap->toString($resource))) { - $query->matchLocationId($resource, true); + elseif (preg_match('/^resource\.place\./', $this->osidIdMap->toString($resourceId))) { + $query->matchLocationId($resourceId, true); $offerings = $offeringSearchSession->getCourseOfferingsByQuery($query); } if (isset($offerings)) { @@ -84,12 +84,12 @@ public function viewAction(Request $request, \osid_id_Id $resource, ?\osid_id_Id /** * List all department topics as a text file with each line being Id|DisplayName. */ - #[Route('/resources/listcampusestxt/{catalog}', name: 'list_campuses_txt')] - public function listcampusestxt(Request $request, ?\osid_id_Id $catalog = null) + #[Route('/resources/listcampusestxt/{catalogId}', name: 'list_campuses_txt')] + public function listcampusestxt(Request $request, ?\osid_id_Id $catalogId = null) { $data = []; - if ($catalog) { - $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalog); + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSessionForBin($catalogId); $data['title'] = 'Resources in '.$lookupSession->getBin()->getDisplayName(); } else { $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index f883e7cd..98a71c38 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -32,18 +32,18 @@ public function __construct( /** * Print out a list of all terms. */ - #[Route('/terms/list/{catalog}', name: 'list_terms')] - public function listAction(?\osid_id_Id $catalog = null) + #[Route('/terms/list/{catalogId}', name: 'list_terms')] + public function listAction(?\osid_id_Id $catalogId = null) { $data = []; - if ($catalog) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $data['title'] = 'Terms in All Catalogs'; - $data['catalog_id'] = null; + $data['catalogId'] = null; } $lookupSession->useFederatedCourseCatalogView(); @@ -59,18 +59,18 @@ public function listAction(?\osid_id_Id $catalog = null) /** * Print out an XML list of all terms. */ - #[Route('/terms/listxml/{catalog}', name: 'list_terms_xml')] - public function listxmlAction(?\osid_id_Id $catalog = null) + #[Route('/terms/listxml/{catalogId}', name: 'list_terms_xml')] + public function listxmlAction(?\osid_id_Id $catalogId = null) { $data = []; - if ($catalog) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $data['title'] = 'Terms in All Catalogs'; - $data['catalog_id'] = null; + $data['catalogId'] = null; } $lookupSession->useFederatedCourseCatalogView(); @@ -79,21 +79,21 @@ public function listxmlAction(?\osid_id_Id $catalog = null) while ($terms->hasNext()) { $data['terms'][] = $terms->getNextTerm(); } - $data['feedLink'] = $this->generateUrl('list_terms_xml', ['catalog' => $catalog], UrlGeneratorInterface::ABSOLUTE_URL); + $data['feedLink'] = $this->generateUrl('list_terms_xml', ['catalogId' => $catalogId], UrlGeneratorInterface::ABSOLUTE_URL); $response = new Response($this->renderView('terms/list.xml.twig', $data)); $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); return $response; } - #[Route('/terms/view/{term}/{catalog}', name: 'view_term')] - public function viewAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) + #[Route('/terms/view/{termId}/{catalogId}', name: 'view_term')] + public function viewAction(\osid_id_Id $termId, ?\osid_id_Id $catalogId = null) { $data = []; - if ($catalog) { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + if ($catalogId) { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $termLookupSession->useIsolatedCourseCatalogView(); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalog); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); $offeringLookupSession->useIsolatedCourseCatalogView(); } else { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); @@ -101,8 +101,8 @@ public function viewAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $offeringLookupSession->useFederatedCourseCatalogView(); } - $data['term'] = $termLookupSession->getTerm($term); - $offerings = $offeringLookupSession->getCourseOfferingsByTerm($term); + $data['term'] = $termLookupSession->getTerm($termId); + $offerings = $offeringLookupSession->getCourseOfferingsByTerm($termId); $data['offerings'] = []; while ($offerings->hasNext()) { $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); @@ -114,20 +114,20 @@ public function viewAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) /** * View term details. */ - #[Route('/terms/details/{term}/{catalog}', name: 'view_term_details')] - public function detailsAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) + #[Route('/terms/details/{termId}/{catalogId}', name: 'view_term_details')] + public function detailsAction(\osid_id_Id $termId, ?\osid_id_Id $catalogId = null) { $data = []; - if ($catalog) { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + if ($catalogId) { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $termLookupSession->useIsolatedCourseCatalogView(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $data['catalog_id'] = null; + $data['catalogId'] = null; } - $data['term'] = $termLookupSession->getTerm($term); + $data['term'] = $termLookupSession->getTerm($termId); return $this->render('terms/details.html.twig', $data); } @@ -135,26 +135,26 @@ public function detailsAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) /** * View a catalog details. */ - #[Route('/terms/detailsxml/{term}/{catalog}', name: 'view_term_details_xml')] - public function detailsxmlAction(\osid_id_Id $term, ?\osid_id_Id $catalog = null) + #[Route('/terms/detailsxml/{termId}/{catalogId}', name: 'view_term_details_xml')] + public function detailsxmlAction(\osid_id_Id $termId, ?\osid_id_Id $catalogId = null) { $data = []; - if ($catalog) { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + if ($catalogId) { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $termLookupSession->useIsolatedCourseCatalogView(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $termLookupSession->useFederatedCourseCatalogView(); - $data['catalog_id'] = null; + $data['catalogId'] = null; } - $data['term'] = $termLookupSession->getTerm($term); + $data['term'] = $termLookupSession->getTerm($termId); $data['feedLink'] = $this->generateUrl( 'view_term_details_xml', [ - 'term' => $term, - 'catalog' => $catalog, + 'termId' => $termId, + 'catalogId' => $catalogId, ], UrlGeneratorInterface::ABSOLUTE_URL ); diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index c232b744..5a087f70 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -32,10 +32,10 @@ public function __construct( /** * Print out a list of all topics. */ - #[Route('/topics/list/{catalog}/{type}', name: 'list_topics')] - public function listAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) + #[Route('/topics/list/{catalogId}/{type}', name: 'list_topics')] + public function listAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - $data = $this->getTopicData($catalog, $type); + $data = $this->getTopicData($catalogId, $type); return $this->render('topics/list.html.twig', $data); } @@ -43,14 +43,14 @@ public function listAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type /** * Print out an XML list of all catalogs. */ - #[Route('/topics/listxml/{catalog}/{type}', name: 'list_topics_xml')] - public function listxmlAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) + #[Route('/topics/listxml/{catalogId}/{type}', name: 'list_topics_xml')] + public function listxmlAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - $data = $this->getTopicData($catalog, $type); + $data = $this->getTopicData($catalogId, $type); $data['feedLink'] = $this->generateUrl( 'list_topics_xml', [ - 'catalog' => $catalog, + 'catalogId' => $catalogId, 'type' => $type, ], UrlGeneratorInterface::ABSOLUTE_URL, @@ -64,10 +64,10 @@ public function listxmlAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $ty /** * Print out a list of all topics. */ - #[Route('/topics/recent/{catalog}/{type}', name: 'list_recent_topics')] - public function recentAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) + #[Route('/topics/recent/{catalogId}/{type}', name: 'list_recent_topics')] + public function recentAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - $data = $this->getRecentTopicData($catalog, $type); + $data = $this->getRecentTopicData($catalogId, $type); return $this->render('topics/list.html.twig', $data); } @@ -75,14 +75,14 @@ public function recentAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $typ /** * Print out an XML list of all catalogs. */ - #[Route('/topics/recentxml/{catalog}/{type}', name: 'list_recent_topics_xml')] - public function recentxmlAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) + #[Route('/topics/recentxml/{catalogId}/{type}', name: 'list_recent_topics_xml')] + public function recentxmlAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - $data = $this->getRecentTopicData($catalog, $type); + $data = $this->getRecentTopicData($catalogId, $type); $data['feedLink'] = $this->generateUrl( 'list_recent_topics_xml', [ - 'catalog' => $catalog, + 'catalogId' => $catalogId, 'type' => $type, ], UrlGeneratorInterface::ABSOLUTE_URL, @@ -93,19 +93,19 @@ public function recentxmlAction(?\osid_id_Id $catalog = null, ?\osid_type_Type $ return $response; } - #[Route('/topics/view/{topic}/{catalog}/{term}', name: 'view_topic')] - public function view(\osid_id_Id $topic, ?\osid_id_Id $catalog = null, ?\osid_id_Id $term = null) + #[Route('/topics/view/{topicId}/{catalogId}/{termId}', name: 'view_topic')] + public function view(\osid_id_Id $topicId, ?\osid_id_Id $catalogId = null, ?\osid_id_Id $termId = null) { $data = []; - if ($catalog) { - $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalog); + if ($catalogId) { + $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); $topicLookupSession->useIsolatedCourseCatalogView(); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $termLookupSession->useIsolatedCourseCatalogView(); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalog); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); $offeringLookupSession->useIsolatedCourseCatalogView(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $topicLookupSession->useFederatedCourseCatalogView(); @@ -113,24 +113,24 @@ public function view(\osid_id_Id $topic, ?\osid_id_Id $catalog = null, ?\osid_id $termLookupSession->useFederatedCourseCatalogView(); $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); $offeringLookupSession->useFederatedCourseCatalogView(); - $data['catalog_id'] = null; + $data['catalogId'] = null; } - $data['topic'] = $topicLookupSession->getTopic($topic); + $data['topic'] = $topicLookupSession->getTopic($topicId); - if ($term) { - $offerings = $offeringLookupSession->getCourseOfferingsByTermByTopic($term, $topic); - $data['term'] = $termLookupSession->getTerm($term); + if ($termId) { + $offerings = $offeringLookupSession->getCourseOfferingsByTermByTopic($termId, $topicId); + $data['term'] = $termLookupSession->getTerm($termId); $data['offeringsForAllTermsUrl'] = $this->generateUrl( 'view_topic', [ - 'topic' => $topic, - 'catalog' => $catalog, + 'topicId' => $topicId, + 'catalogId' => $catalogId, ], UrlGeneratorInterface::ABSOLUTE_URL ); } else { - $offerings = $offeringLookupSession->getCourseOfferingsByTopic($topic); + $offerings = $offeringLookupSession->getCourseOfferingsByTopic($topicId); $data['term'] = null; $data['offeringsForAllTermsUrl'] = null; } @@ -156,30 +156,30 @@ public function view(\osid_id_Id $topic, ?\osid_id_Id $catalog = null, ?\osid_id /** * Print out an XML listing of a topic. */ - #[Route('/topics/viewxml/{topic}/{catalog}', name: 'view_topic_xml')] - public function viewxmlAction(\osid_id_Id $topic, ?\osid_id_Id $catalog = null) + #[Route('/topics/viewxml/{topicId}/{catalogId}', name: 'view_topic_xml')] + public function viewxmlAction(\osid_id_Id $topicId, ?\osid_id_Id $catalogId = null) { $data = []; - if ($catalog) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalog); + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $data['title'] = 'Topics in All Catalogs'; - $data['catalog_id'] = null; + $data['catalogId'] = null; } $lookupSession->useFederatedCourseCatalogView(); - $topics = new \phpkit_course_ArrayTopicList([$lookupSession->getTopic($topic)]); + $topics = new \phpkit_course_ArrayTopicList([$lookupSession->getTopic($topicId)]); $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); $data['feedLink'] = $this->generateUrl( 'view_topic_xml', [ - 'catalog' => $catalog, - 'topic' => $topic, + 'catalogId' => $catalogId, + 'topicId' => $topicId, ], UrlGeneratorInterface::ABSOLUTE_URL, ); @@ -192,97 +192,97 @@ public function viewxmlAction(\osid_id_Id $topic, ?\osid_id_Id $catalog = null) /** * List all subject topics as a text file with each line being Id|DisplayName. */ - #[Route('/topics/listsubjectstxt/{catalog}', name: 'list_subjects_txt')] - public function listsubjectstxtAction(?\osid_id_Id $catalog = null) + #[Route('/topics/listsubjectstxt/{catalogId}', name: 'list_subjects_txt')] + public function listsubjectstxtAction(?\osid_id_Id $catalogId = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'), - $catalog, + $catalogId, ); } /** * List all requirement topics as a text file with each line being Id|DisplayName. */ - #[Route('/topics/listrequirementstxt/{catalog}', name: 'list_requirements_txt')] - public function listrequirementstxtAction(?\osid_id_Id $catalog = null) + #[Route('/topics/listrequirementstxt/{catalogId}', name: 'list_requirements_txt')] + public function listrequirementstxtAction(?\osid_id_Id $catalogId = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.requirement'), - $catalog, + $catalogId, ); } /** * List all level topics as a text file with each line being Id|DisplayName. */ - #[Route('/topics/listlevelstxt/{catalog}', name: 'list_levels_txt')] - public function listlevelstxtAction(?\osid_id_Id $catalog = null) + #[Route('/topics/listlevelstxt/{catalogId}', name: 'list_levels_txt')] + public function listlevelstxtAction(?\osid_id_Id $catalogId = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.level'), - $catalog, + $catalogId, ); } /** * List all block topics as a text file with each line being Id|DisplayName. */ - #[Route('/topics/listblockstxt/{catalog}', name: 'list_blocks_txt')] - public function listblockstxtAction(?\osid_id_Id $catalog = null) + #[Route('/topics/listblockstxt/{catalogId}', name: 'list_blocks_txt')] + public function listblockstxtAction(?\osid_id_Id $catalogId = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.block'), - $catalog, + $catalogId, ); } /** * List all instruction-methods topics as a text file with each line being Id|DisplayName. */ - #[Route('/topics/listinstructionmethodstxt/{catalog}', name: 'list_instructionmethods_txt')] - public function listinstructionmethodstxtAction(?\osid_id_Id $catalog = null) + #[Route('/topics/listinstructionmethodstxt/{catalogId}', name: 'list_instructionmethods_txt')] + public function listinstructionmethodstxtAction(?\osid_id_Id $catalogId = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.instruction_method'), - $catalog, + $catalogId, ); } /** * List all department topics as a text file with each line being Id|DisplayName. */ - #[Route('/topics/listdepartmentstxt/{catalog}', name: 'list_departments_txt')] - public function listdepartmentstxtAction(?\osid_id_Id $catalog = null) + #[Route('/topics/listdepartmentstxt/{catalogId}', name: 'list_departments_txt')] + public function listdepartmentstxtAction(?\osid_id_Id $catalogId = null) { return $this->renderTextList( new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.department'), - $catalog, + $catalogId, ); } /** * Answer an array of topic data for an optional catalog and type. * - * @param string $catalog + * @param osid_id_Id $catalogId * The catalog id to search within - * @param string $type + * @param osid_type_Type $type * The type id to search within * * @return array * The topic data ready for templating */ - protected function getTopicData(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) + protected function getTopicData(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { $data = []; - if ($catalog) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalog); + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); $data['title'] = 'Topics in All Catalogs'; - $data['catalog_id'] = null; + $data['catalogId'] = null; } $lookupSession->useFederatedCourseCatalogView(); @@ -301,26 +301,26 @@ protected function getTopicData(?\osid_id_Id $catalog = null, ?\osid_type_Type $ /** * Answer an array of recent topic data for an optional catalog and type. * - * @param string $catalog + * @param osid_id_Id $catalogId * The catalog id to search within - * @param string $type + * @param osid_type_Type $type * The type id to search within * * @return array * The topic data ready for templating */ - protected function getRecentTopicData(?\osid_id_Id $catalog = null, ?\osid_type_Type $type = null) + protected function getRecentTopicData(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - if ($catalog) { - $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalog); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalog); + if ($catalogId) { + $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSessionForCatalog($catalogId); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); $data['title'] = 'Topics in '.$searchSession->getCourseCatalog()->getDisplayName(); - $data['catalog_id'] = $catalog; + $data['catalogId'] = $catalogId; } else { $searchSession = $this->osidRuntime->getCourseManager()->getTopicSearchSession(); $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); $data['title'] = 'Topics in All Catalogs'; - $data['catalog_id'] = null; + $data['catalogId'] = null; } $searchSession->useFederatedCourseCatalogView(); $query = $searchSession->getTopicQuery(); @@ -370,18 +370,18 @@ protected function DateTime_getTimestamp(\DateTime $dt) * * @param \osid_type_Type $genusType * The type of topics to list - * @param string $catalog + * @param \osid_id_Id $catalogId * An optional catalog to limit results to * * @return Response * The rendered response */ - private function renderTextList(\osid_type_Type $genusType, ?\osid_id_Id $catalog = null) + private function renderTextList(\osid_type_Type $genusType, ?\osid_id_Id $catalogId = null) { $data = []; - if ($catalog) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalog); + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); } else { $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); } diff --git a/src/Twig/BookmarksExtension.php b/src/Twig/BookmarksExtension.php index 09e01202..de9beab5 100644 --- a/src/Twig/BookmarksExtension.php +++ b/src/Twig/BookmarksExtension.php @@ -28,8 +28,8 @@ public function getFunctions(): array ]; } - public function isBookmarked(\osid_id_Id $id): string + public function isBookmarked(\osid_id_Id $courseId): string { - return $this->bookmarks->isBookmarked($id); + return $this->bookmarks->isBookmarked($courseId); } } diff --git a/templates/catalogs/list.html.twig b/templates/catalogs/list.html.twig index 148ee85c..f30b2b80 100755 --- a/templates/catalogs/list.html.twig +++ b/templates/catalogs/list.html.twig @@ -2,7 +2,7 @@ {% block body %} {% for catalog in catalogs %} -

{{ catalog.displayname }}

+

{{ catalog.displayname }}

{{ catalog.description | raw }}
{% endfor %} {% endblock %} diff --git a/templates/catalogs/list.xml.twig b/templates/catalogs/list.xml.twig index ddbc9212..f4a1ab5b 100755 --- a/templates/catalogs/list.xml.twig +++ b/templates/catalogs/list.xml.twig @@ -3,7 +3,7 @@ {%~ for catalog in catalogs %} {{ catalog.displayname }} - {{ url('view_catalog', {catalog: catalog.id}) }} + {{ url('view_catalog', {catalogId: catalog.id}) }} {{ osidIdToString(catalog.id) }} diff --git a/templates/courses/list.html.twig b/templates/courses/list.html.twig index 6f676ed5..04c2ff12 100755 --- a/templates/courses/list.html.twig +++ b/templates/courses/list.html.twig @@ -2,7 +2,7 @@ {% block body %} {% for course in courses %} -

{{ course.displayname }} - {{ course.title }}

+

{{ course.displayname }} - {{ course.title }}

{{ course.description | raw }}
{% endfor %} {% endblock %} diff --git a/templates/courses/view.html.twig b/templates/courses/view.html.twig index 7b6800aa..971d6e57 100755 --- a/templates/courses/view.html.twig +++ b/templates/courses/view.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -{{ include('schedules/bookmark_control.html.twig', {course_id: course.id}, with_context = false) }} +{{ include('schedules/bookmark_control.html.twig', {courseId: course.id}, with_context = false) }}
{{ course.displayname }}

{{ course.title }}

@@ -12,28 +12,28 @@
Subject:
{% for topic in subjectTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Department:
{% for topic in departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Division:
{% for topic in divisionTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -41,7 +41,7 @@
Additional Details:
{% for topic in blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -50,7 +50,7 @@
Levels:
{% for topic in levelTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -59,7 +59,7 @@
Equivalent Courses:
{% for alternate in alternates %} - {{ alternate.displayname }} + {{ alternate.displayname }} {{ alternate.is_primary ? ' * ' }}
{% endfor %} @@ -73,7 +73,7 @@ { offerings: offerings, term: term, - offeringsForAllTermsUrl: url('view_course', {course: course}), + offeringsForAllTermsUrl: url('view_course', {courseId: course}), hideOfferingInstructors: FALSE, selectedOffering: NULL }, diff --git a/templates/offerings/search.html.twig b/templates/offerings/search.html.twig index 3bb6dc7f..9725610f 100755 --- a/templates/offerings/search.html.twig +++ b/templates/offerings/search.html.twig @@ -17,7 +17,7 @@
- {{ item.offering.displayname }}{{ item.is_primary ? " * " }} + {{ item.offering.displayname }}{{ item.is_primary ? " * " }} {% if item.alternates is not empty %}
Cross-Listed As: {% for alternate in item.alternates %}
- {{ alternate.displayname }} + {{ alternate.displayname }} {{ alternate.is_primary ? ' * ' }} {% endfor %} {% endif %} @@ -234,25 +234,25 @@
Course Modality:
{% for topic in item.instructionMethodTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %}
Term:
-
{{ item.offering.term.displayname }}
+
{{ item.offering.term.displayname }}
Department:
{% for topic in item.departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in item.requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -260,7 +260,7 @@
Additional Details:
{% for topic in item.blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -272,7 +272,7 @@ {{ include( 'schedules/bookmark_control.html.twig', { - course_id: item.offering.course.id, + courseId: item.offering.course.id, }, with_context = false )}} @@ -286,7 +286,7 @@
Instructors:
{% for instructor in item.instructors %} - {{ instructor.displayname }}{{ not loop.last ? ',' }} + {{ instructor.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -294,7 +294,7 @@ {% if item.location %}
Location:
- {{ item.location.displayname }} + {{ item.location.displayname }} {% if item.location.description %} {{ item.location.description }} {% endif %} diff --git a/templates/offerings/search.xml.twig b/templates/offerings/search.xml.twig index 7b65198b..0a49b783 100755 --- a/templates/offerings/search.xml.twig +++ b/templates/offerings/search.xml.twig @@ -12,6 +12,6 @@ {% endif %} {% for offering in offerings %} -{{ include('partials/offering.xml.twig', offering | merge({catalog_id: catalog_id}), with_context = false) }} +{{ include('partials/offering.xml.twig', offering | merge({catalogId: catalogId}), with_context = false) }} {% endfor %} {% endblock %} diff --git a/templates/offerings/view.html.twig b/templates/offerings/view.html.twig index c74305cb..e82d96e0 100755 --- a/templates/offerings/view.html.twig +++ b/templates/offerings/view.html.twig @@ -1,7 +1,7 @@ {% extends 'base.html.twig' %} {% block body %} -{{ include('schedules/bookmark_control.html.twig', {course_id: offering.course.id}, with_context = false) }} +{{ include('schedules/bookmark_control.html.twig', {courseId: offering.course.id}, with_context = false) }}
{{ offering.displayname }}

{{ offering.title|nl2br }}

@@ -11,12 +11,12 @@
Term:
-
{{ offering.term.displayname }}
+
{{ offering.term.displayname }}
{% if location %}
Location:
- {{ location.displayname }} + {{ location.displayname }} {% if location.description %} {{ location.description }} {% endif %} @@ -38,7 +38,7 @@
Course Modality:
{% for topic in instructionMethodTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -47,7 +47,7 @@
Instructors:
{% for instructor in instructors %} - {{ instructor.displayname }}{{ not loop.last ? ',' }} + {{ instructor.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -55,28 +55,28 @@
Subject:
{% for topic in subjectTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Department:
{% for topic in departmentTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Division:
{% for topic in divisionTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
Requirements Fulfilled:
{% for topic in requirementTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
@@ -84,7 +84,7 @@
Additional Details:
{% for topic in blockTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -93,7 +93,7 @@
Levels:
{% for topic in levelTopics %} - {{ topic.displayname }}{{ not loop.last ? ',' }} + {{ topic.displayname }}{{ not loop.last ? ',' }} {% endfor %}
{% endif %} @@ -102,7 +102,7 @@
Cross-Listed As:
{% for alternate in alternates %} - {{ alternate.displayname }} + {{ alternate.displayname }} {{ alternate.is_primary ? ' * ' }}
{% endfor %} @@ -127,6 +127,6 @@

Course

{% endblock %} diff --git a/templates/partials/course.xml.twig b/templates/partials/course.xml.twig index e66f9adb..3e0f71bc 100644 --- a/templates/partials/course.xml.twig +++ b/templates/partials/course.xml.twig @@ -1,7 +1,7 @@ {{ course.displayname }}{% if include_alternates_in_title and alternates is not empty %}{% for alternate in alternates %} / {{ alternate.displayname }}{% endfor %}{% endif %} - {{ course.title }} - {{ url('view_course', {'course': course}) }} - {{ url('view_course', {'course': course}) }} + {{ url('view_course', {courseId: course}) }} + {{ url('view_course', {courseId: course}) }} {{ osidIdToString(course.id) }} {{ course.displayname }} @@ -11,7 +11,7 @@ {% endif ~%} {%- if alternates is not empty %} {%- for alternate in alternates %} - + {{ osidIdToString(alternate.id) }} {{ alternate.displayname }} {{ alternate.title }} @@ -24,25 +24,25 @@ {% endfor ~%} {% endif %} {% for topic in subjectTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in departmentTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in divisionTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in requirementTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- if blockTopics is not empty %} {%- for topic in blockTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {% endif %} {%- if levelTopics is not empty %} {%- for topic in levelTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor ~%} {% endif %} {{ include('partials/offering_list.xml.twig', {offerings: offerings}, with_context = false) }} diff --git a/templates/partials/offering.xml.twig b/templates/partials/offering.xml.twig index 4134adeb..7c6215e7 100644 --- a/templates/partials/offering.xml.twig +++ b/templates/partials/offering.xml.twig @@ -1,6 +1,6 @@ {{ offering.displayname }} - {{ url('view_offering', {'id': offering}) }} + {{ url('view_offering', {'offeringId': offering}) }} {{ offering.title }} {{ osidIdToString(offering.id) }} @@ -9,41 +9,41 @@ {% endif ~%} {%- if alternates is not empty %} {%- for alternate in alternates %} - {{ alternate.displayname }} + {{ alternate.displayname }} {% endfor ~%} {% endif %} {{ offering.genustype.displayname }} {{ include('partials/term.xml.twig', {term: offering.term, key: 'term'}) }} {%- for topic in subjectTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in departmentTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in divisionTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- for topic in requirementTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {%- if blockTopics is not empty %} {%- for topic in blockTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor %} {% endif %} {%- if levelTopics is not empty %} {%- for topic in levelTopics %} - {{ topic.displayname }} + {{ topic.displayname }} {% endfor ~%} {% endif %} {%- if instructors is not null %} {%- for instructor in instructors %} - {{ instructor.displayname }} + {{ instructor.displayname }} {% endfor %} {% endif %} {%- if location %} - {{ location.displayname }} + {{ location.displayname }} {% elseif offering.locationinfo %} {{ offering.locationinfo }} {% endif %} diff --git a/templates/partials/offering_list.xml.twig b/templates/partials/offering_list.xml.twig index b907d51b..5a4e84b6 100755 --- a/templates/partials/offering_list.xml.twig +++ b/templates/partials/offering_list.xml.twig @@ -10,7 +10,7 @@ {% set currentTerm = offering.term %} {% endif %} - + {{ offering.displayname }} {{ offering.title }} diff --git a/templates/partials/offerings.html.twig b/templates/partials/offerings.html.twig index 555ab4ff..ff6801d2 100755 --- a/templates/partials/offerings.html.twig +++ b/templates/partials/offerings.html.twig @@ -19,7 +19,7 @@ {% else %}
{% endif %} - {{item.offering.displayname}} + {{item.offering.displayname}} {{ item.offering.genustype.displayname }} {% if item.instructor_names %} ({{ item.instructor_names|join(', ') }}) diff --git a/templates/partials/term.xml.twig b/templates/partials/term.xml.twig index cb6de728..586eebd4 100644 --- a/templates/partials/term.xml.twig +++ b/templates/partials/term.xml.twig @@ -1 +1 @@ -{{ term.displayname }} +{{ term.displayname }} diff --git a/templates/resources/view.html.twig b/templates/resources/view.html.twig index eb032ee4..14fd4b61 100755 --- a/templates/resources/view.html.twig +++ b/templates/resources/view.html.twig @@ -9,7 +9,7 @@ { offerings: offerings, term: term, - offeringsForAllTermsUrl: url('view_resource', {resource: resource.id}), + offeringsForAllTermsUrl: url('view_resource', {resourceId: resource.id}), hideOfferingInstructors: FALSE, selectedOffering: NULL }, diff --git a/templates/schedules/bookmark_control.html.twig b/templates/schedules/bookmark_control.html.twig index 241484d1..cb8da38c 100755 --- a/templates/schedules/bookmark_control.html.twig +++ b/templates/schedules/bookmark_control.html.twig @@ -2,16 +2,16 @@ {% if is_granted('IS_AUTHENTICATED_FULLY') %}

Bookmark this course

- - + -

{{ term.displayname }}

+

{{ term.displayname }}

{{ term.description }}
{% endfor %} diff --git a/templates/terms/list.xml.twig b/templates/terms/list.xml.twig index 381d8347..1cb24873 100755 --- a/templates/terms/list.xml.twig +++ b/templates/terms/list.xml.twig @@ -3,7 +3,7 @@ {%~ for term in terms %} {{ term.displayname }} - {{ url('view_term', {term: term, catalog: catalog_id}) }} + {{ url('view_term', {termId: term, catalogId: catalogId}) }} {{ osidIdToString(term.id) }} {{ term.starttime | date('Y-m-d') }} diff --git a/templates/topics/list.html.twig b/templates/topics/list.html.twig index 4977f5d1..60b5b0d4 100755 --- a/templates/topics/list.html.twig +++ b/templates/topics/list.html.twig @@ -6,7 +6,7 @@

Subjects:

{% endif %} @@ -15,7 +15,7 @@

Departments:

{% endif %} @@ -24,7 +24,7 @@

Divisions:

{% endif %} @@ -33,7 +33,7 @@

Requirements Fulfilled:

{% endif %} diff --git a/templates/topics/list.xml.twig b/templates/topics/list.xml.twig index 56a19175..cc0101e3 100755 --- a/templates/topics/list.xml.twig +++ b/templates/topics/list.xml.twig @@ -3,7 +3,7 @@ {%~ for topic in subjectTopics|merge(departmentTopics, divisionTopics, requirementTopics) %} {{ topic.displayname }} - {{ url('view_topic', {topic: topic, catalog: catalog_id}) }} + {{ url('view_topic', {topicId: topic, catalogId: catalogId}) }} {{ osidIdToString(topic.id) }} {{ osidTypeToString(topic.genustype) }} diff --git a/templates/topics/view.html.twig b/templates/topics/view.html.twig index dc0493a1..12baba50 100755 --- a/templates/topics/view.html.twig +++ b/templates/topics/view.html.twig @@ -8,7 +8,7 @@ 'partials/offerings.html.twig', { offerings: offerings, - catalog_id: catalog_id, + catalogId: catalogId, term: term, offeringsForAllTermsUrl: offeringsForAllTermsUrl, hideOfferingInstructors: FALSE, From 45a9fed8ce822360f3a22e95835ecd4ccd425ae4 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 30 Oct 2024 14:08:38 -0400 Subject: [PATCH 088/173] #47: Convert additional controller arguments to Osid_id_Id objects. --- src/Controller/Courses.php | 13 +++++-------- src/Controller/Offerings.php | 8 +++----- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 86d1f2b5..9169ee9d 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -366,7 +366,7 @@ public function byidxmlAction(Request $request, \osid_id_Id $catalogId) * entries and merge them into a single result. */ #[Route('/courses/instructorxml/{instructorId}/{catalogId}', name: 'list_courses_by_instructor')] - public function instructorxmlAction(Request $request, string $instructorId, ?\osid_id_Id $catalogId = null) + public function instructorxmlAction(Request $request, \osid_id_Id $instructorId, ?\osid_id_Id $catalogId = null) { if (!$catalogId) { $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); @@ -398,9 +398,7 @@ public function instructorxmlAction(Request $request, string $instructorId, ?\os } } - $instructorId = trim($instructorId); - - if (!$instructorId || !strlen($instructorId)) { + if (!$instructorId) { // Make sure that this error response is cacheable. $this->setCacheControlHeaders(); $this->getResponse()->sendHeaders(); @@ -408,10 +406,9 @@ public function instructorxmlAction(Request $request, string $instructorId, ?\os throw new \InvalidArgumentException('An instructor must be specified.'); } - if (preg_match('/^resource\.person\./', $instructorId)) { - $instructorId = $this->osidIdMap->fromString($instructorId); - } else { - $instructorId = $this->osidIdMap->fromString('resource.person.'.$instructorId); + // Expand plain instructor Ids to fully qualified ones. + if (!preg_match('/^resource\.person\./', $this->osidIdMap->toString($instructorId))) { + $instructorId = $this->osidIdMap->fromString('resource.person.'.$this->osidIdMap->toString($instructorId)); } $resourceLookup = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); try { diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index c92f8ecc..5f824c7e 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -57,7 +57,7 @@ public function __construct( * Print out a list of all courses. */ #[Route('/offerings/list/{catalogId}/{termId}', name: 'list_offerings')] - public function listAction(\osid_id_Id $catalogId, string $termId) + public function listAction(\osid_id_Id $catalogId, \osid_id_Id $termId) { $data = []; $data['catalogId'] = $catalogId; @@ -66,10 +66,8 @@ public function listAction(\osid_id_Id $catalogId, string $termId) $lookupSession->useFederatedCourseCatalogView(); // Add our parameters to the search query - if ('CURRENT' == $termId) { + if ('CURRENT' == $this->osidIdMap->toString($termId)) { $termId = $this->osidTermHelper->getNextOrLatestTermId(); - } else { - $termId = $this->osidIdMap->fromString($termId); } $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); @@ -246,7 +244,7 @@ public function viewxmlAction(\osid_id_Id $offeringId) * * @param Request $request * The request that contains the search parameters - * @param string|null $catalogId + * @param osid_id_Id|null $catalogId * The catalog to search in or NULL for all catalogs * * @return array From b307e73a20985112e77a328a7bd17897abc1f6b7 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Wed, 30 Oct 2024 14:26:19 -0400 Subject: [PATCH 089/173] #47: Fix code formatting with php-cs-fixer. --- src/Controller/Offerings.php | 6 +++--- src/Controller/Topics.php | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 5f824c7e..f55fed50 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -242,10 +242,10 @@ public function viewxmlAction(\osid_id_Id $offeringId) /** * Run a search query and provide the data suitable for templating. * - * @param Request $request - * The request that contains the search parameters + * @param Request $request + * The request that contains the search parameters * @param osid_id_Id|null $catalogId - * The catalog to search in or NULL for all catalogs + * The catalog to search in or NULL for all catalogs * * @return array * The parts of the search preparation in an array: data, searchSession, diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index 5a087f70..3b1aae0d 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -264,10 +264,10 @@ public function listdepartmentstxtAction(?\osid_id_Id $catalogId = null) /** * Answer an array of topic data for an optional catalog and type. * - * @param osid_id_Id $catalogId - * The catalog id to search within + * @param osid_id_Id $catalogId + * The catalog id to search within * @param osid_type_Type $type - * The type id to search within + * The type id to search within * * @return array * The topic data ready for templating @@ -301,10 +301,10 @@ protected function getTopicData(?\osid_id_Id $catalogId = null, ?\osid_type_Type /** * Answer an array of recent topic data for an optional catalog and type. * - * @param osid_id_Id $catalogId - * The catalog id to search within + * @param osid_id_Id $catalogId + * The catalog id to search within * @param osid_type_Type $type - * The type id to search within + * The type id to search within * * @return array * The topic data ready for templating @@ -370,7 +370,7 @@ protected function DateTime_getTimestamp(\DateTime $dt) * * @param \osid_type_Type $genusType * The type of topics to list - * @param \osid_id_Id $catalogId + * @param \osid_id_Id $catalogId * An optional catalog to limit results to * * @return Response From 6658f0002c69df35093039743b71c167e13f2d04 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 31 Oct 2024 14:44:39 -0400 Subject: [PATCH 090/173] #47: Ensure that variadic parameters are passed through to the inner router --- src/Routing/OsidRouter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Routing/OsidRouter.php b/src/Routing/OsidRouter.php index 376de682..b89e5fd2 100644 --- a/src/Routing/OsidRouter.php +++ b/src/Routing/OsidRouter.php @@ -76,7 +76,7 @@ public function getContext(): RequestContext */ public function warmUp(string $cacheDir /* , string $buildDir = null */) { - return $this->router->warmUp($cachDir); + return call_user_func_array([$this->router, 'warmUp'], func_get_args()); } /** From 1181797b47ace4190e7a2bb06335be0b3234c9ef Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 31 Oct 2024 15:40:42 -0400 Subject: [PATCH 091/173] #47: Add first WebTestCase to test full application requests via phpunit. When running these tests we can check the full HTTP request cycle and ensure that no errors have been introduced via in the Controllers or configuration. --- application/test/bootstrap.php | 6 ------ composer.json | 2 +- config/services.yaml | 6 +++++- phpunit.xml | 16 ---------------- phpunit.xml.dist | 20 +++++++++++++++++-- tests/Controller/CatalogsTest.php | 32 +++++++++++++++++++++++++++++++ tests/bootstrap.php | 6 ++++++ 7 files changed, 62 insertions(+), 26 deletions(-) delete mode 100644 application/test/bootstrap.php delete mode 100644 phpunit.xml create mode 100644 tests/Controller/CatalogsTest.php diff --git a/application/test/bootstrap.php b/application/test/bootstrap.php deleted file mode 100644 index 59c83142..00000000 --- a/application/test/bootstrap.php +++ /dev/null @@ -1,6 +0,0 @@ - - - - - application/test/Catalog - - - - application/test/apc - application/test/banner - application/test/Catalog - - - diff --git a/phpunit.xml.dist b/phpunit.xml.dist index c76a655a..e8d969ee 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -15,11 +15,27 @@ + - - tests + + tests/Controller + + + application/test/banner + + + application/test/apc + + + application/test/Catalog + + + application/test/banner + application/test/apc + tests/Controller + application/test/Catalog diff --git a/tests/Controller/CatalogsTest.php b/tests/Controller/CatalogsTest.php new file mode 100644 index 00000000..77a7ef95 --- /dev/null +++ b/tests/Controller/CatalogsTest.php @@ -0,0 +1,32 @@ +request('GET', '/'); + + $this->assertResponseIsSuccessful(); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Middlebury College")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Middlebury College Language Schools")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Monterey Institute of International Studies")')->count()); + } + + public function testList(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/catalogs/list'); + + $this->assertResponseIsSuccessful(); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Middlebury College")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Middlebury College Language Schools")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Monterey Institute of International Studies")')->count()); + } +} diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 47a58557..37402a41 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,5 +1,11 @@ Date: Thu, 31 Oct 2024 16:33:16 -0400 Subject: [PATCH 092/173] #47: Require a catalog for /courses/list/* to avoid massive data fetch. --- src/Controller/Courses.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 9169ee9d..3a76d8a0 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -35,20 +35,14 @@ public function __construct( } #[Route('/courses/list/{catalogId}', name: 'list_courses')] - public function listAction(?\osid_id_Id $catalogId = null) + public function listAction(\osid_id_Id $catalogId) { $data = [ 'courses' => [], ]; - if ($catalogId) { - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); - $data['title'] = 'Courses in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalogId'] = $catalogId; - } else { - $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); - $data['title'] = 'Courses in All Catalogs'; - $data['catalogId'] = null; - } + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSessionForCatalog($catalogId); + $data['title'] = 'Courses in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalogId'] = $catalogId; $lookupSession->useFederatedCourseCatalogView(); $courses = $lookupSession->getCourses(); From 145c0116ff5eb96c8317d6d534087d870ac240e8 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 31 Oct 2024 16:48:04 -0400 Subject: [PATCH 093/173] #47: Add additional acceptance tests for catalogs and courses controllers. --- tests/Controller/CatalogsTest.php | 48 +++++++++++++++++++++++++ tests/Controller/CoursesTest.php | 60 +++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) create mode 100644 tests/Controller/CoursesTest.php diff --git a/tests/Controller/CatalogsTest.php b/tests/Controller/CatalogsTest.php index 77a7ef95..7936c564 100644 --- a/tests/Controller/CatalogsTest.php +++ b/tests/Controller/CatalogsTest.php @@ -14,6 +14,7 @@ public function testHome(): void $crawler = $client->request('GET', '/'); $this->assertResponseIsSuccessful(); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Middlebury College")')->count()); $this->assertGreaterThan(0, $crawler->filter('a:contains("Middlebury College Language Schools")')->count()); $this->assertGreaterThan(0, $crawler->filter('a:contains("Monterey Institute of International Studies")')->count()); @@ -25,8 +26,55 @@ public function testList(): void $crawler = $client->request('GET', '/catalogs/list'); $this->assertResponseIsSuccessful(); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Middlebury College")')->count()); $this->assertGreaterThan(0, $crawler->filter('a:contains("Middlebury College Language Schools")')->count()); $this->assertGreaterThan(0, $crawler->filter('a:contains("Monterey Institute of International Studies")')->count()); } + + public function testListXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/catalogs/listxml'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item[title[contains(text(), "Monterey Institute of International Studies")]]'); + $this->assertEquals(1, $item->count()); + $this->assertGreaterThan(0, $item->filter('title:contains("Monterey Institute of International Studies")')->count()); + $this->assertGreaterThan(0, $item->filter('catalog\:id:contains("catalog.MIIS")')->count()); + } + + public function testView(): void + { + $client = static::createClient(); + $client->followRedirects(false); + $crawler = $client->request('GET', '/catalogs/view/catalog.MCUG'); + + $this->assertResponseRedirects('/offerings/search/catalog.MCUG?termId=term.200990'); + } + + public function testViewWithTerm(): void + { + $client = static::createClient(); + $client->followRedirects(false); + $crawler = $client->request('GET', '/catalogs/view/catalog.MCUG/term.200710'); + + $this->assertResponseRedirects('/offerings/search/catalog.MCUG?termId=term.200710'); + } + + public function testViewXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/catalogs/viewxml/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(1, $item->count()); + $this->assertGreaterThan(0, $item->filter('title:contains("Middlebury College")')->count()); + $this->assertGreaterThan(0, $item->filter('catalog\:id:contains("catalog.MCUG")')->count()); + } + + } diff --git a/tests/Controller/CoursesTest.php b/tests/Controller/CoursesTest.php new file mode 100644 index 00000000..1f6be7a2 --- /dev/null +++ b/tests/Controller/CoursesTest.php @@ -0,0 +1,60 @@ +request('GET', '/courses/list/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + + $this->assertGreaterThan(0, $crawler->filter('a:contains("PHYS 0201")')->count()); + } + + public function testView(): void + { + $client = static::createClient(); + $client->followRedirects(false); + $crawler = $client->request('GET', '/courses/view/course.PHYS0201'); + + $this->assertResponseIsSuccessful(); + $this->assertSelectorTextContains('div.offering_list a.offering_link', 'PHYS0201A-F09'); + } + + public function testViewWithTerm(): void + { + $client = static::createClient(); + $client->followRedirects(false); + $crawler = $client->request('GET', '/courses/view/course.PHYS0201/term.200690'); + + $this->assertResponseIsSuccessful(); + $this->assertSelectorTextContains('div.offering_list a.offering_link', 'PHYS0201A-F06'); + } + + public function testViewXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/viewxml/course.PHYS0201'); + + $this->assertResponseIsSuccessful(); + + $this->assertSelectorTextContains('catalog\:offering_list catalog\:offering_term[name]', 'Fall 2009'); + } + + public function testViewXmlWithTerm(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/viewxml/course.PHYS0201/term.200690'); + + $this->assertResponseIsSuccessful(); + + $this->assertSelectorTextContains('catalog\:offering_list catalog\:offering_term[name]', 'Fall 2006'); + } +} From 47751561518a1244c8583323515a831c9f96a8ad Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 10:38:25 -0400 Subject: [PATCH 094/173] #47: Recent Terms/Courses helpers use a date other than 'now' while testing Our test data is static, so we need to use a different reference date other than 'now' when running tests so that the output is reliable and courses/ terms don't fall off of the "recent" list. --- config/services.yaml | 5 +++ src/Controller/Courses.php | 6 ++-- src/Helper/RecentCourses/All.php | 3 +- src/Helper/RecentCourses/Instructor.php | 6 ++-- .../RecentCourses/RecentCoursesAbstract.php | 6 ++-- src/Service/Osid/TermHelper.php | 32 +++++++++++++++---- 6 files changed, 44 insertions(+), 14 deletions(-) diff --git a/config/services.yaml b/config/services.yaml index bf6f8c40..1b0bafbc 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -7,9 +7,11 @@ parameters: app.osid.runtime.config_path: '../configuration.plist' app.osid.runtime.courseimpl: 'banner_course_CourseManager' app.osid.id.authority_to_shorten: 'middlebury.edu' + app.osid.reference_date: 'now' when@test: parameters: app.osid.runtime.config_path: '../application/test/banner/configuration.plist' + app.osid.reference_date: '2009-08-15' services: # default configuration for services in *this* file @@ -43,6 +45,9 @@ services: App\Service\Osid\IdMap: arguments: $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' + App\Service\Osid\TermHelper: + arguments: + $referenceDate: '%app.osid.reference_date%' App\Service\Osid\TypeMap: arguments: $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 3a76d8a0..161a352c 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -224,7 +224,7 @@ public function topicxmlAction(Request $request, \osid_id_Id $catalogId) $courses = $searchSession->getCoursesByQuery($query)->getCourses(); - $recentCourses = new DepartmentRecentCourses($this->osidIdMap, $courses); + $recentCourses = new DepartmentRecentCourses($this->osidIdMap, $courses, $this->getParameter('app.osid.reference_date')); if ($request->get('cutoff')) { $recentCourses->setRecentInterval(new \DateInterval($request->get('cutoff'))); } @@ -313,7 +313,7 @@ public function byidxmlAction(Request $request, \osid_id_Id $catalogId) $courses = $lookupSession->getCoursesByIds(new \phpkit_id_ArrayIdList($courseIds)); - $recentCourses = new DepartmentRecentCourses($this->osidIdMap, $courses); + $recentCourses = new DepartmentRecentCourses($this->osidIdMap, $courses, $this->getParameter('app.osid.reference_date')); if ($request->get('cutoff')) { $recentCourses->setRecentInterval(new \DateInterval($request->get('cutoff'))); } @@ -428,7 +428,7 @@ public function instructorxmlAction(Request $request, \osid_id_Id $instructorId, $courseOfferings = $offeringSearchSession->getCourseOfferingsBySearch($query, $search); - $recentCourses = new InstructorRecentCourses($this->osidIdMap, $courseOfferings, $courseLookupSession); + $recentCourses = new InstructorRecentCourses($this->osidIdMap, $courseOfferings, $courseLookupSession, $this->getParameter('app.osid.reference_date')); if ($request->get('cutoff')) { $recentCourses->setRecentInterval(new DateInterval($request->get('cutoff'))); } diff --git a/src/Helper/RecentCourses/All.php b/src/Helper/RecentCourses/All.php index 2178319d..c9371065 100755 --- a/src/Helper/RecentCourses/All.php +++ b/src/Helper/RecentCourses/All.php @@ -28,9 +28,10 @@ class All extends RecentCoursesAbstract public function __construct( IdMap $osidIdMap, \osid_course_CourseList $courses, + string $referenceDate = 'now', ) { $this->termsCache = []; - parent::__construct($osidIdMap, $courses); + parent::__construct($osidIdMap, $courses, $referenceDate); } /** diff --git a/src/Helper/RecentCourses/Instructor.php b/src/Helper/RecentCourses/Instructor.php index cd6dc50a..21fcbeb2 100755 --- a/src/Helper/RecentCourses/Instructor.php +++ b/src/Helper/RecentCourses/Instructor.php @@ -19,6 +19,7 @@ class Instructor implements RecentCoursesInterface protected $groups = []; protected $recentInterval; protected $alternatesType; + protected $referenceDate; /** * Constructor. @@ -29,7 +30,9 @@ public function __construct( protected IdMap $osidIdMap, \osid_course_CourseOfferingSearchResults $offerings, protected \osid_course_CourseLookupSession $courseLookupSession, + string $referenceDate = 'now', ) { + $this->referenceDate = new \DateTime($referenceDate); $this->recentInterval = new \DateInterval('P4Y'); $this->alternatesType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->groupCourseOfferings($offerings); @@ -164,8 +167,7 @@ protected function termIsRecent(\osid_course_Term $term) { // Define a cutoff date after which courses will be included in the feed. // Default is 4 years. - $now = new \DateTime(); - $cutOff = $this->DateTime_getTimestamp($now->sub($this->recentInterval)); + $cutOff = $this->DateTime_getTimestamp($this->referenceDate->sub($this->recentInterval)); $termEnd = $this->DateTime_getTimestamp($term->getEndTime()); return $termEnd > $cutOff; diff --git a/src/Helper/RecentCourses/RecentCoursesAbstract.php b/src/Helper/RecentCourses/RecentCoursesAbstract.php index 06c4276b..847c47d0 100755 --- a/src/Helper/RecentCourses/RecentCoursesAbstract.php +++ b/src/Helper/RecentCourses/RecentCoursesAbstract.php @@ -20,6 +20,7 @@ abstract class RecentCoursesAbstract implements RecentCoursesInterface private $terms; protected $alternateType; + protected $referenceDate; protected $recentInterval; private $initialized = false; @@ -29,10 +30,12 @@ abstract class RecentCoursesAbstract implements RecentCoursesInterface public function __construct( protected IdMap $osidIdMap, private \osid_course_CourseList $courses, + string $referenceDate = 'now', ) { $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->groups = []; $this->terms = []; + $this->referenceDate = new \DateTime($referenceDate); $this->recentInterval = new \DateInterval('P4Y'); } @@ -300,8 +303,7 @@ private function filterRecentTerms(array $allTerms) { // Define a cutoff date after which courses will be included in the feed. // Currently set to 4 years. Would be good to have as a configurable time. - $now = new \DateTime(); - $cutOff = $this->DateTime_getTimestamp($now->sub($this->recentInterval)); + $cutOff = $this->DateTime_getTimestamp($this->referenceDate->sub($this->recentInterval)); $recentTerms = []; $osidIdHelper = $this->osidIdMap; foreach ($allTerms as $term) { diff --git a/src/Service/Osid/TermHelper.php b/src/Service/Osid/TermHelper.php index 50af0115..2cf4e278 100755 --- a/src/Service/Osid/TermHelper.php +++ b/src/Service/Osid/TermHelper.php @@ -12,15 +12,35 @@ */ class TermHelper { + /** + * @var \DateTime + * The date to reference as "now" when calculating + * past/current/future + */ + private $referenceDate; + + /** + * @param runtime $runtime + * The Osid Runtime service + * @param idMap $idMap + * The Osid IdMap service + * @param string $referenceDate + * A date string to reference as "now" when calculating + * past/current/future. This should be of a date-string + * supported by DateTime. + */ public function __construct( private Runtime $runtime, private IdMap $idMap, + ?string $referenceDate = 'now', ) { + $this->referenceDate = new \DateTime($referenceDate); } /** - * Answer the "current" termId for the catalog passed. If multiple terms overlap - * to be 'current', only one will be returned. + * Answer the "current" termId for the catalog passed. + * + * If multiple terms overlap to be 'current', only one will be returned. * * @return osid_id_Id the current term id * @@ -39,7 +59,7 @@ public function getNextOrLatestTermId(\osid_id_Id $catalogId) throw new \osid_NotFoundException('Could not determine a current term id. The manager does not support term lookup.'); } $termLookup = $manager->getTermLookupSessionForCatalog($catalogId); - $currentTerm = $this->findNextOrLatestTermId($termLookup->getTerms()); + $currentTerm = $this->findNextOrLatestTermId($termLookup->getTerms(), $this->referenceDate); if (!$currentTerm) { throw new \osid_NotFoundException('Could not determine an upcoming term id for the catalog passed.'); } @@ -71,7 +91,7 @@ public function getCurrentTermId(\osid_id_Id $catalogId) throw new \osid_NotFoundException('Could not determine a current term id. The manager does not support term lookup.'); } $termLookup = $manager->getTermLookupSessionForCatalog($catalogId); - $currentTerm = $this->findClosestTermId($termLookup->getTerms()); + $currentTerm = $this->findClosestTermId($termLookup->getTerms(), $this->referenceDate); if (!$currentTerm) { throw new \osid_NotFoundException('Could not determine a current term id for the catalog passed.'); } @@ -140,7 +160,7 @@ private static function cache_set($key, $value) * * @since 2/07/13 */ - public function findNextOrLatestTermId(\osid_course_TermList $terms, ?DateTime $date = null) + public function findNextOrLatestTermId(\osid_course_TermList $terms, ?\DateTime $date = null) { $upcomingIds = []; $upcomingDates = []; @@ -196,7 +216,7 @@ public function findNextOrLatestTermId(\osid_course_TermList $terms, ?DateTime $ * * @since 6/11/09 */ - public function findClosestTermId(\osid_course_TermList $terms, ?DateTime $date = null) + public function findClosestTermId(\osid_course_TermList $terms, ?\DateTime $date = null) { $ids = []; $diffs = []; From 9b45edbec738381fb4cffa4b8fa4632666b42153 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 10:47:50 -0400 Subject: [PATCH 095/173] #47: Fix array-access warnings when results are empty. --- .../library/banner/course/Term/Lookup/Session.php | 2 +- .../library/banner/course/Topic/Lookup/Session.php | 14 +++++++------- .../resource/Resource/Lookup/CombinedSession.php | 6 +++--- .../resource/Resource/Lookup/PerCatalogSession.php | 8 ++++---- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/application/library/banner/course/Term/Lookup/Session.php b/application/library/banner/course/Term/Lookup/Session.php index e43e9b5c..8996155b 100755 --- a/application/library/banner/course/Term/Lookup/Session.php +++ b/application/library/banner/course/Term/Lookup/Session.php @@ -321,7 +321,7 @@ protected function getPartOfTerm($termCode, $pTermCode) $row = self::$getPartOfTerm_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getPartOfTerm_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVTERM_CODE']) { + if (!$row || !$row['STVTERM_CODE']) { throw new osid_NotFoundException("Could not find a term matching the term code $termCode and part-of-term code $pTermCode."); } diff --git a/application/library/banner/course/Topic/Lookup/Session.php b/application/library/banner/course/Topic/Lookup/Session.php index bc9a5763..1243a96a 100755 --- a/application/library/banner/course/Topic/Lookup/Session.php +++ b/application/library/banner/course/Topic/Lookup/Session.php @@ -285,7 +285,7 @@ private function getSubjectTopic(osid_id_Id $topicId) $row = self::$getSubjectTopic_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getSubjectTopic_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVSUBJ_CODE']) { + if (!$row || !$row['STVSUBJ_CODE']) { throw new osid_NotFoundException('Could not find a topic matching the subject code '.$this->getDatabaseIdString($topicId, 'topic.subject.').'.'); } @@ -504,7 +504,7 @@ private function getDivisionTopic(osid_id_Id $topicId) $row = self::$getDivisionTopic_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getDivisionTopic_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVDIVS_CODE']) { + if (!$row || !$row['STVDIVS_CODE']) { throw new osid_NotFoundException('Could not find a topic matching the division code '.$this->getDatabaseIdString($topicId, 'topic.division.').'.'); } @@ -633,13 +633,13 @@ private function getRequirementTopic(osid_id_Id $topicId) $row = self::$getRequirementTopic_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getRequirementTopic_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVATTR_CODE']) { + if (!$row || !$row['STVATTR_CODE']) { // Try the course-only requirements self::$getCourseRequirementTopic_stmts[$catalogWhere]->execute($parameters); $row = self::$getCourseRequirementTopic_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getCourseRequirementTopic_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVATTR_CODE']) { + if (!$row || !$row['STVATTR_CODE']) { throw new osid_NotFoundException('Could not find a topic matching the requirement code '.$this->getDatabaseIdString($topicId, 'topic.requirement.').'.'); } } @@ -744,7 +744,7 @@ private function getLevelTopic(osid_id_Id $topicId) $row = self::$getLevelTopic_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getLevelTopic_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVLEVL_CODE']) { + if (!$row || !$row['STVLEVL_CODE']) { throw new osid_NotFoundException('Could not find a topic matching the level code '.$this->getDatabaseIdString($topicId, 'topic.level.').'.'); } @@ -848,7 +848,7 @@ private function getBlockTopic(osid_id_Id $topicId) $row = self::$getBlockTopic_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getBlockTopic_stmts[$catalogWhere]->closeCursor(); - if (!$row['STVBLCK_CODE']) { + if (!$row || !$row['STVBLCK_CODE']) { throw new osid_NotFoundException('Could not find a topic matching the block code '.$this->getDatabaseIdString($topicId, 'topic.block.').'.'); } @@ -945,7 +945,7 @@ private function getInstructionMethodTopic(osid_id_Id $topicId) $row = self::$getInstructionMethodTopic_stmts[$catalogWhere]->fetch(PDO::FETCH_ASSOC); self::$getInstructionMethodTopic_stmts[$catalogWhere]->closeCursor(); - if (!$row['GTVINSM_CODE']) { + if (!$row || !$row['GTVINSM_CODE']) { throw new osid_NotFoundException('Could not find a topic matching the instruction_method code '.$this->getDatabaseIdString($topicId, 'topic.instruction_method.').'.'); } diff --git a/application/library/banner/resource/Resource/Lookup/CombinedSession.php b/application/library/banner/resource/Resource/Lookup/CombinedSession.php index 33685deb..1cab735a 100755 --- a/application/library/banner/resource/Resource/Lookup/CombinedSession.php +++ b/application/library/banner/resource/Resource/Lookup/CombinedSession.php @@ -339,7 +339,7 @@ private function getBuildingResource(osid_id_Id $resourceId) $row = self::$getBuildingResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getBuildingResource_stmt->closeCursor(); - if (!$row['STVBLDG_CODE']) { + if (!$row || !$row['STVBLDG_CODE']) { throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource.place.building.').'.'); } @@ -429,7 +429,7 @@ private function getRoomResource(osid_id_Id $resourceId) $row = self::$getRoomResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getRoomResource_stmt->closeCursor(); - if (!$row['STVBLDG_CODE']) { + if (!$row || !$row['STVBLDG_CODE']) { throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource.place.room.').'.'); } @@ -516,7 +516,7 @@ private function getCampusResource(osid_id_Id $resourceId) $row = self::$getCampusResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getCampusResource_stmt->closeCursor(); - if (!$row['STVCAMP_CODE']) { + if (!$row || !$row['STVCAMP_CODE']) { throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource.place.campus.').'.'); } diff --git a/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php b/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php index 48d6de3d..84aa0022 100755 --- a/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php +++ b/application/library/banner/resource/Resource/Lookup/PerCatalogSession.php @@ -318,7 +318,7 @@ private function getPersonResource(osid_id_Id $resourceId) $row = self::$getPersonResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getPersonResource_stmt->closeCursor(); - if (!$row['WEB_ID']) { + if (!$row || !$row['WEB_ID']) { throw new osid_NotFoundException('Could not find a resource matching the person code '.$this->getDatabaseIdString($resourceId, 'resource.person.').'.'); } @@ -432,7 +432,7 @@ private function getBuildingResource(osid_id_Id $resourceId) $row = self::$getBuildingResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getBuildingResource_stmt->closeCursor(); - if (!$row['STVBLDG_CODE']) { + if (!$row || !$row['STVBLDG_CODE']) { throw new osid_NotFoundException('Could not find a resource matching the building code '.$this->getDatabaseIdString($resourceId, 'resource.place.building.').'.'); } @@ -552,7 +552,7 @@ private function getRoomResource(osid_id_Id $resourceId) $row = self::$getRoomResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getRoomResource_stmt->closeCursor(); - if (!$row['STVBLDG_CODE']) { + if (!$row || !$row['STVBLDG_CODE']) { throw new osid_NotFoundException('Could not find a resource matching the room code '.$this->getDatabaseIdString($resourceId, 'resource.place.room.').'.'); } @@ -656,7 +656,7 @@ private function getCampusResource(osid_id_Id $resourceId) $row = self::$getCampusResource_stmt->fetch(PDO::FETCH_ASSOC); self::$getCampusResource_stmt->closeCursor(); - if (!$row['STVCAMP_CODE']) { + if (!$row || !$row['STVCAMP_CODE']) { throw new osid_NotFoundException('Could not find a resource matching the campus code '.$this->getDatabaseIdString($resourceId, 'resource.place.campus.').'.'); } From 12384ddf7f665fb58bb552b1473a00007e1c416a Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 10:50:10 -0400 Subject: [PATCH 096/173] #47: Fix notices when keywords is null. --- src/Controller/Courses.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 161a352c..31d1e583 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -111,11 +111,14 @@ public function searchxmlAction(Request $request, \osid_id_Id $catalogId) exit; } - $keywords = trim($request->get('keywords')); + $keywords = $request->get('keywords'); + if (!empty($keywords)) { + $keywords = trim($keywords); + } $courses = []; // Fetch courses - if (strlen($keywords)) { + if ($keywords && strlen($keywords)) { // For now we will do an offering search and return courses // only from it. If a course search session is available, it would // be preferable to use that. From 78ada2bb0992e2bf93f68e51c1a3d443706b0666 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 11:08:34 -0400 Subject: [PATCH 097/173] #47: Fix deprecation notices due to parent specifying mixed return type. --- application/library/banner/course/Course/AbstractList.php | 2 ++ .../library/banner/course/CourseOffering/AbstractList.php | 2 ++ .../library/banner/course/CourseOffering/GenusTypeList.php | 2 ++ application/library/banner/course/Term/ForCourseList.php | 2 ++ application/library/banner/course/Term/Lookup/AllList.php | 2 ++ application/library/banner/course/Topic/AbstractList.php | 2 ++ 6 files changed, 12 insertions(+) diff --git a/application/library/banner/course/Course/AbstractList.php b/application/library/banner/course/Course/AbstractList.php index da4e2054..a6b3f92d 100755 --- a/application/library/banner/course/Course/AbstractList.php +++ b/application/library/banner/course/Course/AbstractList.php @@ -250,6 +250,8 @@ protected function includeInactive() * Answer an object from a result row. * * @since 4/13/09 + * @return osid_course_Course + * The object from a row. */ final protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/CourseOffering/AbstractList.php b/application/library/banner/course/CourseOffering/AbstractList.php index f019e34e..7786ad45 100755 --- a/application/library/banner/course/CourseOffering/AbstractList.php +++ b/application/library/banner/course/CourseOffering/AbstractList.php @@ -329,6 +329,8 @@ protected function getHavingTerms() * Answer an object from a result row. * * @since 4/13/09 + * @return osid_course_CourseOffering + * The object from a row. */ final protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/CourseOffering/GenusTypeList.php b/application/library/banner/course/CourseOffering/GenusTypeList.php index 04121ae1..de733970 100755 --- a/application/library/banner/course/CourseOffering/GenusTypeList.php +++ b/application/library/banner/course/CourseOffering/GenusTypeList.php @@ -115,6 +115,8 @@ private function getAllInputParameters() * Answer an object from a result row. * * @since 4/13/09 + * @return osid_type_Type + * An object for the row data. */ protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/Term/ForCourseList.php b/application/library/banner/course/Term/ForCourseList.php index 6e1dfc3f..75e2789d 100755 --- a/application/library/banner/course/Term/ForCourseList.php +++ b/application/library/banner/course/Term/ForCourseList.php @@ -110,6 +110,8 @@ private function getAllInputParameters() * Answer an object from a result row. * * @since 4/13/09 + * @return osid_course_Term + * An object for the row data. */ protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/Term/Lookup/AllList.php b/application/library/banner/course/Term/Lookup/AllList.php index a49758a5..6d33c4f2 100755 --- a/application/library/banner/course/Term/Lookup/AllList.php +++ b/application/library/banner/course/Term/Lookup/AllList.php @@ -91,6 +91,8 @@ private function getAllInputParameters() * Answer an object from a result row. * * @since 4/13/09 + * @return osid_course_Term + * An object for the row data. */ protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/Topic/AbstractList.php b/application/library/banner/course/Topic/AbstractList.php index fc10c13d..9f7bf57a 100755 --- a/application/library/banner/course/Topic/AbstractList.php +++ b/application/library/banner/course/Topic/AbstractList.php @@ -562,6 +562,8 @@ abstract protected function includeSubjects(); * Answer an object from a result row. * * @since 4/13/09 + * @return osid_course_Topic + * An object for the row data. */ final protected function getObjectFromRow(array $row) { From 93c477a7e70705dbec56052b9dc9957feb7c1204 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 13:16:28 -0400 Subject: [PATCH 098/173] #47: For recent courses, clone the ref date as it gets modified by sub(). --- src/Helper/RecentCourses/Instructor.php | 3 ++- src/Helper/RecentCourses/RecentCoursesAbstract.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Helper/RecentCourses/Instructor.php b/src/Helper/RecentCourses/Instructor.php index 21fcbeb2..bda38933 100755 --- a/src/Helper/RecentCourses/Instructor.php +++ b/src/Helper/RecentCourses/Instructor.php @@ -167,7 +167,8 @@ protected function termIsRecent(\osid_course_Term $term) { // Define a cutoff date after which courses will be included in the feed. // Default is 4 years. - $cutOff = $this->DateTime_getTimestamp($this->referenceDate->sub($this->recentInterval)); + $referenceDate = clone $this->referenceDate; + $cutOff = $this->DateTime_getTimestamp($referenceDate->sub($this->recentInterval)); $termEnd = $this->DateTime_getTimestamp($term->getEndTime()); return $termEnd > $cutOff; diff --git a/src/Helper/RecentCourses/RecentCoursesAbstract.php b/src/Helper/RecentCourses/RecentCoursesAbstract.php index 847c47d0..5423b122 100755 --- a/src/Helper/RecentCourses/RecentCoursesAbstract.php +++ b/src/Helper/RecentCourses/RecentCoursesAbstract.php @@ -303,7 +303,8 @@ private function filterRecentTerms(array $allTerms) { // Define a cutoff date after which courses will be included in the feed. // Currently set to 4 years. Would be good to have as a configurable time. - $cutOff = $this->DateTime_getTimestamp($this->referenceDate->sub($this->recentInterval)); + $referenceDate = clone $this->referenceDate; + $cutOff = $this->DateTime_getTimestamp($referenceDate->sub($this->recentInterval)); $recentTerms = []; $osidIdHelper = $this->osidIdMap; foreach ($allTerms as $term) { From 5d91cf9436d941ff1f9df32d40115454a35a2144 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 13:18:23 -0400 Subject: [PATCH 099/173] #47: Recency evaluation needs to happen after interval is set. --- src/Controller/Courses.php | 2 +- src/Helper/RecentCourses/Instructor.php | 23 ++++++++++++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/Controller/Courses.php b/src/Controller/Courses.php index 31d1e583..e1594677 100755 --- a/src/Controller/Courses.php +++ b/src/Controller/Courses.php @@ -433,7 +433,7 @@ public function instructorxmlAction(Request $request, \osid_id_Id $instructorId, $recentCourses = new InstructorRecentCourses($this->osidIdMap, $courseOfferings, $courseLookupSession, $this->getParameter('app.osid.reference_date')); if ($request->get('cutoff')) { - $recentCourses->setRecentInterval(new DateInterval($request->get('cutoff'))); + $recentCourses->setRecentInterval(new \DateInterval($request->get('cutoff'))); } // Set the next and previous terms. diff --git a/src/Helper/RecentCourses/Instructor.php b/src/Helper/RecentCourses/Instructor.php index bda38933..60ec17c8 100755 --- a/src/Helper/RecentCourses/Instructor.php +++ b/src/Helper/RecentCourses/Instructor.php @@ -16,7 +16,8 @@ */ class Instructor implements RecentCoursesInterface { - protected $groups = []; + private $allOfferings = []; + protected $groups; protected $recentInterval; protected $alternatesType; protected $referenceDate; @@ -35,7 +36,9 @@ public function __construct( $this->referenceDate = new \DateTime($referenceDate); $this->recentInterval = new \DateInterval('P4Y'); $this->alternatesType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); - $this->groupCourseOfferings($offerings); + while ($offerings->hasNext()) { + $this->allOfferings[] = $offerings->getNextCourseOffering(); + } } /** @@ -46,6 +49,7 @@ public function __construct( public function setRecentInterval(\DateInterval $interval) { $this->recentInterval = $interval; + $this->groups = null; } /** @@ -55,6 +59,9 @@ public function setRecentInterval(\DateInterval $interval) */ public function getPrimaryCourses() { + if (is_null($this->groups)) { + $this->groupCourseOfferings(); + } $courses = []; foreach ($this->groups as $group) { $courses[] = $this->courseLookupSession->getCourse($group['primary_course_id']); @@ -70,6 +77,9 @@ public function getPrimaryCourses() */ public function getAlternatesForCourse(\osid_course_Course $course) { + if (is_null($this->groups)) { + $this->groupCourseOfferings(); + } $idString = $this->osidIdMap->toString($course->getId()); if (!isset($this->groups[$idString])) { throw new \osid_NotFoundException('The course specified is not one of our primary courses.'); @@ -91,6 +101,9 @@ public function getAlternatesForCourse(\osid_course_Course $course) */ public function getTermsForCourse(\osid_course_Course $course) { + if (is_null($this->groups)) { + $this->groupCourseOfferings(); + } $idString = $this->osidIdMap->toString($course->getId()); if (!isset($this->groups[$idString])) { throw new \osid_NotFoundException('The course specified is not one of our primary courses.'); @@ -109,10 +122,10 @@ public function getTermsForCourse(\osid_course_Course $course) * * @return null */ - protected function groupCourseOfferings(\osid_course_CourseOfferingSearchResults $offerings) + protected function groupCourseOfferings() { - while ($offerings->hasNext()) { - $offering = $offerings->getNextCourseOffering(); + $this->groups = []; + foreach ($this->allOfferings as $offering) { if ($this->termIsRecent($offering->getTerm())) { $courseId = $offering->getCourseId(); $courseIdString = $this->osidIdMap->toString($courseId); From e081d85a16fe1435957edcffa72de0f64a1a6e63 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 13:19:52 -0400 Subject: [PATCH 100/173] #47: Run `php-cs-fixer fix` for code formatting. --- application/library/banner/course/Course/AbstractList.php | 3 ++- .../library/banner/course/CourseOffering/AbstractList.php | 3 ++- .../library/banner/course/CourseOffering/GenusTypeList.php | 3 ++- application/library/banner/course/Term/ForCourseList.php | 3 ++- application/library/banner/course/Term/Lookup/AllList.php | 3 ++- application/library/banner/course/Topic/AbstractList.php | 3 ++- tests/Controller/CatalogsTest.php | 2 -- tests/bootstrap.php | 4 ++-- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/application/library/banner/course/Course/AbstractList.php b/application/library/banner/course/Course/AbstractList.php index a6b3f92d..dff50e14 100755 --- a/application/library/banner/course/Course/AbstractList.php +++ b/application/library/banner/course/Course/AbstractList.php @@ -250,8 +250,9 @@ protected function includeInactive() * Answer an object from a result row. * * @since 4/13/09 + * * @return osid_course_Course - * The object from a row. + * The object from a row */ final protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/CourseOffering/AbstractList.php b/application/library/banner/course/CourseOffering/AbstractList.php index 7786ad45..ee507f06 100755 --- a/application/library/banner/course/CourseOffering/AbstractList.php +++ b/application/library/banner/course/CourseOffering/AbstractList.php @@ -329,8 +329,9 @@ protected function getHavingTerms() * Answer an object from a result row. * * @since 4/13/09 + * * @return osid_course_CourseOffering - * The object from a row. + * The object from a row */ final protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/CourseOffering/GenusTypeList.php b/application/library/banner/course/CourseOffering/GenusTypeList.php index de733970..b766e7b0 100755 --- a/application/library/banner/course/CourseOffering/GenusTypeList.php +++ b/application/library/banner/course/CourseOffering/GenusTypeList.php @@ -115,8 +115,9 @@ private function getAllInputParameters() * Answer an object from a result row. * * @since 4/13/09 + * * @return osid_type_Type - * An object for the row data. + * An object for the row data */ protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/Term/ForCourseList.php b/application/library/banner/course/Term/ForCourseList.php index 75e2789d..839566bc 100755 --- a/application/library/banner/course/Term/ForCourseList.php +++ b/application/library/banner/course/Term/ForCourseList.php @@ -110,8 +110,9 @@ private function getAllInputParameters() * Answer an object from a result row. * * @since 4/13/09 + * * @return osid_course_Term - * An object for the row data. + * An object for the row data */ protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/Term/Lookup/AllList.php b/application/library/banner/course/Term/Lookup/AllList.php index 6d33c4f2..647e9564 100755 --- a/application/library/banner/course/Term/Lookup/AllList.php +++ b/application/library/banner/course/Term/Lookup/AllList.php @@ -91,8 +91,9 @@ private function getAllInputParameters() * Answer an object from a result row. * * @since 4/13/09 + * * @return osid_course_Term - * An object for the row data. + * An object for the row data */ protected function getObjectFromRow(array $row) { diff --git a/application/library/banner/course/Topic/AbstractList.php b/application/library/banner/course/Topic/AbstractList.php index 9f7bf57a..c79e518c 100755 --- a/application/library/banner/course/Topic/AbstractList.php +++ b/application/library/banner/course/Topic/AbstractList.php @@ -562,8 +562,9 @@ abstract protected function includeSubjects(); * Answer an object from a result row. * * @since 4/13/09 + * * @return osid_course_Topic - * An object for the row data. + * An object for the row data */ final protected function getObjectFromRow(array $row) { diff --git a/tests/Controller/CatalogsTest.php b/tests/Controller/CatalogsTest.php index 7936c564..8b096477 100644 --- a/tests/Controller/CatalogsTest.php +++ b/tests/Controller/CatalogsTest.php @@ -75,6 +75,4 @@ public function testViewXml(): void $this->assertGreaterThan(0, $item->filter('title:contains("Middlebury College")')->count()); $this->assertGreaterThan(0, $item->filter('catalog\:id:contains("catalog.MCUG")')->count()); } - - } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 37402a41..04891b7f 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -1,8 +1,8 @@ Date: Fri, 1 Nov 2024 13:34:45 -0400 Subject: [PATCH 101/173] #47: Add additional Courses Controller tests. --- tests/Controller/CoursesTest.php | 133 +++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/tests/Controller/CoursesTest.php b/tests/Controller/CoursesTest.php index 1f6be7a2..1a57f6ce 100644 --- a/tests/Controller/CoursesTest.php +++ b/tests/Controller/CoursesTest.php @@ -57,4 +57,137 @@ public function testViewXmlWithTerm(): void $this->assertSelectorTextContains('catalog\:offering_list catalog\:offering_term[name]', 'Fall 2006'); } + + public function testSearchXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/searchxml/catalog.MCUG?keywords=Arctic%20and%20Alpine'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item[catalog:id[contains(text(), "course.GEOL0250")]]'); + $this->assertEquals(1, $item->count()); + $this->assertGreaterThan(0, $item->filter('title:contains("Arctic and Alpine Environments")')->count()); + } + + public function testSearchXmlWithNoKeywords(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/searchxml/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(0, $item->count()); + } + + public function testTopicXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/topicxml/catalog.MCUG?topic[]=topic.department.GEOL&topic[]=topic.department.GEOG'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(2, $item->count()); + } + + public function testTopicXmlWithUnknownTopic(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/topicxml/catalog.MCUG?topic[]=topic.subject.GEOL&topic[]=topic.subject.XXXX'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(1, $item->count()); + } + + public function testTopicXmlWithLocation(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/topicxml/catalog.MCUG?topic[]=topic.department.GEOL&location[]=resource.place.campus.M'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(1, $item->count()); + } + + public function testTopicXmlWithCustomCutoff(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/topicxml/catalog.MCUG?topic[]=topic.department.GEOL&cutoff=P1M'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(0, $item->count()); + } + + public function testByIdXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/byidxml/catalog.MCUG?id[]=course.PHYS0201&id[]=course.GEOL0250'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(2, $item->count()); + } + + public function testByIdXmlWithCustomCutoff(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/byidxml/catalog.MCUG?id[]=course.PHYS0201&id[]=course.GEOL0250&cutoff=P1M'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(1, $item->count()); + } + + public function testInstructorXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/instructorxml/resource.person.WEBID1000004'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(1, $item->count()); + } + + public function testInstructorXmlWithCutoff(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/instructorxml/resource.person.WEBID1000004?cutoff=P10Y'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(2, $item->count()); + } + + public function testInstructorXmlWithPlainId(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/instructorxml/WEBID1000004'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(1, $item->count()); + } + + public function testInstructorXmlWithCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/instructorxml/resource.person.WEBID1000004/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(1, $item->count()); + } } From 6272cf6da7ff74f3bca3efabcd0731600f4dcf16 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 13:38:21 -0400 Subject: [PATCH 102/173] #47: Test /courses/instructorxml with a catalog where they teach nothing. --- .../banner/course/Term/Lookup/CombinedSessionTest.php | 2 +- application/test/banner/sql/test_data.sql | 4 ++++ tests/Controller/CoursesTest.php | 11 +++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/application/test/banner/course/Term/Lookup/CombinedSessionTest.php b/application/test/banner/course/Term/Lookup/CombinedSessionTest.php index 670ec779..4c1a8b15 100755 --- a/application/test/banner/course/Term/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/Term/Lookup/CombinedSessionTest.php @@ -196,7 +196,7 @@ public function testGetTerms() { $terms = $this->session->getTerms(); $this->assertInstanceOf('osid_course_TermList', $terms); - $this->assertEquals(14, $terms->available()); + $this->assertEquals(16, $terms->available()); $this->assertInstanceOf('osid_course_Term', $terms->getNextTerm()); $this->assertInstanceOf('osid_course_Term', $terms->getNextTerm()); } diff --git a/application/test/banner/sql/test_data.sql b/application/test/banner/sql/test_data.sql index 64633d33..5422c577 100755 --- a/application/test/banner/sql/test_data.sql +++ b/application/test/banner/sql/test_data.sql @@ -18,6 +18,8 @@ SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO"; -- INSERT INTO `catalog_term` (`catalog_id`, `term_code`, `term_display_label`) VALUES +('BLSE', '200970', 'L'), +('BLSE', '201070', 'L'), ('MCUG', '200390', 'F'), ('MCUG', '200420', 'S'), ('MCUG', '200490', 'F'), @@ -1414,8 +1416,10 @@ INSERT INTO `STVTERM` (`STVTERM_CODE`, `STVTERM_DESC`, `STVTERM_START_DATE`, `ST ('200923', 'Spring 09 Round 1-Check Status', '2009-02-09', '2009-05-19', '0809', '2008-10-29', '3', '2', '5', '2009', '0000-00-00', '0000-00-00', NULL, 'S'), ('200924', 'First Year Seminar Choices', '2009-02-09', '2009-05-19', '0809', '2008-12-15', '3', '2', '5', '2009', '0000-00-00', '0000-00-00', NULL, 'S'), ('200925', 'FY Preferences,ADVISING ONLY', '2009-02-09', '2009-05-19', '0809', '2008-12-15', '3', '2', '5', '2009', '0000-00-00', '0000-00-00', NULL, 'S'), +('200970', 'Summer 2009', '2009-06-10', '2009-08-08', '0910', '2008-12-19', '5', '7', '8', '2010', '2009-06-10', '2009-08-08', NULL, 'M'), ('200990', 'Fall 2009', '2009-09-07', '2009-12-15', '0910', '2009-04-01', '1', '9', '12', '2010', '0000-00-00', '0000-00-00', NULL, 'S'), ('200993', 'Fall 09: Round 1 -Check Status', '2009-09-07', '2009-12-15', '0910', '2009-04-01', '1', '9', '12', '2010', '0000-00-00', '0000-00-00', NULL, 'S'), +('201070', 'Summer 2010', '2010-06-16', '2010-08-06', '1011', '2009-12-11', '5', '7', '8', '2011', '2010-06-16', '2010-08-06', NULL, 'M'), ('201690', 'Fall 2016', '2016-09-07', '2016-12-15', '0910', '2016-04-01', '1', '9', '12', '2017', '0000-00-00', '0000-00-00', NULL, 'S'); -- diff --git a/tests/Controller/CoursesTest.php b/tests/Controller/CoursesTest.php index 1a57f6ce..dd292669 100644 --- a/tests/Controller/CoursesTest.php +++ b/tests/Controller/CoursesTest.php @@ -190,4 +190,15 @@ public function testInstructorXmlWithCatalog(): void $item = $crawler->filterXpath('//item'); $this->assertEquals(1, $item->count()); } + + public function testInstructorXmlWithOtherCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/courses/instructorxml/resource.person.WEBID1000004/catalog.BLSE'); + + $this->assertResponseIsSuccessful(); + + $item = $crawler->filterXpath('//item'); + $this->assertEquals(0, $item->count()); + } } From 361ffe2dd545dd4ef292d3e26e0150f68dd1f7a6 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 13:58:22 -0400 Subject: [PATCH 103/173] #47: Migrate Id helper tests. --- .../test/Catalog/Action/Helper/OsidIdTest.php | 52 ------------------ tests/Service/Osid/IdMapTest.php | 53 +++++++++++++++++++ 2 files changed, 53 insertions(+), 52 deletions(-) delete mode 100755 application/test/Catalog/Action/Helper/OsidIdTest.php create mode 100644 tests/Service/Osid/IdMapTest.php diff --git a/application/test/Catalog/Action/Helper/OsidIdTest.php b/application/test/Catalog/Action/Helper/OsidIdTest.php deleted file mode 100755 index 0a3240f9..00000000 --- a/application/test/Catalog/Action/Helper/OsidIdTest.php +++ /dev/null @@ -1,52 +0,0 @@ -osidHelper = new Catalog_Action_Helper_Osid(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidHelper); - $this->osidIdHelper = new Catalog_Action_Helper_OsidId(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidIdHelper); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown(): void - { - } - - public function testGetOsidIdFromString() - { - $id = new phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); - $idString = $this->osidIdHelper->toString($id); - - $newId = $this->osidIdHelper->fromString($idString); - $this->assertInstanceOf('osid_id_Id', $newId); - $this->assertTrue($id->isEqual($newId)); - } - - public function testGetStringFromOsidId() - { - $id = new phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); - $idString = $this->osidIdHelper->toString($id); - $this->assertIsString($idString); - - $newId = $this->osidIdHelper->fromString($idString); - $this->assertEquals($idString, $this->osidIdHelper->toString($newId)); - } -} diff --git a/tests/Service/Osid/IdMapTest.php b/tests/Service/Osid/IdMapTest.php new file mode 100644 index 00000000..641cf131 --- /dev/null +++ b/tests/Service/Osid/IdMapTest.php @@ -0,0 +1,53 @@ +osidIdMap = new IdMap('example.edu'); + } + + public function testGetOsidIdFromString() + { + $id = new \phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); + $idString = $this->osidIdMap->toString($id); + $this->assertEquals('123456789.abcd', $idString); + + $newId = $this->osidIdMap->fromString($idString); + $this->assertInstanceOf('osid_id_Id', $newId); + $this->assertTrue($id->isEqual($newId)); + } + + public function testGetStringFromOsidId() + { + $id = new \phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); + $idString = $this->osidIdMap->toString($id); + $this->assertIsString($idString); + + $newId = $this->osidIdMap->fromString($idString); + $this->assertEquals($idString, $this->osidIdMap->toString($newId)); + } + + public function testOtherAuthority() + { + $shortenedId = new \phpkit_id_Id('example.edu', 'urn', '123456789.abcd'); + $shortenedIdString = $this->osidIdMap->toString($shortenedId); + $otherId = new \phpkit_id_Id('example.com', 'urn', '123456789.abcd'); + $otherIdString = $this->osidIdMap->toString($otherId); + $this->assertNotEquals($shortenedIdString, $otherIdString); + + $newId = $this->osidIdMap->fromString($otherIdString); + $this->assertInstanceOf('osid_id_Id', $newId); + $this->assertTrue($otherId->isEqual($newId)); + $this->assertFalse($shortenedId->isEqual($newId)); + } +} From f12b11f7c0bab4d8b7739bb72bea720525faef4c Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 14:31:48 -0400 Subject: [PATCH 104/173] #47: Port remaining application service tests. --- .../Catalog/Action/Helper/OsidTermsTest.php | 80 --------- .../test/Catalog/Action/Helper/OsidTest.php | 40 ----- .../Catalog/Action/Helper/OsidTopicTest.php | 64 -------- .../Catalog/Action/Helper/OsidTypeTest.php | 54 ------- .../Catalog/Action/Helper/OsidTypesTest.php | 42 ----- .../test/Catalog/ApplicationTestTrait.php | 26 --- .../View/Helper/GetTimeStringHelperTest.php | 38 ----- application/test/Catalog/frontend_config.ini | 152 ------------------ phpunit.xml.dist | 7 +- tests/Service/Osid/TermHelperTest.php | 68 ++++++++ tests/Service/Osid/TopicHelperTest.php | 53 ++++++ 11 files changed, 124 insertions(+), 500 deletions(-) delete mode 100755 application/test/Catalog/Action/Helper/OsidTermsTest.php delete mode 100755 application/test/Catalog/Action/Helper/OsidTest.php delete mode 100755 application/test/Catalog/Action/Helper/OsidTopicTest.php delete mode 100755 application/test/Catalog/Action/Helper/OsidTypeTest.php delete mode 100755 application/test/Catalog/Action/Helper/OsidTypesTest.php delete mode 100644 application/test/Catalog/ApplicationTestTrait.php delete mode 100755 application/test/Catalog/View/Helper/GetTimeStringHelperTest.php delete mode 100755 application/test/Catalog/frontend_config.ini create mode 100644 tests/Service/Osid/TermHelperTest.php create mode 100644 tests/Service/Osid/TopicHelperTest.php diff --git a/application/test/Catalog/Action/Helper/OsidTermsTest.php b/application/test/Catalog/Action/Helper/OsidTermsTest.php deleted file mode 100755 index 0f6fafea..00000000 --- a/application/test/Catalog/Action/Helper/OsidTermsTest.php +++ /dev/null @@ -1,80 +0,0 @@ -osidHelper = new Catalog_Action_Helper_Osid(); - $this->osidHelper->setConfigPath($this->getTestConfigPath()); - Zend_Controller_Action_HelperBroker::addHelper($this->osidHelper); - $this->osidIdHelper = new Catalog_Action_Helper_OsidId(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidIdHelper); - $this->osidTermsHelper = new Catalog_Action_Helper_OsidTerms(); - $this->osidHelper->setConfigPath($this->getTestConfigPath()); - Zend_Controller_Action_HelperBroker::addHelper($this->osidTermsHelper); - - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); - $this->spring2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200920'); - $this->fall2009TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200990'); - $this->fall2008TermId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); - - $this->termLookup = $this->osidHelper->getCourseManager()->getTermLookupSessionForCatalog($this->mcugId); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown(): void - { - } - - public function testGetCurrentTermId() - { - $this->assertInstanceOf('osid_id_Id', $this->osidTermsHelper->getCurrentTermId($this->mcugId)); - } - - public function testFindClosestTermId() - { - $testDate = new DateTime('2009-09-30'); - $terms = $this->termLookup->getTerms(); - $closestTermId = $this->osidTermsHelper->findClosestTermId($terms, $testDate); - $this->assertTrue($closestTermId->isEqual($this->fall2009TermId)); - } - - public function testFindlosestNonOverlappingTermIdA() - { - $testDate = new DateTime('2009-08-15'); - $terms = $this->termLookup->getTerms(); - $closestTermId = $this->osidTermsHelper->findClosestTermId($terms, $testDate); - $this->assertTrue($closestTermId->isEqual($this->fall2009TermId)); - } - - public function testFindClosestNonOverlappingTermIdB() - { - $testDate = new DateTime('2009-06-15'); - $terms = $this->termLookup->getTerms(); - $closestTermId = $this->osidTermsHelper->findClosestTermId($terms, $testDate); - $this->assertTrue($closestTermId->isEqual($this->spring2009TermId)); - } - - public function testFindClosestTermIdBeyondRange() - { - $testDate = new DateTime('2020-01-01'); - $terms = $this->termLookup->getTerms(); - $closestTermId = $this->osidTermsHelper->findClosestTermId($terms, $testDate); - $this->assertTrue($closestTermId->isEqual($this->fall2009TermId)); - } -} diff --git a/application/test/Catalog/Action/Helper/OsidTest.php b/application/test/Catalog/Action/Helper/OsidTest.php deleted file mode 100755 index c5dd67e5..00000000 --- a/application/test/Catalog/Action/Helper/OsidTest.php +++ /dev/null @@ -1,40 +0,0 @@ -osidHelper = new Catalog_Action_Helper_Osid(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidHelper); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown(): void - { - } - - public function testGetCourseManager() - { - $this->assertInstanceOf('osid_course_CourseManager', $this->osidHelper->getCourseManager()); - } - - public function testGetRuntimeManager() - { - $this->assertInstanceOf('osid_OsidRuntimeManager', $this->osidHelper->getRuntimeManager()); - } -} diff --git a/application/test/Catalog/Action/Helper/OsidTopicTest.php b/application/test/Catalog/Action/Helper/OsidTopicTest.php deleted file mode 100755 index 961783c8..00000000 --- a/application/test/Catalog/Action/Helper/OsidTopicTest.php +++ /dev/null @@ -1,64 +0,0 @@ -osidHelper = new Catalog_Action_Helper_Osid(); - $this->osidHelper->setConfigPath($this->getTestConfigPath()); - Zend_Controller_Action_HelperBroker::addHelper($this->osidHelper); - $this->osidIdHelper = new Catalog_Action_Helper_OsidId(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidIdHelper); - $this->osidTopicHelper = new Catalog_Action_Helper_Topics(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidTopicHelper); - - $this->mcugId = new phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); - - $this->topicLookup = $this->osidHelper->getCourseManager()->getTopicLookupSessionForCatalog($this->mcugId); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown(): void - { - } - - public function testTopicListAsArray() - { - $topics = $this->topicLookup->getTopics(); - $numTopics = $topics->available(); - $topicArray = $this->osidTopicHelper->topicListAsArray($topics); - $this->assertIsArray($topicArray); - $this->assertCount($numTopics, $topicArray); - $this->assertInstanceOf('osid_course_Topic', $topicArray[0]); - } - - public function testFilterTopicsByType() - { - $topics = $this->topicLookup->getTopics(); - $numTopics = $topics->available(); - $topicArray = $this->osidTopicHelper->topicListAsArray($topics); - - $subjectType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); - - $filteredTopics = $this->osidTopicHelper->filterTopicsByType($topicArray, $subjectType); - $this->assertIsArray($filteredTopics); - $this->assertLessThan($numTopics, count($filteredTopics)); - $this->assertCount(4, $filteredTopics); - $this->assertInstanceOf('osid_course_Topic', $filteredTopics[0]); - } -} diff --git a/application/test/Catalog/Action/Helper/OsidTypeTest.php b/application/test/Catalog/Action/Helper/OsidTypeTest.php deleted file mode 100755 index a47b7c59..00000000 --- a/application/test/Catalog/Action/Helper/OsidTypeTest.php +++ /dev/null @@ -1,54 +0,0 @@ -osidHelper = new Catalog_Action_Helper_Osid(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidHelper); - $this->osidIdHelper = new Catalog_Action_Helper_OsidId(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidIdHelper); - $this->osidTypeHelper = new Catalog_Action_Helper_OsidType(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidIdHelper); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown(): void - { - } - - public function testGetOsidTypeFromString() - { - $type = new phpkit_type_Type('urn', 'example.edu', '123456789.abcd'); - $typeString = $this->osidTypeHelper->toString($type); - - $newType = $this->osidTypeHelper->fromString($typeString); - $this->assertInstanceOf('osid_type_Type', $newType); - $this->assertTrue($type->isEqual($newType)); - } - - public function testGetStringFromOsidType() - { - $type = new phpkit_type_Type('urn', 'example.edu', '123456789.abcd'); - $typeString = $this->osidTypeHelper->toString($type); - $this->assertIsString($typeString); - - $newType = $this->osidTypeHelper->fromString($typeString); - $this->assertEquals($typeString, $this->osidTypeHelper->toString($newType)); - } -} diff --git a/application/test/Catalog/Action/Helper/OsidTypesTest.php b/application/test/Catalog/Action/Helper/OsidTypesTest.php deleted file mode 100755 index f6f1dc8f..00000000 --- a/application/test/Catalog/Action/Helper/OsidTypesTest.php +++ /dev/null @@ -1,42 +0,0 @@ -osidHelper = new Catalog_Action_Helper_Osid(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidHelper); - $this->osidIdHelper = new Catalog_Action_Helper_OsidId(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidIdHelper); - $this->osidTypesHelper = new Catalog_Action_Helper_OsidTypes(); - Zend_Controller_Action_HelperBroker::addHelper($this->osidTypesHelper); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown(): void - { - } - - public function testGetDefaultGenusTypes() - { - // Remove the following lines when you implement this test. - $this->markTestIncomplete( - 'This test has not been implemented yet.' - ); - } -} diff --git a/application/test/Catalog/ApplicationTestTrait.php b/application/test/Catalog/ApplicationTestTrait.php deleted file mode 100644 index d2cd1b6f..00000000 --- a/application/test/Catalog/ApplicationTestTrait.php +++ /dev/null @@ -1,26 +0,0 @@ -config = new Zend_Config_Ini(__DIR__.'/frontend_config.ini', 'development'); - } - - /** - * Answer the configuration path to be used when running tests. - */ - public function getTestConfigPath() - { - return __DIR__.'/../apc/configuration.plist'; - } -} diff --git a/application/test/Catalog/View/Helper/GetTimeStringHelperTest.php b/application/test/Catalog/View/Helper/GetTimeStringHelperTest.php deleted file mode 100755 index 83738ebe..00000000 --- a/application/test/Catalog/View/Helper/GetTimeStringHelperTest.php +++ /dev/null @@ -1,38 +0,0 @@ -helper = new Catalog_View_Helper_GetTimeString(); - } - - /** - * Tears down the fixture, for example, closes a network connection. - * This method is called after a test is executed. - */ - protected function tearDown(): void - { - } - - public function testGetTimeString() - { - $this->assertEquals('12:00 am', $this->helper->getTimeString(0)); - $this->assertEquals('8:33 am', $this->helper->getTimeString(30780)); - $this->assertEquals('6:21 pm', $this->helper->getTimeString(66060)); - $this->assertEquals('12:00 am', $this->helper->getTimeString(86400)); - } -} diff --git a/application/test/Catalog/frontend_config.ini b/application/test/Catalog/frontend_config.ini deleted file mode 100755 index d2a4456e..00000000 --- a/application/test/Catalog/frontend_config.ini +++ /dev/null @@ -1,152 +0,0 @@ -[production] -phpSettings.display_startup_errors = 0 -phpSettings.display_errors = 0 - -# Select the authentication type to use, 'cas' or 'none' -authType = none - -cas.host = login.middlebury.edu -cas.port = 443 -cas.path = /cas -cas.server_cert = - -# Number of seconds, for the Cache-Control header. -cache_control.max_age = 3600 -# Number of seconds, for the Expires header, may be positive or negative -cache_control.expiration_offset = 3600 - - -# Default course offering types to select in the search UI. -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.LCT" -catalog.default_offering_genus_types_to_search[] = "urn:inet:middlebury.edu:genera:offering.SEM" - -# The Id authority to shorten for prettier URLs. -catalog.shorten_ids_for_authority = "middlebury.edu" - -# A map of topics to external URLs. This allows linking out to external sites for -# departments or programs. -catalog.topic_map.ALAC.id = "topic.department.ALAC" -catalog.topic_map.ALAC.url = "http://go.middlebury.edu/ALAC" -catalog.topic_map.AMCV.id = "topic.department.AMCV" -catalog.topic_map.AMCV.url = "http://go.middlebury.edu/AMCV" -catalog.topic_map.AMLT.id = "topic.department.AMLT" -catalog.topic_map.AMLT.url = "http://go.middlebury.edu/AMLT" -catalog.topic_map.AMST.id = "topic.department.AMST" -catalog.topic_map.AMST.url = "http://go.middlebury.edu/AMST" -catalog.topic_map.ARBC.id = "topic.department.ARBC" -catalog.topic_map.ARBC.url = "http://go.middlebury.edu/ARBC" -catalog.topic_map.ARDV.id = "topic.department.ARDV" -catalog.topic_map.ARDV.url = "http://go.middlebury.edu/ARDV" -catalog.topic_map.ART.id = "topic.department.ART" -catalog.topic_map.ART.url = "http://go.middlebury.edu/ART" -catalog.topic_map.BIOL.id = "topic.department.BIOL" -catalog.topic_map.BIOL.url = "http://go.middlebury.edu/BIOL" -catalog.topic_map.CHEM.id = "topic.department.CHEM" -catalog.topic_map.CHEM.url = "http://go.middlebury.edu/CHEM" -catalog.topic_map.CHNS.id = "topic.department.CHNS" -catalog.topic_map.CHNS.url = "http://go.middlebury.edu/CHNS" -catalog.topic_map.CLAS.id = "topic.department.CLAS" -catalog.topic_map.CLAS.url = "http://go.middlebury.edu/CLAS" -catalog.topic_map.CSCI.id = "topic.department.CSCI" -catalog.topic_map.CSCI.url = "http://go.middlebury.edu/CSCI" -catalog.topic_map.DANC.id = "topic.department.DANC" -catalog.topic_map.DANC.url = "http://go.middlebury.edu/DANC" -catalog.topic_map.ECON.id = "topic.department.ECON" -catalog.topic_map.ECON.url = "http://go.middlebury.edu/ECON" -catalog.topic_map.EDST.id = "topic.department.EDST" -catalog.topic_map.EDST.url = "http://go.middlebury.edu/EDST" -catalog.topic_map.ENAM.id = "topic.department.ENAM" -catalog.topic_map.ENAM.url = "http://go.middlebury.edu/ENAM" -catalog.topic_map.ENGL.id = "topic.department.ENGL" -catalog.topic_map.ENGL.url = "http://go.middlebury.edu/ENGL" -catalog.topic_map.ENVS.id = "topic.department.ENVS" -catalog.topic_map.ENVS.url = "http://go.middlebury.edu/ENVS" -catalog.topic_map.FMMC.id = "topic.department.FMMC" -catalog.topic_map.FMMC.url = "http://go.middlebury.edu/FMMC" -catalog.topic_map.FREN.id = "topic.department.FREN" -catalog.topic_map.FREN.url = "http://go.middlebury.edu/FREN" -catalog.topic_map.FYSE.id = "topic.department.FYSE" -catalog.topic_map.FYSE.url = "http://go.middlebury.edu/FYSE" -catalog.topic_map.GEOG.id = "topic.department.GEOG" -catalog.topic_map.GEOG.url = "http://go.middlebury.edu/GEOG" -catalog.topic_map.GEOL.id = "topic.department.GEOL" -catalog.topic_map.GEOL.url = "http://go.middlebury.edu/GEOL" -catalog.topic_map.GRMN.id = "topic.department.GRMN" -catalog.topic_map.GRMN.url = "http://go.middlebury.edu/GRMN" -catalog.topic_map.HARC.id = "topic.department.HARC" -catalog.topic_map.HARC.url = "http://go.middlebury.edu/HARC" -catalog.topic_map.HIST.id = "topic.department.HIST" -catalog.topic_map.HIST.url = "http://go.middlebury.edu/HIST" -catalog.topic_map.HUDV.id = "topic.department.HUDV" -catalog.topic_map.HUDV.url = "http://go.middlebury.edu/HUDV" -catalog.topic_map.INDE.id = "topic.department.INDE" -catalog.topic_map.INDE.url = "http://go.middlebury.edu/INDE" -catalog.topic_map.INTD.id = "topic.department.INTD" -catalog.topic_map.INTD.url = "http://go.middlebury.edu/INTD" -catalog.topic_map.INTL.id = "topic.department.INTL" -catalog.topic_map.INTL.url = "http://go.middlebury.edu/INTL" -catalog.topic_map.IPEC.id = "topic.department.IPEC" -catalog.topic_map.IPEC.url = "http://go.middlebury.edu/IPEC" -catalog.topic_map.ISEA.id = "topic.department.ISEA" -catalog.topic_map.ISEA.url = "http://go.middlebury.edu/ISEA" -catalog.topic_map.ISRU.id = "topic.department.ISRU" -catalog.topic_map.ISRU.url = "http://go.middlebury.edu/ISRU" -catalog.topic_map.ITAL.id = "topic.department.ITAL" -catalog.topic_map.ITAL.url = "http://go.middlebury.edu/ITAL" -catalog.topic_map.JAPN.id = "topic.department.JAPN" -catalog.topic_map.JAPN.url = "http://go.middlebury.edu/JAPN" -catalog.topic_map.LITP.id = "topic.department.LITP" -catalog.topic_map.LITP.url = "http://go.middlebury.edu/LITP" -catalog.topic_map.LITS.id = "topic.department.LITS" -catalog.topic_map.LITS.url = "http://go.middlebury.edu/LITS" -catalog.topic_map.MATH.id = "topic.department.MATH" -catalog.topic_map.MATH.url = "http://go.middlebury.edu/MATH" -catalog.topic_map.MBBC.id = "topic.department.MBBC" -catalog.topic_map.MBBC.url = "http://go.middlebury.edu/MBBC" -catalog.topic_map.MUSC.id = "topic.department.MUSC" -catalog.topic_map.MUSC.url = "http://go.middlebury.edu/MUSC" -catalog.topic_map.NSCI.id = "topic.department.NSCI" -catalog.topic_map.NSCI.url = "http://go.middlebury.edu/NSCI" -catalog.topic_map.PGSE.id = "topic.department.PGSE" -catalog.topic_map.PGSE.url = "http://go.middlebury.edu/PGSE" -catalog.topic_map.PHED.id = "topic.department.PHED" -catalog.topic_map.PHED.url = "http://go.middlebury.edu/PHED" -catalog.topic_map.PHIL.id = "topic.department.PHIL" -catalog.topic_map.PHIL.url = "http://go.middlebury.edu/PHIL" -catalog.topic_map.PHYS.id = "topic.department.PHYS" -catalog.topic_map.PHYS.url = "http://go.middlebury.edu/PHYS" -catalog.topic_map.PSCI.id = "topic.department.PSCI" -catalog.topic_map.PSCI.url = "http://go.middlebury.edu/PSCI" -catalog.topic_map.PSYC.id = "topic.department.PSYC" -catalog.topic_map.PSYC.url = "http://go.middlebury.edu/PSYC" -catalog.topic_map.RELI.id = "topic.department.RELI" -catalog.topic_map.RELI.url = "http://go.middlebury.edu/RELI" -catalog.topic_map.RUSS.id = "topic.department.RUSS" -catalog.topic_map.RUSS.url = "http://go.middlebury.edu/RUSS" -catalog.topic_map.SISP.id = "topic.department.SISP" -catalog.topic_map.SISP.url = "http://go.middlebury.edu/SISP" -catalog.topic_map.SOAN.id = "topic.department.SOAN" -catalog.topic_map.SOAN.url = "http://go.middlebury.edu/SOAN" -catalog.topic_map.SPAN.id = "topic.department.SPAN" -catalog.topic_map.SPAN.url = "http://go.middlebury.edu/SPAN" -catalog.topic_map.STLD.id = "topic.department.STLD" -catalog.topic_map.STLD.url = "http://go.middlebury.edu/STLD" -catalog.topic_map.TEDU.id = "topic.department.TEDU" -catalog.topic_map.TEDU.url = "http://go.middlebury.edu/TEDU" -catalog.topic_map.THEA.id = "topic.department.THEA" -catalog.topic_map.THEA.url = "http://go.middlebury.edu/THEA" -catalog.topic_map.WAGS.id = "topic.department.WAGS" -catalog.topic_map.WAGS.url = "http://go.middlebury.edu.WAGS" -catalog.topic_map.WRPR.id = "topic.department.WRPR" -catalog.topic_map.WRPR.url = "http:..go.middlebury.edu.WRPR" - - -[staging : production] - -[testing : production] -phpSettings.display_startup_errors = 1 -phpSettings.display_errors = 1 - -[development : production] -phpSettings.display_startup_errors = 1 -phpSettings.display_errors = 1 diff --git a/phpunit.xml.dist b/phpunit.xml.dist index e8d969ee..604f78aa 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -28,14 +28,13 @@ application/test/apc - - application/test/Catalog + + tests/Service application/test/banner application/test/apc - tests/Controller - application/test/Catalog + tests diff --git a/tests/Service/Osid/TermHelperTest.php b/tests/Service/Osid/TermHelperTest.php new file mode 100644 index 00000000..ff04bfe5 --- /dev/null +++ b/tests/Service/Osid/TermHelperTest.php @@ -0,0 +1,68 @@ +mcugId = new \phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + $this->spring2009TermId = new \phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200920'); + $this->fall2009TermId = new \phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200990'); + $this->fall2008TermId = new \phpkit_id_URNInetId('urn:inet:middlebury.edu:term.200890'); + + $this->osidTermHelper = static::getContainer() + ->get(TermHelper::class); + $this->termLookup = static::getContainer() + ->get(Runtime::class) + ->getCourseManager() + ->getTermLookupSessionForCatalog($this->mcugId); + } + + public function testGetCurrentTermId() + { + $this->assertInstanceOf('osid_id_Id', $this->osidTermHelper->getCurrentTermId($this->mcugId)); + } + + public function testFindClosestTermId() + { + $testDate = new \DateTime('2009-09-30'); + $terms = $this->termLookup->getTerms(); + $closestTermId = $this->osidTermHelper->findClosestTermId($terms, $testDate); + $this->assertTrue($closestTermId->isEqual($this->fall2009TermId)); + } + + public function testFindlosestNonOverlappingTermIdA() + { + $testDate = new \DateTime('2009-08-15'); + $terms = $this->termLookup->getTerms(); + $closestTermId = $this->osidTermHelper->findClosestTermId($terms, $testDate); + $this->assertTrue($closestTermId->isEqual($this->fall2009TermId)); + } + + public function testFindClosestNonOverlappingTermIdB() + { + $testDate = new \DateTime('2009-06-15'); + $terms = $this->termLookup->getTerms(); + $closestTermId = $this->osidTermHelper->findClosestTermId($terms, $testDate); + $this->assertTrue($closestTermId->isEqual($this->spring2009TermId)); + } + + public function testFindClosestTermIdBeyondRange() + { + $testDate = new \DateTime('2020-01-01'); + $terms = $this->termLookup->getTerms(); + $closestTermId = $this->osidTermHelper->findClosestTermId($terms, $testDate); + $this->assertTrue($closestTermId->isEqual($this->fall2009TermId)); + } +} diff --git a/tests/Service/Osid/TopicHelperTest.php b/tests/Service/Osid/TopicHelperTest.php new file mode 100644 index 00000000..84c6e393 --- /dev/null +++ b/tests/Service/Osid/TopicHelperTest.php @@ -0,0 +1,53 @@ +mcugId = new \phpkit_id_URNInetId('urn:inet:middlebury.edu:catalog.MCUG'); + + $this->osidTopicHelper = static::getContainer() + ->get(TopicHelper::class); + $this->topicLookup = static::getContainer() + ->get(Runtime::class) + ->getCourseManager() + ->getTopicLookupSessionForCatalog($this->mcugId); + } + + public function testTopicListAsArray() + { + $topics = $this->topicLookup->getTopics(); + $numTopics = $topics->available(); + $topicArray = $this->osidTopicHelper->topicListAsArray($topics); + $this->assertIsArray($topicArray); + $this->assertCount($numTopics, $topicArray); + $this->assertInstanceOf('osid_course_Topic', $topicArray[0]); + } + + public function testFilterTopicsByType() + { + $topics = $this->topicLookup->getTopics(); + $numTopics = $topics->available(); + $topicArray = $this->osidTopicHelper->topicListAsArray($topics); + + $subjectType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:genera:topic.subject'); + + $filteredTopics = $this->osidTopicHelper->filterTopicsByType($topicArray, $subjectType); + $this->assertIsArray($filteredTopics); + $this->assertLessThan($numTopics, count($filteredTopics)); + $this->assertCount(4, $filteredTopics); + $this->assertInstanceOf('osid_course_Topic', $filteredTopics[0]); + } +} From b07ea2c74aca4035642f0fde1a081fed12e883f0 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 14:32:12 -0400 Subject: [PATCH 105/173] #47: Test type serialization and fix argument order. --- src/Service/Osid/IdMap.php | 2 +- tests/Service/Osid/IdMapTest.php | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/Service/Osid/IdMap.php b/src/Service/Osid/IdMap.php index 813c5199..db1c05d8 100755 --- a/src/Service/Osid/IdMap.php +++ b/src/Service/Osid/IdMap.php @@ -65,7 +65,7 @@ public function typeFromString($typeString) return new \phpkit_type_URNInetType($typeString); } catch (\osid_InvalidArgumentException $e) { if ($this->getIdAuthorityToShorten()) { - return new \phpkit_type_Type($this->getIdAuthorityToShorten(), 'urn', $typeString); + return new \phpkit_type_Type('urn', $this->getIdAuthorityToShorten(), $typeString); } else { throw $e; } diff --git a/tests/Service/Osid/IdMapTest.php b/tests/Service/Osid/IdMapTest.php index 641cf131..c14354cf 100644 --- a/tests/Service/Osid/IdMapTest.php +++ b/tests/Service/Osid/IdMapTest.php @@ -50,4 +50,29 @@ public function testOtherAuthority() $this->assertTrue($otherId->isEqual($newId)); $this->assertFalse($shortenedId->isEqual($newId)); } + + public function testGetOsidTypeFromString() + { + $type = new \phpkit_type_Type('urn', 'example.edu', '123456789.abcd'); + $typeString = $this->osidIdMap->typeToString($type); + $this->assertEquals('123456789.abcd', $typeString); + + $newType = $this->osidIdMap->typeFromString($typeString); + $this->assertInstanceOf('osid_type_Type', $newType); + $this->assertTrue($type->isEqual($newType)); + } + + public function testOtherTypeAuthority() + { + $shortenedType = new \phpkit_type_Type('urn', 'example.edu', '123456789.abcd'); + $shortenedTypeString = $this->osidIdMap->typeToString($shortenedType); + $otherType = new \phpkit_type_Type('urn', 'example.com', '123456789.abcd'); + $otherTypeString = $this->osidIdMap->typeToString($otherType); + $this->assertNotEquals($shortenedTypeString, $otherTypeString); + + $newType = $this->osidIdMap->typeFromString($otherTypeString); + $this->assertInstanceOf('osid_type_Type', $newType); + $this->assertTrue($otherType->isEqual($newType)); + $this->assertFalse($shortenedType->isEqual($newType)); + } } From 6f3f4b1209288c8caac70eedd7088a06555b4f1b Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 14:58:39 -0400 Subject: [PATCH 106/173] #47: Fix missing parameter notices. --- application/library/banner/course/Course/Search/Order.php | 2 +- application/library/banner/course/Course/Search/Search.php | 2 +- .../library/banner/course/CourseOffering/Search/Search.php | 2 +- application/library/banner/course/Topic/Search/Search.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/library/banner/course/Course/Search/Order.php b/application/library/banner/course/Course/Search/Order.php index 537cdfdf..748d8293 100755 --- a/application/library/banner/course/Course/Search/Order.php +++ b/application/library/banner/course/Course/Search/Order.php @@ -131,6 +131,6 @@ public function orderByPrereqInfo() */ public function getCourseSearchOrderRecord(osid_type_Type $courseRecordType) { - throw new osid_UnsupportedException(); + throw new osid_UnsupportedException("The CourseRecordType passed is not supported."); } } diff --git a/application/library/banner/course/Course/Search/Search.php b/application/library/banner/course/Course/Search/Search.php index 5abdd0ad..64eb4e52 100755 --- a/application/library/banner/course/Course/Search/Search.php +++ b/application/library/banner/course/Course/Search/Search.php @@ -96,6 +96,6 @@ public function orderCourseResults(osid_course_CourseSearchOrder $courseSearchOr */ public function getCourseSearchRecord(osid_type_Type $courseSearchRecordType) { - throw new osid_UnsupportedException(); + throw new osid_UnsupportedException("The CourseSearchRecordType passed is not supported."); } } diff --git a/application/library/banner/course/CourseOffering/Search/Search.php b/application/library/banner/course/CourseOffering/Search/Search.php index f99063fb..6c332ad6 100755 --- a/application/library/banner/course/CourseOffering/Search/Search.php +++ b/application/library/banner/course/CourseOffering/Search/Search.php @@ -101,6 +101,6 @@ public function orderCourseOfferingResults(osid_course_CourseOfferingSearchOrder */ public function getCourseOfferingSearchRecord(osid_type_Type $courseOfferingSearchRecordType) { - throw new osid_UnsupportedException(); + throw new osid_UnsupportedException("The CourseOfferingSearchRecordType passed is not supported."); } } diff --git a/application/library/banner/course/Topic/Search/Search.php b/application/library/banner/course/Topic/Search/Search.php index c9bf90b8..7d747dfb 100755 --- a/application/library/banner/course/Topic/Search/Search.php +++ b/application/library/banner/course/Topic/Search/Search.php @@ -143,6 +143,6 @@ public function orderTopicResults(osid_course_TopicSearchOrder $topicSearchOrder */ public function getTopicSearchRecord(osid_type_Type $topicSearchRecordType) { - throw new osid_UnsupportedException(); + throw new osid_UnsupportedException("The TopicSearchRecordType passed is not supported."); } } From 6e4f772e74bd97e3fad77d57e4549e2c7a35327d Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 15:36:44 -0400 Subject: [PATCH 107/173] #47: Use symfony_test as the test name to align with Doctrine. --- application/test/banner/configuration.plist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/test/banner/configuration.plist b/application/test/banner/configuration.plist index 550fe949..bc1fe3f1 100755 --- a/application/test/banner/configuration.plist +++ b/application/test/banner/configuration.plist @@ -7,7 +7,7 @@ urn:inet:middlebury.edu:config:banner_course.pdo_count_queries urn:inet:middlebury.edu:config:banner_course.pdo_dsn - mysql:dbname=test;host=database + mysql:dbname=symfony_test;host=database urn:inet:middlebury.edu:config:banner_course.pdo_password symfony urn:inet:middlebury.edu:config:banner_course.pdo_username From 2adb01970776cac08f848faa6824314911db8bb1 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 16:16:09 -0400 Subject: [PATCH 108/173] #47: Create the non-banner test tables and tests for Bookmarks Controller. --- application/sql/drop_user_schedules.sql | 4 ++ application/test/banner/DatabaseTestTrait.php | 17 ++++-- tests/AppDatabaseTestTrait.php | 40 +++++++++++++ tests/Controller/BookmarksTest.php | 56 +++++++++++++++++++ 4 files changed, 112 insertions(+), 5 deletions(-) create mode 100644 application/sql/drop_user_schedules.sql create mode 100644 tests/AppDatabaseTestTrait.php create mode 100644 tests/Controller/BookmarksTest.php diff --git a/application/sql/drop_user_schedules.sql b/application/sql/drop_user_schedules.sql new file mode 100644 index 00000000..acc6a20d --- /dev/null +++ b/application/sql/drop_user_schedules.sql @@ -0,0 +1,4 @@ +DROP TABLE IF EXISTS `user_schedule_offerings`; +DROP TABLE IF EXISTS `user_schedules`; +DROP TABLE IF EXISTS `user_savedcourses`; +DROP TABLE IF EXISTS `user_catalog`; diff --git a/application/test/banner/DatabaseTestTrait.php b/application/test/banner/DatabaseTestTrait.php index 50ea408f..f80cfac3 100644 --- a/application/test/banner/DatabaseTestTrait.php +++ b/application/test/banner/DatabaseTestTrait.php @@ -37,6 +37,16 @@ public static function tearDownDatabase(): void self::resetMemoryLimit(); } + public static function getDB() + { + if (empty(self::$courseManager)) { + self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(__DIR__.'/configuration.plist'); + self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'banner_course_CourseManager', '3.0.0'); + } + + return self::$courseManager->getDB(); + } + /** * Load the banner testing database. * @@ -44,11 +54,8 @@ public static function tearDownDatabase(): void */ public static function loadBannerDb() { - self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(__DIR__.'/configuration.plist'); - self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'banner_course_CourseManager', '3.0.0'); - // Initialize our testing database - $db = self::$courseManager->getDB(); + $db = self::getDB(); harmoni_SQLUtils::runSQLfile(__DIR__.'/sql/drop_tables.sql', $db); harmoni_SQLUtils::runSQLfile(APPLICATION_PATH.'/library/banner/sql/table_creation.sql', $db); harmoni_SQLUtils::runSQLfile(__DIR__.'/sql/test_data.sql', $db); @@ -73,7 +80,7 @@ public static function loadBannerDb() public static function emptyBannerDbAndClose() { // Remove our testing database - $db = self::$courseManager->getDB(); + $db = self::getDB(); if (method_exists($db, 'getCounters')) { $maxName = 0; $maxNum = 0; diff --git a/tests/AppDatabaseTestTrait.php b/tests/AppDatabaseTestTrait.php new file mode 100644 index 00000000..70265b9f --- /dev/null +++ b/tests/AppDatabaseTestTrait.php @@ -0,0 +1,40 @@ +user = new SamlUser('WEBID99999990'); + $this->user->setSamlAttributes([ + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress' => 'honeybear@milne.example.com', + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname' => 'Winnie', + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname' => 'The-Pooh', + ]); + } + + public function testAdd(): void + { + $client = static::createClient(); + $client->loginUser($this->user); + $crawler = $client->request('GET', '/bookmarks/add/course.PHYS0201'); + + $this->assertResponseIsSuccessful(); + $this->assertSelectorCount(1, 'response success'); + + $crawler = $client->request('GET', '/bookmarks/add/course.PHYS0201'); + $this->assertResponseIsSuccessful(); + $this->assertSelectorCount(1, 'response error'); + $this->assertSelectorTextSame('response error', 'Bookmark already added.'); + } + + public function testRemove(): void + { + $client = static::createClient(); + $client->loginUser($this->user); + $crawler = $client->request('GET', '/bookmarks/add/course.CHEM0104'); + + $this->assertResponseIsSuccessful(); + $this->assertSelectorCount(1, 'response success'); + + $crawler = $client->request('GET', '/bookmarks/remove/course.CHEM0104'); + $this->assertResponseIsSuccessful(); + $this->assertSelectorCount(1, 'response success'); + + // Success is returned even if the bookmark is already gone. + $crawler = $client->request('GET', '/bookmarks/remove/course.CHEM0104'); + $this->assertResponseIsSuccessful(); + $this->assertSelectorCount(1, 'response success'); + } +} From 38b871ba749c446437ebdce9f80c16c1ce0ee8f6 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 16:16:32 -0400 Subject: [PATCH 109/173] #47: Run `php-cs-fixer fix` for coding style. --- application/library/banner/course/Course/Search/Order.php | 2 +- application/library/banner/course/Course/Search/Search.php | 2 +- .../library/banner/course/CourseOffering/Search/Search.php | 2 +- application/library/banner/course/Topic/Search/Search.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/library/banner/course/Course/Search/Order.php b/application/library/banner/course/Course/Search/Order.php index 748d8293..8076997d 100755 --- a/application/library/banner/course/Course/Search/Order.php +++ b/application/library/banner/course/Course/Search/Order.php @@ -131,6 +131,6 @@ public function orderByPrereqInfo() */ public function getCourseSearchOrderRecord(osid_type_Type $courseRecordType) { - throw new osid_UnsupportedException("The CourseRecordType passed is not supported."); + throw new osid_UnsupportedException('The CourseRecordType passed is not supported.'); } } diff --git a/application/library/banner/course/Course/Search/Search.php b/application/library/banner/course/Course/Search/Search.php index 64eb4e52..837275ad 100755 --- a/application/library/banner/course/Course/Search/Search.php +++ b/application/library/banner/course/Course/Search/Search.php @@ -96,6 +96,6 @@ public function orderCourseResults(osid_course_CourseSearchOrder $courseSearchOr */ public function getCourseSearchRecord(osid_type_Type $courseSearchRecordType) { - throw new osid_UnsupportedException("The CourseSearchRecordType passed is not supported."); + throw new osid_UnsupportedException('The CourseSearchRecordType passed is not supported.'); } } diff --git a/application/library/banner/course/CourseOffering/Search/Search.php b/application/library/banner/course/CourseOffering/Search/Search.php index 6c332ad6..58bb18b5 100755 --- a/application/library/banner/course/CourseOffering/Search/Search.php +++ b/application/library/banner/course/CourseOffering/Search/Search.php @@ -101,6 +101,6 @@ public function orderCourseOfferingResults(osid_course_CourseOfferingSearchOrder */ public function getCourseOfferingSearchRecord(osid_type_Type $courseOfferingSearchRecordType) { - throw new osid_UnsupportedException("The CourseOfferingSearchRecordType passed is not supported."); + throw new osid_UnsupportedException('The CourseOfferingSearchRecordType passed is not supported.'); } } diff --git a/application/library/banner/course/Topic/Search/Search.php b/application/library/banner/course/Topic/Search/Search.php index 7d747dfb..17927735 100755 --- a/application/library/banner/course/Topic/Search/Search.php +++ b/application/library/banner/course/Topic/Search/Search.php @@ -143,6 +143,6 @@ public function orderTopicResults(osid_course_TopicSearchOrder $topicSearchOrder */ public function getTopicSearchRecord(osid_type_Type $topicSearchRecordType) { - throw new osid_UnsupportedException("The TopicSearchRecordType passed is not supported."); + throw new osid_UnsupportedException('The TopicSearchRecordType passed is not supported.'); } } From 9610d86acc587c62f9c7d1f89c9f3edde7f08388 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 17:06:00 -0400 Subject: [PATCH 110/173] #47: Add Offerings controller tests. --- tests/Controller/OfferingsTest.php | 133 +++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 tests/Controller/OfferingsTest.php diff --git a/tests/Controller/OfferingsTest.php b/tests/Controller/OfferingsTest.php new file mode 100644 index 00000000..5bcc3921 --- /dev/null +++ b/tests/Controller/OfferingsTest.php @@ -0,0 +1,133 @@ +request('GET', '/offerings/list/catalog.MCUG/term.200690'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a:contains("PHYS0201A-F06")')->count()); + } + + public function testListCurrent(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/list/catalog.MCUG/CURRENT'); + + $this->assertResponseIsSuccessful(); + + $this->assertGreaterThan(0, $crawler->filter('a:contains("PHYS0201A-F09")')->count()); + } + + public function testView(): void + { + $client = static::createClient(); + $client->followRedirects(false); + $crawler = $client->request('GET', '/offerings/view/section.200990.90036'); + + $this->assertResponseIsSuccessful(); + $this->assertGreaterThan(0, $crawler->filter('h2:contains("General Chemistry II")')->count()); + } + + public function testViewXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/viewxml/section.200990.90036'); + + $this->assertResponseIsSuccessful(); + + $this->assertSelectorTextContains('channel item catalog\:title', 'General Chemistry II'); + } + + public function testSearchForm(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/search/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + + $this->assertSelectorExists('form'); + } + + public function testSearchFormSubmitAnyTerm(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/search/catalog.MCUG?search=Search&term=ANY'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorExists('form'); + $this->assertSelectorTextContains('.search_results', 'General Chemistry II'); + } + + public function testSearchFormSubmitWithTerm(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/search/catalog.MCUG?search=Search&term=term.200990'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorExists('form'); + $this->assertSelectorTextContains('.search_results', 'General Chemistry II'); + } + + public function testSearchFormSubmitWithTermAndDepartment(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/search/catalog.MCUG?search=Search&term=term.200990&department=topic.department.CHEM'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorExists('form'); + $this->assertSelectorTextContains('.search_results', 'General Chemistry II'); + } + + public function testSearchFormSubmitWithKeyword(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/search/catalog.MCUG?search=Search&term=term.200990&keyword=General'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorExists('form'); + $this->assertSelectorTextContains('.search_results', 'General Chemistry II'); + $this->assertSelectorTextContains('.search_results', 'CHEM0104Z-F09'); + } + + public function testSearchFormSubmitType(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/search/catalog.MCUG?search=Search&term=term.200990&keyword=General&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorExists('form'); + $this->assertSelectorTextContains('.search_results', 'General Chemistry II'); + $this->assertSelectorTextNotContains('.search_results', 'CHEM0104Z-F09'); + } + + public function testSearchXmlWithTermAndDepartment(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/offerings/searchxml/catalog.MCUG?search=Search&term=term.200990&department=topic.department.CHEM'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + $this->assertSelectorTextContains('catalog\:title', 'General Chemistry II'); + } +} From 6ff87e1f8edea8255d3dc9ab988eee80a82027ad Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 17:06:31 -0400 Subject: [PATCH 111/173] #47: Fix missing parameter when searching for offerings in any term. --- src/Controller/Offerings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index f55fed50..21408dce 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -67,7 +67,7 @@ public function listAction(\osid_id_Id $catalogId, \osid_id_Id $termId) // Add our parameters to the search query if ('CURRENT' == $this->osidIdMap->toString($termId)) { - $termId = $this->osidTermHelper->getNextOrLatestTermId(); + $termId = $this->osidTermHelper->getNextOrLatestTermId($catalogId); } $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); From f451da75a4d3d24139f69712ad42e93c0c3578b9 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 17:06:55 -0400 Subject: [PATCH 112/173] #47: Ensure that variables the template is expecting are set. --- src/Controller/Offerings.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Controller/Offerings.php b/src/Controller/Offerings.php index 21408dce..45297fe7 100755 --- a/src/Controller/Offerings.php +++ b/src/Controller/Offerings.php @@ -280,8 +280,12 @@ protected function prepareSearch(Request $request, ?\osid_id_Id $catalogId = nul *********************************************************/ // Term + $data['term'] = null; + $data['nextTerm'] = null; + $data['previousTerm'] = null; if ('ANY' == $termIdString) { // Don't set a term + $termId = null; } elseif (!$termIdString || 'CURRENT' == $termIdString) { // When accessing the "current" term via xml, use the term we are in. // When displaying the search interface, use the next upcoming term. @@ -399,10 +403,10 @@ protected function prepareSearch(Request $request, ?\osid_id_Id $catalogId = nul } // Campuses -- only include if we have more than one. + $data['campuses'] = []; $campuses = $resourceLookupSession->getResourcesByGenusType($this->campusType); if ($campuses->hasNext() && $campuses->getNextResource() && $campuses->hasNext()) { $campuses = $resourceLookupSession->getResourcesByGenusType($this->campusType); - $data['campuses'] = []; while ($campuses->hasNext()) { $data['campuses'][] = $campuses->getNextResource(); } From 1f61c777bb16ea274c447d9bccf2a278c4c7e744 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 1 Nov 2024 17:20:19 -0400 Subject: [PATCH 113/173] #47: Get apc tests running again after recent test-harness changes. --- application/test/apc/configuration.plist | 2 +- application/test/banner/DatabaseTestTrait.php | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/application/test/apc/configuration.plist b/application/test/apc/configuration.plist index 550fe949..bc1fe3f1 100755 --- a/application/test/apc/configuration.plist +++ b/application/test/apc/configuration.plist @@ -7,7 +7,7 @@ urn:inet:middlebury.edu:config:banner_course.pdo_count_queries urn:inet:middlebury.edu:config:banner_course.pdo_dsn - mysql:dbname=test;host=database + mysql:dbname=symfony_test;host=database urn:inet:middlebury.edu:config:banner_course.pdo_password symfony urn:inet:middlebury.edu:config:banner_course.pdo_username diff --git a/application/test/banner/DatabaseTestTrait.php b/application/test/banner/DatabaseTestTrait.php index f80cfac3..5e82159c 100644 --- a/application/test/banner/DatabaseTestTrait.php +++ b/application/test/banner/DatabaseTestTrait.php @@ -4,6 +4,7 @@ trait banner_DatabaseTestTrait { public static $runtimeManager; public static $courseManager; + public static $db; public static function setUpBeforeClass(): void { @@ -39,12 +40,13 @@ public static function tearDownDatabase(): void public static function getDB() { - if (empty(self::$courseManager)) { + if (empty(self::$db)) { self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(__DIR__.'/configuration.plist'); self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'banner_course_CourseManager', '3.0.0'); + self::$db = self::$courseManager->getDB(); } - return self::$courseManager->getDB(); + return self::$db; } /** @@ -55,7 +57,9 @@ public static function getDB() public static function loadBannerDb() { // Initialize our testing database - $db = self::getDB(); + self::$runtimeManager = new phpkit_AutoloadOsidRuntimeManager(__DIR__.'/configuration.plist'); + self::$courseManager = self::$runtimeManager->getManager(osid_OSID::COURSE(), 'banner_course_CourseManager', '3.0.0'); + $db = self::$courseManager->getDB(); harmoni_SQLUtils::runSQLfile(__DIR__.'/sql/drop_tables.sql', $db); harmoni_SQLUtils::runSQLfile(APPLICATION_PATH.'/library/banner/sql/table_creation.sql', $db); harmoni_SQLUtils::runSQLfile(__DIR__.'/sql/test_data.sql', $db); From 493ebd4bbe206d281410c630d24bce12c1d64686 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Mon, 4 Nov 2024 10:21:33 -0500 Subject: [PATCH 114/173] #47: Add Resources Controller tests and remove unused arguments. --- src/Controller/Resources.php | 5 +- tests/Controller/ResourcesTest.php | 90 ++++++++++++++++++++++++++++++ 2 files changed, 92 insertions(+), 3 deletions(-) create mode 100644 tests/Controller/ResourcesTest.php diff --git a/src/Controller/Resources.php b/src/Controller/Resources.php index fe5f62e7..927c9fb5 100755 --- a/src/Controller/Resources.php +++ b/src/Controller/Resources.php @@ -10,7 +10,6 @@ use App\Service\Osid\IdMap; use App\Service\Osid\Runtime; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Annotation\Route; @@ -31,7 +30,7 @@ public function __construct( } #[Route('/resources/view/{resourceId}/{termId}', name: 'view_resource')] - public function viewAction(Request $request, \osid_id_Id $resourceId, ?\osid_id_Id $termId = null) + public function viewAction(\osid_id_Id $resourceId, ?\osid_id_Id $termId = null) { $lookupSession = $this->osidRuntime->getCourseManager()->getResourceManager()->getResourceLookupSession(); $lookupSession->useFederatedBinView(); @@ -85,7 +84,7 @@ public function viewAction(Request $request, \osid_id_Id $resourceId, ?\osid_id_ * List all department topics as a text file with each line being Id|DisplayName. */ #[Route('/resources/listcampusestxt/{catalogId}', name: 'list_campuses_txt')] - public function listcampusestxt(Request $request, ?\osid_id_Id $catalogId = null) + public function listcampusestxt(?\osid_id_Id $catalogId = null) { $data = []; if ($catalogId) { diff --git a/tests/Controller/ResourcesTest.php b/tests/Controller/ResourcesTest.php new file mode 100644 index 00000000..a8104692 --- /dev/null +++ b/tests/Controller/ResourcesTest.php @@ -0,0 +1,90 @@ +request('GET', '/resources/listcampusestxt'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/Main/i', $response->getContent()); + $this->assertMatchesRegularExpression('/Off-Campus/i', $response->getContent()); + } + + public function testListCampusesByCataloog(): void + { + $client = static::createClient(); + $client->request('GET', '/resources/listcampusestxt/catalog.MCUG'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/Main/i', $response->getContent()); + $this->assertDoesNotMatchRegularExpression('/Off-Campus/i', $response->getContent()); + } + + public function testViewPerson(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/resources/view/resource.person.WEBID1000004'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorTextContains('h1', 'Dudley Derringer'); + + $this->assertGreaterThan(0, $crawler->filter('.offering_list h4:contains("Fall 2008")')->count()); + $this->assertGreaterThan(0, $crawler->filter('.offering_list h4:contains("Fall 2003")')->count()); + } + + public function testViewPersonTerm(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/resources/view/resource.person.WEBID1000004/term.200890'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorTextContains('h1', 'Dudley Derringer'); + + $this->assertGreaterThan(0, $crawler->filter('.offering_list h4:contains("Fall 2008")')->count()); + $this->assertEquals(0, $crawler->filter('.offering_list h4:contains("Fall 2003")')->count()); + } + + public function testViewRoom(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/resources/view/resource.place.room.MBH.560'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorTextContains('h1', 'McCardell Bicentennial Hall 560'); + + $this->assertGreaterThan(0, $crawler->filter('.offering_list h4:contains("Fall 2009")')->count()); + $this->assertGreaterThan(0, $crawler->filter('.offering_list h4:contains("Spring 2009")')->count()); + $this->assertGreaterThan(0, $crawler->filter('.offering_list h4:contains("Fall 2008")')->count()); + } + + public function testViewRoomTerm(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/resources/view/resource.place.room.MBH.560/term.200990'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertSelectorTextContains('h1', 'McCardell Bicentennial Hall 560'); + + $this->assertGreaterThan(0, $crawler->filter('.offering_list h4:contains("Fall 2009")')->count()); + $this->assertEquals(0, $crawler->filter('.offering_list h4:contains("Spring 2009")')->count()); + $this->assertEquals(0, $crawler->filter('.offering_list h4:contains("Fall 2008")')->count()); + } +} From 6d47e4ee0c20e8cc5f0f9a62c4574baba66fb580 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Mon, 4 Nov 2024 10:54:08 -0500 Subject: [PATCH 115/173] #47: Add Terms controller test and ensure that 404s are used for not found. --- src/Controller/Terms.php | 210 ++++++++++++++++------------- tests/Controller/ResourcesTest.php | 2 +- tests/Controller/TermsTest.php | 188 ++++++++++++++++++++++++++ 3 files changed, 305 insertions(+), 95 deletions(-) create mode 100644 tests/Controller/TermsTest.php diff --git a/src/Controller/Terms.php b/src/Controller/Terms.php index 98a71c38..2155fcd7 100755 --- a/src/Controller/Terms.php +++ b/src/Controller/Terms.php @@ -11,6 +11,7 @@ use App\Service\Osid\Runtime; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -35,25 +36,29 @@ public function __construct( #[Route('/terms/list/{catalogId}', name: 'list_terms')] public function listAction(?\osid_id_Id $catalogId = null) { - $data = []; - if ($catalogId) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalogId'] = $catalogId; - } else { - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $data['title'] = 'Terms in All Catalogs'; - $data['catalogId'] = null; + try { + $data = []; + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalogId'] = $catalogId; + } else { + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $data['title'] = 'Terms in All Catalogs'; + $data['catalogId'] = null; + } + $lookupSession->useFederatedCourseCatalogView(); + + $terms = $lookupSession->getTerms(); + $data['terms'] = []; + while ($terms->hasNext()) { + $data['terms'][] = $terms->getNextTerm(); + } + + return $this->render('terms/list.html.twig', $data); + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); } - $lookupSession->useFederatedCourseCatalogView(); - - $terms = $lookupSession->getTerms(); - $data['terms'] = []; - while ($terms->hasNext()) { - $data['terms'][] = $terms->getNextTerm(); - } - - return $this->render('terms/list.html.twig', $data); } /** @@ -62,53 +67,62 @@ public function listAction(?\osid_id_Id $catalogId = null) #[Route('/terms/listxml/{catalogId}', name: 'list_terms_xml')] public function listxmlAction(?\osid_id_Id $catalogId = null) { - $data = []; - if ($catalogId) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalogId'] = $catalogId; - } else { - $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $data['title'] = 'Terms in All Catalogs'; - $data['catalogId'] = null; + try { + $data = []; + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $data['title'] = 'Terms in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalogId'] = $catalogId; + } else { + $lookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $data['title'] = 'Terms in All Catalogs'; + $data['catalogId'] = null; + } + $lookupSession->useFederatedCourseCatalogView(); + + $terms = $lookupSession->getTerms(); + $data['terms'] = []; + while ($terms->hasNext()) { + $data['terms'][] = $terms->getNextTerm(); + } + $data['feedLink'] = $this->generateUrl('list_terms_xml', ['catalogId' => $catalogId], UrlGeneratorInterface::ABSOLUTE_URL); + $response = new Response($this->renderView('terms/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + + return $response; + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); } - $lookupSession->useFederatedCourseCatalogView(); - - $terms = $lookupSession->getTerms(); - $data['terms'] = []; - while ($terms->hasNext()) { - $data['terms'][] = $terms->getNextTerm(); - } - $data['feedLink'] = $this->generateUrl('list_terms_xml', ['catalogId' => $catalogId], UrlGeneratorInterface::ABSOLUTE_URL); - $response = new Response($this->renderView('terms/list.xml.twig', $data)); - $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); - - return $response; } #[Route('/terms/view/{termId}/{catalogId}', name: 'view_term')] public function viewAction(\osid_id_Id $termId, ?\osid_id_Id $catalogId = null) { - $data = []; - if ($catalogId) { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $termLookupSession->useIsolatedCourseCatalogView(); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); - $offeringLookupSession->useIsolatedCourseCatalogView(); - } else { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $offeringLookupSession->useFederatedCourseCatalogView(); + try { + $data = []; + if ($catalogId) { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession->useIsolatedCourseCatalogView(); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $offeringLookupSession->useIsolatedCourseCatalogView(); + } else { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $offeringLookupSession->useFederatedCourseCatalogView(); + } + + $data['term'] = $termLookupSession->getTerm($termId); + $offerings = $offeringLookupSession->getCourseOfferingsByTerm($termId); + $data['offerings'] = []; + while ($offerings->hasNext()) { + $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); + } + + return $this->render('terms/view.html.twig', $data); + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); } - $data['term'] = $termLookupSession->getTerm($termId); - $offerings = $offeringLookupSession->getCourseOfferingsByTerm($termId); - $data['offerings'] = []; - while ($offerings->hasNext()) { - $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); - } - - return $this->render('terms/view.html.twig', $data); } /** @@ -117,19 +131,23 @@ public function viewAction(\osid_id_Id $termId, ?\osid_id_Id $catalogId = null) #[Route('/terms/details/{termId}/{catalogId}', name: 'view_term_details')] public function detailsAction(\osid_id_Id $termId, ?\osid_id_Id $catalogId = null) { - $data = []; - if ($catalogId) { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $termLookupSession->useIsolatedCourseCatalogView(); - $data['catalogId'] = $catalogId; - } else { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - $data['catalogId'] = null; + try { + $data = []; + if ($catalogId) { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession->useIsolatedCourseCatalogView(); + $data['catalogId'] = $catalogId; + } else { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $data['catalogId'] = null; + } + $data['term'] = $termLookupSession->getTerm($termId); + + return $this->render('terms/details.html.twig', $data); + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); } - $data['term'] = $termLookupSession->getTerm($termId); - - return $this->render('terms/details.html.twig', $data); } /** @@ -138,30 +156,34 @@ public function detailsAction(\osid_id_Id $termId, ?\osid_id_Id $catalogId = nul #[Route('/terms/detailsxml/{termId}/{catalogId}', name: 'view_term_details_xml')] public function detailsxmlAction(\osid_id_Id $termId, ?\osid_id_Id $catalogId = null) { - $data = []; - if ($catalogId) { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $termLookupSession->useIsolatedCourseCatalogView(); - $data['catalogId'] = $catalogId; - } else { - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - $data['catalogId'] = null; + try { + $data = []; + if ($catalogId) { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession->useIsolatedCourseCatalogView(); + $data['catalogId'] = $catalogId; + } else { + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $data['catalogId'] = null; + } + $data['term'] = $termLookupSession->getTerm($termId); + + $data['feedLink'] = $this->generateUrl( + 'view_term_details_xml', + [ + 'termId' => $termId, + 'catalogId' => $catalogId, + ], + UrlGeneratorInterface::ABSOLUTE_URL + ); + + $response = new Response($this->renderView('terms/details.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + + return $response; + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); } - $data['term'] = $termLookupSession->getTerm($termId); - - $data['feedLink'] = $this->generateUrl( - 'view_term_details_xml', - [ - 'termId' => $termId, - 'catalogId' => $catalogId, - ], - UrlGeneratorInterface::ABSOLUTE_URL - ); - - $response = new Response($this->renderView('terms/details.xml.twig', $data)); - $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); - - return $response; } } diff --git a/tests/Controller/ResourcesTest.php b/tests/Controller/ResourcesTest.php index a8104692..da43bccd 100644 --- a/tests/Controller/ResourcesTest.php +++ b/tests/Controller/ResourcesTest.php @@ -19,7 +19,7 @@ public function testListCampusesAll(): void $this->assertMatchesRegularExpression('/Off-Campus/i', $response->getContent()); } - public function testListCampusesByCataloog(): void + public function testListCampusesByCatalog(): void { $client = static::createClient(); $client->request('GET', '/resources/listcampusestxt/catalog.MCUG'); diff --git a/tests/Controller/TermsTest.php b/tests/Controller/TermsTest.php new file mode 100644 index 00000000..ab391173 --- /dev/null +++ b/tests/Controller/TermsTest.php @@ -0,0 +1,188 @@ +request('GET', '/terms/list'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a:contains("Fall 2009")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Summer 200")')->count()); + } + + public function testListByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/list/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a:contains("Fall 2009")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Summer 200")')->count()); + } + + public function testListByInvalidCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/list/catalog.XXXX'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testListXmlAll(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/listxml'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Fall 2009")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Summer 200")')->count()); + } + + public function testListXmlByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/listxml/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Fall 2009")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Summer 200")')->count()); + } + + public function testListXmlByInvalidCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/listxml/catalog.XXXX'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testView(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/view/term.200990'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a.offering_link')->count()); + } + + public function testViewInvalidId(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/view/term.200900'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testViewByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/view/term.200990/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a.offering_link')->count()); + } + + public function testViewByNonMatchingCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/view/term.200990/catalog.MIIS'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testDetails(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/details/term.200990'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('dl dd:contains("2009-09-07")')->count()); + } + + public function testDetailsInvalidId(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/details/term.200900'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testDetailsByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/details/term.200990/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('dl dd:contains("2009-09-07")')->count()); + } + + public function testDetailsByNonMatchingCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/details/term.200990/catalog.MIIS'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testDetailsXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/detailsxml/term.200990'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('term start_date:contains("2009-09-07")')->count()); + } + + public function testDetailsXmlInvalidId(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/detailsxml/term.200900'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testDetailsXmlByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/detailsxml/term.200990/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('term start_date:contains("2009-09-07")')->count()); + } + + public function testDetailsXmlByNonMatchingCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/detailsxml/term.200990/catalog.MIIS'); + + $this->assertResponseStatusCodeSame(404); + } +} From a89c661c0c356521030c56c71dba0507067968ae Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Mon, 4 Nov 2024 15:25:25 -0500 Subject: [PATCH 116/173] #47: Add Topics controller tests, ensure 404s, and remove non-phpunit tests Was missing data from GTVINSM, so number of topics in other tests changed. --- .../Topic/Lookup/CombinedSessionTest.php | 2 +- application/test/banner/sql/test_data.sql | 17 + src/Controller/Topics.php | 269 +++++---- tests/Controller/TopicsTest.php | 568 ++++++++++++++++++ tests/MiddDataUrls/test-urls | 32 - tests/MiddDataUrls/test-urls.txt | 148 ----- 6 files changed, 736 insertions(+), 300 deletions(-) create mode 100644 tests/Controller/TopicsTest.php delete mode 100755 tests/MiddDataUrls/test-urls delete mode 100644 tests/MiddDataUrls/test-urls.txt diff --git a/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php b/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php index fd1a7993..6061ba8f 100755 --- a/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php +++ b/application/test/banner/course/Topic/Lookup/CombinedSessionTest.php @@ -341,7 +341,7 @@ public function testGetTopics() $topics = $this->session->getTopics(); $this->assertInstanceOf('osid_course_TopicList', $topics); $this->assertTrue($topics->hasNext()); - $this->assertEquals(17, $topics->available()); + $this->assertEquals(18, $topics->available()); $this->assertInstanceOf('osid_course_Topic', $topics->getNextTopic()); $this->assertInstanceOf('osid_course_Topic', $topics->getNextTopic()); } diff --git a/application/test/banner/sql/test_data.sql b/application/test/banner/sql/test_data.sql index 5422c577..86ba1d8f 100755 --- a/application/test/banner/sql/test_data.sql +++ b/application/test/banner/sql/test_data.sql @@ -103,6 +103,23 @@ INSERT INTO `catalog_term_match` (`catalog_id`, `term_code_match`, `term_display -- Dumping data for table `GTVINSM` -- +INSERT INTO `GTVINSM` (`GTVINSM_CODE`, `GTVINSM_DESC`, `GTVINSM_ACTIVITY_DATE`, `GTVINSM_USER_ID`, `GTVINSM_VR_MSG_NO`) VALUES +('BL', 'Blended', '2020-07-08', 'JENTHOMPSON', NULL), +('EJ', 'Japan SA mainly in English', '2010-10-11', 'KWEISS', NULL), +('ENGL', 'Japan SA in English', '2010-10-11', 'KWEISS', NULL), +('FON', 'Flexible Online', '2020-07-08', 'JENTHOMPSON', NULL), +('HX', 'Hyflex', '2020-07-08', 'JENTHOMPSON', NULL), +('HYB', 'Hybrid', '2014-09-12', 'KWEISS', NULL), +('JAPNS', 'Japan SA in language', '2010-10-11', 'KWEISS', NULL), +('JE', 'Japan SA mainly in Japanese', '2010-10-11', 'KWEISS', NULL), +('MM', 'Multimodal', '2020-07-08', 'JENTHOMPSON', NULL), +('ONASY', 'Asynchronous Online', '2022-07-27', 'JENTHOMPSON', NULL), +('ONL', 'Online', '2009-06-17', 'LEROYG', '8'), +('ONL5', 'Online, Half-Credit', '2023-01-03', 'JENTHOMPSON', NULL), +('PERS', 'In-Person', '2020-07-08', 'JENTHOMPSON', NULL), +('PERS5', 'In-Person, Half-Credit', '2022-03-30', 'JENTHOMPSON', NULL), +('SON', 'Scheduled Online', '2020-07-08', 'JENTHOMPSON', NULL), +('WAIVE', 'MIIS Course Waiver', '2010-10-11', 'KWEISS', '8'); -- -- Dumping data for table `GTVINTP` diff --git a/src/Controller/Topics.php b/src/Controller/Topics.php index 3b1aae0d..7386050c 100755 --- a/src/Controller/Topics.php +++ b/src/Controller/Topics.php @@ -11,6 +11,7 @@ use App\Service\Osid\Runtime; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\Routing\Annotation\Route; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -35,9 +36,13 @@ public function __construct( #[Route('/topics/list/{catalogId}/{type}', name: 'list_topics')] public function listAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - $data = $this->getTopicData($catalogId, $type); + try { + $data = $this->getTopicData($catalogId, $type); - return $this->render('topics/list.html.twig', $data); + return $this->render('topics/list.html.twig', $data); + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); + } } /** @@ -46,19 +51,23 @@ public function listAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $typ #[Route('/topics/listxml/{catalogId}/{type}', name: 'list_topics_xml')] public function listxmlAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - $data = $this->getTopicData($catalogId, $type); - $data['feedLink'] = $this->generateUrl( - 'list_topics_xml', - [ - 'catalogId' => $catalogId, - 'type' => $type, - ], - UrlGeneratorInterface::ABSOLUTE_URL, - ); - $response = new Response($this->renderView('topics/list.xml.twig', $data)); - $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + try { + $data = $this->getTopicData($catalogId, $type); + $data['feedLink'] = $this->generateUrl( + 'list_topics_xml', + [ + 'catalogId' => $catalogId, + 'type' => $type, + ], + UrlGeneratorInterface::ABSOLUTE_URL, + ); + $response = new Response($this->renderView('topics/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); - return $response; + return $response; + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); + } } /** @@ -67,9 +76,13 @@ public function listxmlAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $ #[Route('/topics/recent/{catalogId}/{type}', name: 'list_recent_topics')] public function recentAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - $data = $this->getRecentTopicData($catalogId, $type); + try { + $data = $this->getRecentTopicData($catalogId, $type); - return $this->render('topics/list.html.twig', $data); + return $this->render('topics/list.html.twig', $data); + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); + } } /** @@ -78,79 +91,87 @@ public function recentAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $t #[Route('/topics/recentxml/{catalogId}/{type}', name: 'list_recent_topics_xml')] public function recentxmlAction(?\osid_id_Id $catalogId = null, ?\osid_type_Type $type = null) { - $data = $this->getRecentTopicData($catalogId, $type); - $data['feedLink'] = $this->generateUrl( - 'list_recent_topics_xml', - [ - 'catalogId' => $catalogId, - 'type' => $type, - ], - UrlGeneratorInterface::ABSOLUTE_URL, - ); - $response = new Response($this->renderView('topics/list.xml.twig', $data)); - $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + try { + $data = $this->getRecentTopicData($catalogId, $type); + $data['feedLink'] = $this->generateUrl( + 'list_recent_topics_xml', + [ + 'catalogId' => $catalogId, + 'type' => $type, + ], + UrlGeneratorInterface::ABSOLUTE_URL, + ); + $response = new Response($this->renderView('topics/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); - return $response; + return $response; + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); + } } #[Route('/topics/view/{topicId}/{catalogId}/{termId}', name: 'view_topic')] public function view(\osid_id_Id $topicId, ?\osid_id_Id $catalogId = null, ?\osid_id_Id $termId = null) { - $data = []; - - if ($catalogId) { - $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - $topicLookupSession->useIsolatedCourseCatalogView(); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); - $termLookupSession->useIsolatedCourseCatalogView(); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); - $offeringLookupSession->useIsolatedCourseCatalogView(); - $data['catalogId'] = $catalogId; - } else { - $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $topicLookupSession->useFederatedCourseCatalogView(); - $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); - $termLookupSession->useFederatedCourseCatalogView(); - $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); - $offeringLookupSession->useFederatedCourseCatalogView(); - $data['catalogId'] = null; - } - - $data['topic'] = $topicLookupSession->getTopic($topicId); + try { + $data = []; + + if ($catalogId) { + $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $topicLookupSession->useIsolatedCourseCatalogView(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($catalogId); + $termLookupSession->useIsolatedCourseCatalogView(); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSessionForCatalog($catalogId); + $offeringLookupSession->useIsolatedCourseCatalogView(); + $data['catalogId'] = $catalogId; + } else { + $topicLookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); + $topicLookupSession->useFederatedCourseCatalogView(); + $termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $termLookupSession->useFederatedCourseCatalogView(); + $offeringLookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $offeringLookupSession->useFederatedCourseCatalogView(); + $data['catalogId'] = null; + } - if ($termId) { - $offerings = $offeringLookupSession->getCourseOfferingsByTermByTopic($termId, $topicId); - $data['term'] = $termLookupSession->getTerm($termId); - $data['offeringsForAllTermsUrl'] = $this->generateUrl( - 'view_topic', - [ - 'topicId' => $topicId, - 'catalogId' => $catalogId, - ], - UrlGeneratorInterface::ABSOLUTE_URL - ); - } else { - $offerings = $offeringLookupSession->getCourseOfferingsByTopic($topicId); - $data['term'] = null; - $data['offeringsForAllTermsUrl'] = null; - } + $data['topic'] = $topicLookupSession->getTopic($topicId); + + if ($termId) { + $offerings = $offeringLookupSession->getCourseOfferingsByTermByTopic($termId, $topicId); + $data['term'] = $termLookupSession->getTerm($termId); + $data['offeringsForAllTermsUrl'] = $this->generateUrl( + 'view_topic', + [ + 'topicId' => $topicId, + 'catalogId' => $catalogId, + ], + UrlGeneratorInterface::ABSOLUTE_URL + ); + } else { + $offerings = $offeringLookupSession->getCourseOfferingsByTopic($topicId); + $data['term'] = null; + $data['offeringsForAllTermsUrl'] = null; + } - // Don't do the work to display all offerings if we have a very large - // number of offerings. - $data['offerings'] = []; - $data['offering_count'] = 0; - $data['offering_display_limit'] = 200; - $data['offeringsTitle'] = 'Sections'; - if (isset($offerings)) { - $data['offering_count'] = $offerings->available(); - $i = 0; - while ($offerings->hasNext() && $i < $data['offering_display_limit']) { - $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); - ++$i; + // Don't do the work to display all offerings if we have a very large + // number of offerings. + $data['offerings'] = []; + $data['offering_count'] = 0; + $data['offering_display_limit'] = 200; + $data['offeringsTitle'] = 'Sections'; + if (isset($offerings)) { + $data['offering_count'] = $offerings->available(); + $i = 0; + while ($offerings->hasNext() && $i < $data['offering_display_limit']) { + $data['offerings'][] = $this->osidDataLoader->getOfferingData($offerings->getNextCourseOffering()); + ++$i; + } } - } - return $this->render('topics/view.html.twig', $data); + return $this->render('topics/view.html.twig', $data); + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); + } } /** @@ -159,34 +180,38 @@ public function view(\osid_id_Id $topicId, ?\osid_id_Id $catalogId = null, ?\osi #[Route('/topics/viewxml/{topicId}/{catalogId}', name: 'view_topic_xml')] public function viewxmlAction(\osid_id_Id $topicId, ?\osid_id_Id $catalogId = null) { - $data = []; - - if ($catalogId) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); - $data['catalogId'] = $catalogId; - } else { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - $data['title'] = 'Topics in All Catalogs'; - $data['catalogId'] = null; - } - $lookupSession->useFederatedCourseCatalogView(); + try { + $data = []; + + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + $data['title'] = 'Topics in '.$lookupSession->getCourseCatalog()->getDisplayName(); + $data['catalogId'] = $catalogId; + } else { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); + $data['title'] = 'Topics in All Catalogs'; + $data['catalogId'] = null; + } + $lookupSession->useFederatedCourseCatalogView(); - $topics = new \phpkit_course_ArrayTopicList([$lookupSession->getTopic($topicId)]); - $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); + $topics = new \phpkit_course_ArrayTopicList([$lookupSession->getTopic($topicId)]); + $data = array_merge($data, $this->osidDataLoader->getTopics($topics)); - $data['feedLink'] = $this->generateUrl( - 'view_topic_xml', - [ - 'catalogId' => $catalogId, - 'topicId' => $topicId, - ], - UrlGeneratorInterface::ABSOLUTE_URL, - ); - $response = new Response($this->renderView('topics/list.xml.twig', $data)); - $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); + $data['feedLink'] = $this->generateUrl( + 'view_topic_xml', + [ + 'catalogId' => $catalogId, + 'topicId' => $topicId, + ], + UrlGeneratorInterface::ABSOLUTE_URL, + ); + $response = new Response($this->renderView('topics/list.xml.twig', $data)); + $response->headers->set('Content-Type', 'text/xml; charset=utf-8'); - return $response; + return $response; + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); + } } /** @@ -378,23 +403,29 @@ protected function DateTime_getTimestamp(\DateTime $dt) */ private function renderTextList(\osid_type_Type $genusType, ?\osid_id_Id $catalogId = null) { - $data = []; - - if ($catalogId) { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); - } else { - $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); - } - $lookupSession->useFederatedCourseCatalogView(); + try { + $data = [ + 'topics' => [], + ]; + + if ($catalogId) { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSessionForCatalog($catalogId); + } else { + $lookupSession = $this->osidRuntime->getCourseManager()->getTopicLookupSession(); + } + $lookupSession->useFederatedCourseCatalogView(); - $topics = $lookupSession->getTopicsByGenusType($genusType); - while ($topics->hasNext()) { - $data['topics'][] = $topics->getNextTopic(); - } + $topics = $lookupSession->getTopicsByGenusType($genusType); + while ($topics->hasNext()) { + $data['topics'][] = $topics->getNextTopic(); + } - $response = new Response($this->renderView('topics/list.txt.twig', $data)); - $response->headers->set('Content-Type', 'text/plain; charset=utf-8'); + $response = new Response($this->renderView('topics/list.txt.twig', $data)); + $response->headers->set('Content-Type', 'text/plain; charset=utf-8'); - return $response; + return $response; + } catch (\osid_NotFoundException $e) { + throw new NotFoundHttpException($e->getMessage()); + } } } diff --git a/tests/Controller/TopicsTest.php b/tests/Controller/TopicsTest.php new file mode 100644 index 00000000..253693d3 --- /dev/null +++ b/tests/Controller/TopicsTest.php @@ -0,0 +1,568 @@ +request('GET', '/topics/list'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a:contains("Hebrew")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Geology")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Chemistry & Biochemistry")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("DED")')->count()); + } + + public function testListByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/list/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('a:contains("Hebrew")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Geology")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Chemistry & Biochemistry")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("DED")')->count()); + } + + public function testListByInvalidCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/list/catalog.XXXX'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testListByCatalogTypeLong(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/list/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.requirement'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('a:contains("Hebrew")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Geology")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Chemistry & Biochemistry")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("DED")')->count()); + } + + public function testListByCatalogTypeShort(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/list/catalog.MCUG/genera:topic.requirement'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('a:contains("Hebrew")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Geology")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Chemistry & Biochemistry")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("DED")')->count()); + } + + public function testListXmlAll(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/listxml'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Hebrew")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Geology")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Chemistry & Biochemistry")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("DED")')->count()); + } + + public function testListXmlByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/listxml/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('item title:contains("Hebrew")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Geology")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Chemistry & Biochemistry")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("DED")')->count()); + } + + public function testListXmlByInvalidCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/listxml/catalog.XXXX'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testListXmlByCatalogTypeLong(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/listxml/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.requirement'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('item title:contains("Hebrew")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Geology")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Chemistry & Biochemistry")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("DED")')->count()); + } + + public function testListXmlByCatalogTypeShort(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/listxml/catalog.MCUG/genera:topic.requirement'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('item title:contains("Hebrew")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Geology")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Chemistry & Biochemistry")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("DED")')->count()); + } + + public function testRecentAll(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recent'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a:contains("Hebrew")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Geology")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Chemistry & Biochemistry")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("DED")')->count()); + } + + public function testRecentByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recent/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('a:contains("Hebrew")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Geology")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Chemistry & Biochemistry")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("DED")')->count()); + } + + public function testRecentByInvalidCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recent/catalog.XXXX'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testRecentByCatalogTypeLong(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recent/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.requirement'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('a:contains("Hebrew")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Geology")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Chemistry & Biochemistry")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("DED")')->count()); + } + + public function testRecentByCatalogTypeShort(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recent/catalog.MCUG/genera:topic.requirement'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('a:contains("Hebrew")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Geology")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Chemistry & Biochemistry")')->count()); + $this->assertEquals(0, $crawler->filter('a:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a:contains("DED")')->count()); + } + + public function testRecentXmlAll(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recentxml'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Hebrew")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Geology")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Chemistry & Biochemistry")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("DED")')->count()); + } + + public function testRecentXmlByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recentxml/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('item title:contains("Hebrew")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Geology")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Chemistry & Biochemistry")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("DED")')->count()); + } + + public function testRecentXmlByInvalidCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/terms/recentxml/catalog.XXXX'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testRecentXmlByCatalogTypeLong(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recentxml/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.requirement'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('item title:contains("Hebrew")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Geology")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Chemistry & Biochemistry")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("DED")')->count()); + } + + public function testRecentXmlByCatalogTypeShort(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/recentxml/catalog.MCUG/genera:topic.requirement'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertEquals(0, $crawler->filter('item title:contains("Hebrew")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Geology")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Chemistry & Biochemistry")')->count()); + $this->assertEquals(0, $crawler->filter('item title:contains("Natural Sciences")')->count()); + $this->assertGreaterThan(0, $crawler->filter('item title:contains("DED")')->count()); + } + + public function testView(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/view/topic.subject.PHYS'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a.offering_link:contains("PHYS0201A-F09")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a.offering_link:contains("PHYS0201A-F06")')->count()); + } + + public function testViewInvalidId(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/view/topic.subject.XXXX'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testViewByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/view/topic.subject.PHYS/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a.offering_link:contains("PHYS0201A-F09")')->count()); + $this->assertGreaterThan(0, $crawler->filter('a.offering_link:contains("PHYS0201A-F06")')->count()); + } + + public function testViewByNonMatchingCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/view/topic.subject.PHYS/catalog.BLSE'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testViewByTerm(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/view/topic.subject.PHYS/catalog.MCUG/term.200990'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('a.offering_link:contains("PHYS0201A-F09")')->count()); + $this->assertEquals(0, $crawler->filter('a.offering_link:contains("PHYS0201A-F06")')->count()); + } + + public function testViewByNonMatchingTerm(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/view/topic.subject.PHYS/catalog.MCUG/term.200900'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testViewXml(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/viewxml/topic.subject.PHYS'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Physics")')->count()); + } + + public function testViewXmlInvalidId(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/viewxml/topic.subject.XXXX'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testViewXmlByCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/viewxml/topic.subject.PHYS/catalog.MCUG'); + + $this->assertResponseIsSuccessful(); + // print $crawler->outerHtml(); + + $this->assertGreaterThan(0, $crawler->filter('item title:contains("Physics")')->count()); + } + + public function testViewXmlByNonMatchingCatalog(): void + { + $client = static::createClient(); + $crawler = $client->request('GET', '/topics/viewxml/topic.subject.PHYS/catalog.BLSE'); + + $this->assertResponseStatusCodeSame(404); + } + + public function testListSubjectsTxtAll(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listsubjectstxt'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/Geology/i', $response->getContent()); + $this->assertMatchesRegularExpression('/Hebrew/i', $response->getContent()); + } + + public function testListSubjectsTxtByCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listsubjectstxt/catalog.MCUG'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/Geology/i', $response->getContent()); + $this->assertDoesNotMatchRegularExpression('/Hebrew/i', $response->getContent()); + } + + public function testListDepartmentsTxtAll(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listdepartmentstxt'); + $response = $client->getResponse(); + + // print $response->getContent(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/Geology/i', $response->getContent()); + $this->assertMatchesRegularExpression('/Geography/i', $response->getContent()); + } + + public function testListDepartmentsTxtByCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listdepartmentstxt/catalog.MCUG'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/Geology/i', $response->getContent()); + $this->assertMatchesRegularExpression('/Geography/i', $response->getContent()); + } + + public function testListDepartmentsTxtByOtherCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listdepartmentstxt/catalog.BLSE'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertDoesNotMatchRegularExpression('/Geology/i', $response->getContent()); + $this->assertDoesNotMatchRegularExpression('/Geography/i', $response->getContent()); + } + + public function testListRequirementsTxtAll(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listrequirementstxt'); + $response = $client->getResponse(); + + // print $response->getContent(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/DED/i', $response->getContent()); + } + + public function testListRequirementsTxtByCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listrequirementstxt/catalog.MCUG'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/DED/i', $response->getContent()); + } + + public function testListRequirementsTxtByOtherCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listrequirementstxt/catalog.BLSE'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertDoesNotMatchRegularExpression('/DED/i', $response->getContent()); + } + + public function testListLevelsTxtAll(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listlevelstxt'); + $response = $client->getResponse(); + + // print $response->getContent(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/GR - Graduate/i', $response->getContent()); + $this->assertMatchesRegularExpression('/UG - Undergraduate/i', $response->getContent()); + } + + public function testListLevelsTxtByCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listlevelstxt/catalog.MCUG'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertDoesNotMatchRegularExpression('/GR - Graduate/i', $response->getContent()); + $this->assertMatchesRegularExpression('/UG - Undergraduate/i', $response->getContent()); + } + + public function testListLevelsTxtByOtherCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listlevelstxt/catalog.BLSE'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertDoesNotMatchRegularExpression('/GR - Graduate/i', $response->getContent()); + $this->assertDoesNotMatchRegularExpression('/UG - Undergraduate/i', $response->getContent()); + } + + public function testListBlocksTxtAll(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listblockstxt'); + $response = $client->getResponse(); + + // print $response->getContent(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/Community Connected Course/i', $response->getContent()); + } + + public function testListBlocksTxtByCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listblockstxt/catalog.MCUG'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/Community Connected Course/i', $response->getContent()); + } + + public function testListBlocksTxtByOtherCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listblockstxt/catalog.BLSE'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertDoesNotMatchRegularExpression('/Community Connected Course/i', $response->getContent()); + } + + public function testListInstructionMethodsTxtAll(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listinstructionmethodstxt'); + $response = $client->getResponse(); + + // print $response->getContent(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/HYB - Hybrid/i', $response->getContent()); + } + + public function testListInstructionMethodsTxtByCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listinstructionmethodstxt/catalog.MCLS'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertMatchesRegularExpression('/HYB - Hybrid/i', $response->getContent()); + } + + public function testListInstructionMethodsTxtByOtherCatalog(): void + { + $client = static::createClient(); + $client->request('GET', '/topics/listinstructionmethodstxt/catalog.MCUG'); + $response = $client->getResponse(); + + $this->assertResponseIsSuccessful(); + $this->assertDoesNotMatchRegularExpression('/HYB - Hybrid/i', $response->getContent()); + } +} diff --git a/tests/MiddDataUrls/test-urls b/tests/MiddDataUrls/test-urls deleted file mode 100755 index fa397402..00000000 --- a/tests/MiddDataUrls/test-urls +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env php - false, - 'verify' => false, -]); - -$successful = 0; -$failed = 0; -foreach ($urls as $url) { - try { - $response = $client->get($url); - $successful++; - } - catch (RequestException $e) { - $failed++; - print $url . "\n\t"; - print $e->getCode() . ' ' . $e->getMessage() . "\n"; - } -} -print "\n".count($urls)." URLs tested: $successful succeeded, $failed failed.\n"; diff --git a/tests/MiddDataUrls/test-urls.txt b/tests/MiddDataUrls/test-urls.txt deleted file mode 100644 index 26f5171c..00000000 --- a/tests/MiddDataUrls/test-urls.txt +++ /dev/null @@ -1,148 +0,0 @@ -https://coursecatalog.lndo.site/ -https://coursecatalog.lndo.site/bookmarks/add/course.BIOL0145 -https://coursecatalog.lndo.site/bookmarks/add/course.BIOL0146 -https://coursecatalog.lndo.site/bookmarks/remove/course.BIOL0145 -https://coursecatalog.lndo.site/bookmarks/remove/course.BIOL0146 -https://coursecatalog.lndo.site/catalogs -https://coursecatalog.lndo.site/catalogs/list -https://coursecatalog.lndo.site/catalogs/listxml -https://coursecatalog.lndo.site/catalogs/view/catalog.MCUG -https://coursecatalog.lndo.site/catalogs/viewxml/catalog.MCUG -https://coursecatalog.lndo.site/courses/byidxml/catalog.MCUG?id[]=courses.ENAM0203 -https://coursecatalog.lndo.site/courses/instructorxml/74B64E9044F9B3A5047B8555CB148C91/catalog.MCUG -https://coursecatalog.lndo.site/courses/instructorxml/8724BFF3B8EDED3EF4589B469BDCB965/catalog.MCUG -https://coursecatalog.lndo.site/courses/instructorxml/8724BFF3B8EDED3EF4589B469BDCB965 -https://coursecatalog.lndo.site/courses/instructorxml/resource.person.74B64E9044F9B3A5047B8555CB148C91 -https://coursecatalog.lndo.site/courses/instructorxml/resource.person.74B64E9044F9B3A5047B8555CB148C91/catalog.MCUG -https://coursecatalog.lndo.site/courses/list/catalog.MCUG -https://coursecatalog.lndo.site/courses/searchxml/catalog.MCUG?keywords=IGST%200254 -https://coursecatalog.lndo.site/courses/topicxml/catalog.MCUG?topic[]=topic.department.MAST&topic[]=topic.department.MATH -https://coursecatalog.lndo.site/courses/topicxml/catalog.MCUG?topic[]=topic.department.MAST&topic[]=topic.department.MATHz -https://coursecatalog.lndo.site/courses/view/course.AMST0206 -https://coursecatalog.lndo.site/courses/view/course.AMST0206/term.200790 -https://coursecatalog.lndo.site/courses/view/course.AMST0206/term.201920 -https://coursecatalog.lndo.site/courses/view/course.AMST0206/term.202490 -https://coursecatalog.lndo.site/courses/view/course.AMST0226 -https://coursecatalog.lndo.site/courses/view/course.AMST0227 -https://coursecatalog.lndo.site/courses/view/course.BIOL0145 -https://coursecatalog.lndo.site/courses/view/course.BIOL0145/term.202490 -https://coursecatalog.lndo.site/courses/view/course.BIOL0314 -https://coursecatalog.lndo.site/courses/view/course.BIOL0314/term.202490 -https://coursecatalog.lndo.site/courses/view/course.ENAM0206 -https://coursecatalog.lndo.site/courses/view/course.ENAM0206/term.200790 -https://coursecatalog.lndo.site/courses/view/course.ENAM0206/term.202190 -https://coursecatalog.lndo.site/courses/view/course.ENAM0206/term.202490 -https://coursecatalog.lndo.site/courses/view/course.ENGL0206 -https://coursecatalog.lndo.site/courses/view/course.ENGL0206/term.202490 -https://coursecatalog.lndo.site/courses/view/course.SPAN0101/term.202490 -https://coursecatalog.lndo.site/courses/view/course.SPAN0103/term.202490 -https://coursecatalog.lndo.site/courses/viewxml/course.BIOL0314/term.202490 -https://coursecatalog.lndo.site/courses/viewxml/course.ENAM0206/term.200790 -https://coursecatalog.lndo.site/courses/viewxml/course.ENAM0206/term.202190 -https://coursecatalog.lndo.site/courses/viewxml/course.WRPR0203 -https://coursecatalog.lndo.site/favicon.ico -https://coursecatalog.lndo.site/offerings/list/catalog.MCUG/term.202490 -https://coursecatalog.lndo.site/offerings/list/catalog.SA/term.202490 -https://coursecatalog.lndo.site/offerings/search -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=1 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=2 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=3 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=5 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202420&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202420&department=topic.subject.ECON&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.department.ALAC&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.department.AMLT&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=2 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=4 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400&page=2 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202490&department=topic.subject.WRPR&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202510&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202510&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?search=Search&term=term.202510&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202420&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202420&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM&search=Search -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&search=Search -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=topic.department.BIOL&keywords=&days_mode=inclusive&time_start=0&time_end=86400 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=topic.department.BIOL&requirement%5B%5D=topic.requirement.LNG&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM&search=Search -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202490&department=topic.subject.IGST&keywords=&days_mode=inclusive&time_start=0&time_end=86400&search=Search -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202510 -https://coursecatalog.lndo.site/offerings/search/catalog.MCUG?term=term.202510&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM&search=Search -https://coursecatalog.lndo.site/offerings/search?term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&type%5B%5D=genera%3Aoffering.LCT&type%5B%5D=genera%3Aoffering.SEM&type%5B%5D=genera%3Aoffering.PRC&type%5B%5D=genera%3Aoffering.WKS -https://coursecatalog.lndo.site/offerings/searchxml/catalog.MCUG?term=term.202490&department=&keywords=&days_mode=inclusive&time_start=0&time_end=86400&search=Search -https://coursecatalog.lndo.site/offerings/view/section.200790.92263 -https://coursecatalog.lndo.site/offerings/view/section.200790.92270 -https://coursecatalog.lndo.site/offerings/view/section.201920.22325 -https://coursecatalog.lndo.site/offerings/view/section.202190.92538 -https://coursecatalog.lndo.site/offerings/view/section.202390.90071 -https://coursecatalog.lndo.site/offerings/view/section.202390.92385 -https://coursecatalog.lndo.site/offerings/view/section.202490.91654 -https://coursecatalog.lndo.site/offerings/view/section.202490.91756 -https://coursecatalog.lndo.site/offerings/view/section.202490.92136 -https://coursecatalog.lndo.site/offerings/view/section.202490.92331 -https://coursecatalog.lndo.site/offerings/view/section.202490.92332 -https://coursecatalog.lndo.site/offerings/view/section.202490.92415 -https://coursecatalog.lndo.site/offerings/view/section.202490.92419 -https://coursecatalog.lndo.site/offerings/view/section.202490.92486 -https://coursecatalog.lndo.site/offerings/view/section.202490.92487 -https://coursecatalog.lndo.site/offerings/view/section.202520.21262 -https://coursecatalog.lndo.site/offerings/viewxml/section.202490.92487 -https://coursecatalog.lndo.site/resources/listcampusestxt -https://coursecatalog.lndo.site/resources/listcampusestxt/catalog.MCUG -https://coursecatalog.lndo.site/resources/view/resource.person.3415A6AFA51EDCD9F9CD4013A2C68E36/term.202390?catalog=catalog.MCUG -https://coursecatalog.lndo.site/resources/view/resource.person.604CEF681674D80FFA4E6601001E065F/term.202490 -https://coursecatalog.lndo.site/resources/view/resource.person.74B64E9044F9B3A5047B8555CB148C91 -https://coursecatalog.lndo.site/resources/view/resource.person.74B64E9044F9B3A5047B8555CB148C91/term.202490 -https://coursecatalog.lndo.site/resources/view/resource.person.B6C2B366F82A8E5B3CCCBC38FFE7BF4B -https://coursecatalog.lndo.site/resources/view/resource.person.B6C2B366F82A8E5B3CCCBC38FFE7BF4B/term.202490 -https://coursecatalog.lndo.site/resources/view/resource.place.room.AXN.219/term.202390?catalog=catalog.MCUG -https://coursecatalog.lndo.site/resources/view/resource.place.room.MBH.338 -https://coursecatalog.lndo.site/resources/view/resource.place.room.MBH.338/term.202490 -https://coursecatalog.lndo.site/resources/view/resource.place.room.MNR.317/term.202490 -https://coursecatalog.lndo.site/terms/details/term.202490 -https://coursecatalog.lndo.site/terms/details/term.202490/catalog.SA -https://coursecatalog.lndo.site/terms/detailsxml/term.202490 -https://coursecatalog.lndo.site/terms/detailsxml/term.202490/catalog.SA -https://coursecatalog.lndo.site/terms/list -https://coursecatalog.lndo.site/terms/list/catalog.MCUG -https://coursecatalog.lndo.site/terms/list/catalog.SA -https://coursecatalog.lndo.site/terms/listxml/catalog.SA -https://coursecatalog.lndo.site/terms/view/term.202465 -https://coursecatalog.lndo.site/terms/view/term.202490 -https://coursecatalog.lndo.site/terms/view/term.202490/catalog.MCUG -https://coursecatalog.lndo.site/terms/view/term.202490/catalog.SA -https://coursecatalog.lndo.site/terms/view/term.202490?catalog=catalog.MCUG -https://coursecatalog.lndo.site/terms/view/term.202548 -https://coursecatalog.lndo.site/topics/list -https://coursecatalog.lndo.site/topics/list/catalog.MCUG -https://coursecatalog.lndo.site/topics/list/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.subject -https://coursecatalog.lndo.site/topics/listsubjectstxt -https://coursecatalog.lndo.site/topics/listsubjectstxt/catalog.MCUG -https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG -https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG/?type=urn:inet:middlebury.edu:genera:topic.subject -https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.requirement -https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.subject -https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG?type=urn:inet:middlebury.edu:genera:topic.requirement -https://coursecatalog.lndo.site/topics/listxml/catalog.MCUG?type=urn:inet:middlebury.edu:genera:topic.subject -https://coursecatalog.lndo.site/topics/listxml?type=urn:inet:middlebury.edu:genera:topic.subject -https://coursecatalog.lndo.site/topics/recent/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.subject -https://coursecatalog.lndo.site/topics/recentxml/catalog.MCUG -https://coursecatalog.lndo.site/topics/recentxml/catalog.MCUG/urn:inet:middlebury.edu:genera:topic.subject -https://coursecatalog.lndo.site/topics/view/topic.department.AMST/catalog.MCUG -https://coursecatalog.lndo.site/topics/view/topic.department.AMST/catalog.MCUG/term.202390 -https://coursecatalog.lndo.site/topics/view/topic.division.INTR/catalog.MCUG/term.202390 -https://coursecatalog.lndo.site/topics/view/topic.instruction_method.PERS/catalog.MCUG/term.202390 -https://coursecatalog.lndo.site/topics/view/topic.level.UG/catalog.MCUG/term.202390 -https://coursecatalog.lndo.site/topics/view/topic.requirement.AMR/catalog.MCUG/term.202390 -https://coursecatalog.lndo.site/topics/view/topic.requirement.HIS/catalog.MCUG/term.202390 -https://coursecatalog.lndo.site/topics/view/topic.requirement.SOC/catalog.MCUG/term.202390 -https://coursecatalog.lndo.site/topics/view/topic.subject.AMLT/catalog.MCUG -https://coursecatalog.lndo.site/topics/view/topic.subject.AMST/catalog.MCUG -https://coursecatalog.lndo.site/topics/view/topic.subject.AMST/catalog.MCUG/term.202390 -https://coursecatalog.lndo.site/topics/view/topic.subject.GREK/catalog.MCUG -https://coursecatalog.lndo.site/topics/viewxml/topic.subject.AMST/catalog.MCUG From 367f567c89ab3f90ead8fbdb3f41a762192614d4 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Mon, 4 Nov 2024 15:35:40 -0500 Subject: [PATCH 117/173] #47: Add Redirects Controller tests. --- tests/Controller/RedirectsTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tests/Controller/RedirectsTest.php diff --git a/tests/Controller/RedirectsTest.php b/tests/Controller/RedirectsTest.php new file mode 100644 index 00000000..e55f9059 --- /dev/null +++ b/tests/Controller/RedirectsTest.php @@ -0,0 +1,19 @@ +request('GET', '/favicon.ico'); + $response = $client->getResponse(); + + $this->assertResponseRedirects(); + $this->assertResponseHasHeader('Location'); + $this->assertMatchesRegularExpression('#/assets/favicon.*\.ico#i', $response->headers->get('Location')); + } +} From 9bf61ea36f3b3bb0c27ec7d42ec4191a1252977c Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 14 Nov 2024 11:02:08 -0500 Subject: [PATCH 118/173] #47: First pass porting the Schedule builder UI. Many parts still broken: - Add sections - Print view - JS weekly calendar - email functions This commit was getting to be too big to keep track of, so will break out further work into subsequent commits. --- .env | 9 + .gitmodules | 3 - .../controllers/SchedulesController.php | 765 --------------- application/library/Schedules.php | 154 --- .../views/helpers/GetAvailabilityLink.php | 27 - .../views/scripts/schedules/bookmarks.phtml | 199 ---- .../scripts/schedules/catalog_select.phtml | 14 - .../scripts/schedules/email-dialog.phtml | 174 ---- .../views/scripts/schedules/email-html.phtml | 8 - .../schedules/email-offering-list.phtml | 32 - .../scripts/schedules/email-preview.phtml | 5 - .../scripts/schedules/generate-image.phtml | 208 ----- .../views/scripts/schedules/index.phtml | 39 - .../schedules/remove_offering_dialog.phtml | 117 --- .../schedules/schedule_calendar_dialog.phtml | 68 -- .../views/scripts/schedules/schedules.phtml | 112 --- .../schedules/selected_term_name.phtml | 16 - .../views/scripts/schedules/term_select.phtml | 13 - .../views/scripts/schedules/terms.phtml | 12 - assets/email_controls.js | 114 +++ assets/schedules.js | 304 ++++++ assets/styles/schedules.css | 3 + composer.json | 17 +- composer.lock | 598 ++++++------ config/packages/asset_mapper.yaml | 3 +- config/services.yaml | 9 + docroot/javascript/jquery-week-calendar | 1 - docroot/javascript/schedule.js | 65 -- importmap.php | 20 +- src/Controller/Schedules.php | 875 ++++++++++++++++++ {application/library => src}/Schedule.php | 107 +-- src/Security/SamlUser.php | 34 +- src/Service/Bookmarks.php | 50 +- src/Service/Osid/DataLoader.php | 20 +- src/Service/Schedules.php | 238 +++++ src/Twig/SchedulesExtension.php | 44 + templates/schedules/bookmarks.html.twig | 48 + templates/schedules/catalog_select.html.twig | 6 + templates/schedules/email-dialog.html.twig | 46 + templates/schedules/email-html.html.twig | 8 + .../schedules/email-offering-list.html.twig | 21 + templates/schedules/email-preview.html.twig | 3 + .../schedules/email-text.txt.twig | 0 templates/schedules/index.html.twig | 37 + .../schedules/print.html.twig | 0 .../remove_offering_dialog.html.twig | 35 + .../schedule_calendar_dialog.html.twig | 10 + templates/schedules/schedules.html.twig | 61 ++ .../schedules/selected_term_name.html.twig | 7 + templates/schedules/term_select.html.twig | 11 + templates/schedules/terms.html.twig | 5 + 51 files changed, 2366 insertions(+), 2409 deletions(-) delete mode 100755 application/controllers/SchedulesController.php delete mode 100755 application/library/Schedules.php delete mode 100755 application/views/helpers/GetAvailabilityLink.php delete mode 100755 application/views/scripts/schedules/bookmarks.phtml delete mode 100755 application/views/scripts/schedules/catalog_select.phtml delete mode 100755 application/views/scripts/schedules/email-dialog.phtml delete mode 100755 application/views/scripts/schedules/email-html.phtml delete mode 100755 application/views/scripts/schedules/email-offering-list.phtml delete mode 100755 application/views/scripts/schedules/email-preview.phtml delete mode 100755 application/views/scripts/schedules/generate-image.phtml delete mode 100755 application/views/scripts/schedules/index.phtml delete mode 100755 application/views/scripts/schedules/remove_offering_dialog.phtml delete mode 100755 application/views/scripts/schedules/schedule_calendar_dialog.phtml delete mode 100755 application/views/scripts/schedules/schedules.phtml delete mode 100755 application/views/scripts/schedules/selected_term_name.phtml delete mode 100755 application/views/scripts/schedules/term_select.phtml delete mode 100755 application/views/scripts/schedules/terms.phtml create mode 100644 assets/email_controls.js create mode 100755 assets/schedules.js create mode 100644 assets/styles/schedules.css delete mode 160000 docroot/javascript/jquery-week-calendar delete mode 100755 docroot/javascript/schedule.js create mode 100755 src/Controller/Schedules.php rename {application/library => src}/Schedule.php (86%) create mode 100755 src/Service/Schedules.php create mode 100644 src/Twig/SchedulesExtension.php create mode 100755 templates/schedules/bookmarks.html.twig create mode 100755 templates/schedules/catalog_select.html.twig create mode 100755 templates/schedules/email-dialog.html.twig create mode 100755 templates/schedules/email-html.html.twig create mode 100755 templates/schedules/email-offering-list.html.twig create mode 100755 templates/schedules/email-preview.html.twig rename application/views/scripts/schedules/email-text.phtml => templates/schedules/email-text.txt.twig (100%) create mode 100755 templates/schedules/index.html.twig rename application/views/scripts/schedules/print.phtml => templates/schedules/print.html.twig (100%) create mode 100755 templates/schedules/remove_offering_dialog.html.twig create mode 100755 templates/schedules/schedule_calendar_dialog.html.twig create mode 100755 templates/schedules/schedules.html.twig create mode 100755 templates/schedules/selected_term_name.html.twig create mode 100755 templates/schedules/term_select.html.twig create mode 100755 templates/schedules/terms.html.twig diff --git a/.env b/.env index d79d3f9b..31963cb3 100644 --- a/.env +++ b/.env @@ -20,6 +20,15 @@ SAML_IDP_SINGLESIGNONSERVICE="https://idp.example.edu/abc123/saml2" SAML_IDP_SINGLELOGOUTSERVICE="https://idp.example.edu/abc123/saml2" SAML_IDP_X509CERT="MIIC...." +# Catalog +CATALOG_BANNER_WEB_URL="" + +# Schedules +SCHEDULES_EMAIL_ENABLED=false +SCHEDULES_EMAIL_SEND_MAIL_AS_USER=false +SCHEDULES_EMAIL_SEND_MAIL_AS=noreply@example.edu +SCHEDULES_IMAGE_FONT_FILE=/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf + ###> symfony/framework-bundle ### APP_ENV=dev APP_SECRET=af0c5e8cb62edd2dd690260da18618a2 diff --git a/.gitmodules b/.gitmodules index fae6a73a..e71b30e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "library/lazy_sessions"] path = library/lazy_sessions url = https://github.com/middlebury/lazy_sessions.git -[submodule "docroot/javascript/jquery-week-calendar"] - path = docroot/javascript/jquery-week-calendar - url = https://github.com/themouette/jquery-week-calendar.git [submodule "library/jsdifflib"] path = library/jsdifflib url = https://github.com/cemerick/jsdifflib.git diff --git a/application/controllers/SchedulesController.php b/application/controllers/SchedulesController.php deleted file mode 100755 index 3ad025da..00000000 --- a/application/controllers/SchedulesController.php +++ /dev/null @@ -1,765 +0,0 @@ -_helper->auth->getHelper()->isAuthenticated()) { - $this->_redirect( - $this->view->url(['controller' => 'auth', 'action' => 'login', 'return' => $this->view->url()]), - ['exit' => true, 'prependBase' => false]); - } - } - - /** - * Initialize the catalog and term we are working with. - * - * Sets the following member properties: - * catalogId osid_id_Id or NULL - * termLookupSession osid_course_TermLookupSession - * termId osid_id_Id or NULL - * - * @return void - */ - protected function initializeCatalogAndTerm() - { - // Select the catalog. - if ($this->_getParam('catalog')) { - $this->catalogId = $this->_helper->osidId->fromString($this->_getParam('catalog')); - $this->setSavedCatalogId($this->catalogId); - } else { - // Check for a saved catalog id. - $this->catalogId = $this->getSavedCatalogId(); - } - - // Load the termLookupSession - if ($this->catalogId) { - $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSessionForCatalog($this->catalogId); - } else { - $this->termLookupSession = $this->_helper->osid->getCourseManager()->getTermLookupSession(); - $this->catalogId = $this->termLookupSession->getCourseCatalogId(); - } - - // Select the term - if ('ANY' == $this->_getParam('term')) { - // Don't set a term - $this->termId = null; - } elseif (!$this->_getParam('term') || 'CURRENT' == $this->_getParam('term')) { - $this->termId = $this->_helper->osidTerms->getNextOrLatestTermId($this->catalogId); - } else { - $this->termId = $this->_helper->osidId->fromString($this->_getParam('term')); - } - } - - /** - * Answer a saved catalog Id or null. - * - * @return osid_id_Id or NULL - */ - protected function getSavedCatalogId() - { - if (!isset($this->savedCatalogId)) { - $stmt = Zend_Registry::get('db')->prepare('SELECT * FROM user_catalog WHERE user_id = ?'); - $stmt->execute([$this->_helper->auth()->getUserId()]); - $row = $stmt->fetch(); - $stmt->closeCursor(); - if ($row) { - $this->savedCatalogId = new phpkit_id_Id($row['catalog_id_authority'], $row['catalog_id_namespace'], $row['catalog_id_keyword']); - } else { - $this->savedCatalogId = null; - } - } - - return $this->savedCatalogId; - } - - /** - * Set the saved catalog id. - * - * @return void - */ - protected function setSavedCatalogId(osid_id_Id $catalogId) - { - if (null !== $this->getSavedCatalogId() && $catalogId->isEqual($this->getSavedCatalogId())) { - return; - } - - $db = Zend_Registry::get('db'); - $insert = $db->prepare('INSERT INTO user_catalog (user_id, catalog_id_authority, catalog_id_namespace, catalog_id_keyword) VALUES (?, ?, ?, ?);'); - try { - $insert->execute([$this->_helper->auth()->getUserId(), $catalogId->getAuthority(), $catalogId->getIdentifierNamespace(), $catalogId->getIdentifier()]); - } catch (Zend_Db_Statement_Exception $e) { - // Already exists - if (23000 == $e->getCode()) { - $update = $db->prepare('UPDATE user_catalog SET catalog_id_authority = ?, catalog_id_namespace = ?, catalog_id_keyword = ? WHERE user_id = ?'); - $update->execute([$catalogId->getAuthority(), $catalogId->getIdentifierNamespace(), $catalogId->getIdentifier(), $this->_helper->auth()->getUserId()]); - } else { - throw $e; - } - } - - $this->savedCatalogId = $catalogId; - } - - public function indexAction() - { - $this->initializeCatalogAndTerm(); - - // Set up data for the menu rendering - $this->setSelectedCatalogId($this->catalogId); - - $this->view->emailEnabled = $this->emailEnabled(); - - // Catalogs - $catalogLookupSession = $this->_helper->osid->getCourseManager()->getCourseCatalogLookupSession(); - $this->view->catalogs = $catalogLookupSession->getCourseCatalogs(); - - // Load all terms for our selection control - $this->termLookupSession->useFederatedCourseCatalogView(); - $terms = $this->termLookupSession->getTerms(); - $termCatalogSession = $this->_helper->osid->getCourseManager()->getTermCatalogSession(); - $this->view->terms = []; - while ($terms->hasNext()) { - $term = $terms->getNextTerm(); - $termCatalogId = $this->catalogId; - $this->view->terms[] = [ - 'name' => $term->getDisplayName(), - 'url' => $this->view->url([ - 'catalog' => $this->_helper->osidId->toString($termCatalogId), - 'term' => $this->_helper->osidId->toString($term->getId()), - ]), - 'id' => $term->getId(), - ]; - } - // Set the selected term - if ($this->termId) { - $this->view->selectedTermId = $this->termId; - $this->view->termIdString = $this->_helper->osidId->toString($this->termId); - } - - // Load the bookmarks for the selected catalog/terms - $bookmarks = $this->_helper->bookmarks(); - if (isset($this->view->selectedTermId)) { - $this->view->bookmarked_courses = $bookmarks->getBookmarkedCoursesInCatalogForTerm($this->catalogId, $this->view->selectedTermId); - } else { - $this->view->bookmarked_courses = $bookmarks->getAllBookmarkedCourses(); - } - - // Load the Schedules for the selected catalog/terms - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - if ($this->view->selectedTermId) { - $this->view->schedules = $schedules->getSchedulesByTerm($this->view->selectedTermId); - } else { - $this->view->schedules = $schedules->getSchedules(); - } - - $this->view->leftText = " -

Important: This tool is for planning purposes only. It does not register you for classes.

- -
Basic Usage: -
    -
  1. Search for courses in the catalog and save interesting ones.
    2. -
  2. Create one or more schedules in the Planner.
    3. -
  3. Add courses to schedules.
    4. -
  4. Print or email your schedules.
    5. -
- -

For more help see: go/catalog-help

-

Issues or Feedback? go/webbugs/Catalog/Planner

-
- "; - } - - /** - * Verify change actions. - * - * @return void - * - * @since 8/2/10 - */ - protected function verifyChangeRequest() - { - if (!$this->_request->isPost()) { - throw new PermissionDeniedException('Create Schedules must be submitted as a POST request.'); - } - $this->_request->setParamSources(['_POST']); - - // Verify our CSRF key - if (!$this->_getParam('csrf_key') == $this->_helper->csrfKey()) { - throw new PermissionDeniedException('Invalid CSRF Key. Please log in again.'); - } - } - - /** - * Return to the index action. - * - * @return void - * - * @since 8/2/10 - */ - protected function returnToIndex() - { - $catalogIdString = $this->_getParam('catalog'); - $termIdString = $this->_getParam('term'); - - // Forward us back to the listing. - $url = $this->view->url(['action' => 'index', 'controller' => 'schedules', 'catalog' => $catalogIdString, 'term' => $termIdString]); - $this->_redirect($url, ['exit' => true, 'prependBase' => false]); - } - - /** - * Create a new schedule. - * - * @return void - * - * @since 8/2/10 - */ - public function createAction() - { - $this->verifyChangeRequest(); - - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - - $schedule = $schedules->createSchedule($this->_helper->osidId->fromString($this->_getParam('term'))); - - $this->returnToIndex(); - } - - /** - * Update a schedule. - * - * @return void - * - * @since 8/2/10 - */ - public function updateAction() - { - $this->verifyChangeRequest(); - - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - - $schedule = $schedules->getSchedule($this->_getParam('schedule_id')); - $schedule->setName($this->_getParam('name')); - - $this->returnToIndex(); - } - - /** - * Delete a schedule. - * - * @return void - * - * @since 8/2/10 - */ - public function deleteAction() - { - $this->verifyChangeRequest(); - - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - - $schedules->deleteSchedule($this->_getParam('schedule_id')); - - $this->returnToIndex(); - } - - /** - * Add sections to a schedule. - * - * @return void - * - * @since 8/2/10 - */ - public function addAction() - { - $this->verifyChangeRequest(); - - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - - $schedule = $schedules->getSchedule($this->_getParam('schedule_id')); - - // Get our ids from the POST - $offeringIds = []; - foreach ($_POST as $key => $val) { - if (preg_match('/^section_group_[0-9]+$/', $key)) { - $offeringIds[] = $this->_helper->osidId->fromString($val); - } - } - if (!count($offeringIds)) { - throw new InvalidArgumentException('No Sections selected.'); - } - - /********************************************************* - * Validate the set of offerings chosen - *********************************************************/ - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - $linkType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:link'); - - $offering = $lookupSession->getCourseOffering($offeringIds[0]); - $course = $offering->getCourse(); - $termId = $offering->getTermId(); - - $selectedLinkSet = $this->_helper->osidId->fromString($this->_getParam('section_set')); - $linkTypes = $course->getLinkTypeIdsForTermAndSet($termId, $selectedLinkSet); - $requiredLinkTypes = []; - while ($linkTypes->hasNext()) { - $requiredLinkTypes[] = [ - 'id' => $linkTypes->getNextId(), - 'found' => false, - ]; - } - - foreach ($offeringIds as $id) { - $offering = $lookupSession->getCourseOffering($id); - - // Verify that the offering is part of the selected link-set. - $linkRecord = $offering->getCourseOfferingRecord($linkType); - if (!$selectedLinkSet->isEqual($linkRecord->getLinkSetId())) { - throw new Exception('The offering chosen is not part of the link-set selected.'); - } - - // Check that we are adding a single section from each link-type. - $linkTypeId = $linkRecord->getLinkTypeId(); - $checked = false; - foreach ($requiredLinkTypes as $key => $info) { - if ($info['id']->isEqual($linkTypeId)) { - $checked = true; - if ($info['found']) { - throw new Exception('A second section from the same link-group is selected.'); - } else { - $requiredLinkTypes[$key]['found'] = true; - } - } - } - if (!$checked) { - throw new Exception("The link-group id of the offering '".$linkTypeId->getIdentifier()."' wasn't in the required list."); - } - - // Also check that the sections are from the same course and term. - if (!$offering->getTermId()->isEqual($termId)) { - throw new Exception('Trying to add offerings from multiple terms.'); - } - if (!$offering->getCourseId()->isEqual($course->getId())) { - throw new Exception('Trying to add offerings from multiple courses.'); - } - } - // Check that we are adding a section for each link-group. - foreach ($requiredLinkTypes as $info) { - if (!$info['found']) { - throw new Exception('No offering was added for the link-group '.$info['id']->getIdentifier().' when adding sections for '.$course->getDisplayName().'. POST: '.print_r($_POST, true)); - } - } - - /********************************************************* - * Remove any offerings for the course already added. - *********************************************************/ - foreach ($schedule->getOfferings() as $oldOffering) { - if ($oldOffering->getCourseId()->isEqual($course->getId())) { - $schedule->remove($oldOffering->getId()); - } - } - - /********************************************************* - * Add the offerings to the Schedule - *********************************************************/ - foreach ($offeringIds as $offeringId) { - try { - $schedule->add($offeringId); - } catch (Exception $e) { - if (23000 != $e->getCode()) { - throw $e; - } - } - } - - $this->returnToIndex(); - } - - /** - * Remove an offering from a schedule. - * - * @return void - * - * @since 8/4/10 - */ - public function removeAction() - { - $this->verifyChangeRequest(); - - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - - $schedule = $schedules->getSchedule($this->_getParam('schedule_id')); - - $lookupSession = $this->_helper->osid->getCourseManager()->getCourseOfferingLookupSession(); - $lookupSession->useFederatedCourseCatalogView(); - - $offering = $lookupSession->getCourseOffering($this->_helper->osidId->fromString($this->_getParam('offering'))); - $courseId = $offering->getCourseId(); - - // Remove the selected offering. - $schedule->remove($offering->getId()); - - // Remove all other offerings for the course. - foreach ($schedule->getOfferings() as $offering) { - if ($offering->getCourse()->getId()->isEqual($courseId)) { - $schedule->remove($offering->getId()); - } - } - - $this->returnToIndex(); - } - - /** - * Answer a JSON list of sections information for a course. - * - * @return void - * - * @since 8/3/10 - */ - public function sectionsforcourseAction() - { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(true); - $this->getResponse()->setHeader('Content-Type', 'text/plain'); - - $offeringSearchSession = $this->_helper->osid->getCourseManager()->getCourseOfferingSearchSession(); - $offeringSearchSession->useFederatedCourseCatalogView(); - - $query = $offeringSearchSession->getCourseOfferingQuery(); - $query->matchCourseId($this->_helper->osidId->fromString($this->_getParam('course')), true); - $query->matchTermId($this->_helper->osidId->fromString($this->_getParam('term')), true); - - $results = $offeringSearchSession->getCourseOfferingsByQuery($query); - - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - $schedule = $schedules->getSchedule($this->_getParam('schedule_id')); - - $sets = []; - $linkType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:link'); - $instructorType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); - while ($results->hasNext()) { - $offering = $results->getNextCourseOffering(); - - $instructors = $offering->getInstructors(); - $instructorString = ''; - while ($instructors->hasNext()) { - $instructorString .= $instructors->getNextResource()->getDisplayName().', '; - } - $instructorString = trim($instructorString, ', '); - - $conflicts = $schedule->conflicts($offering); - if ($conflicts) { - $conflictString = ''; - $conflictingNames = []; - foreach ($schedule->getConflictingEvents($offering) as $event) { - $conflictingNames[] = $event['name']; - } - $conflictString = 'Conflicts with: '.implode(', ', array_unique($conflictingNames)); - } else { - $conflictString = ''; - } - $info = [ - 'id' => $this->_helper->osidId->toString($offering->getId()), - 'name' => $offering->getDisplayName(), - 'type' => $offering->getGenusType()->getDisplayName(), - 'instructor' => $instructorString, - 'location' => $offering->getLocationInfo(), - 'availability' => $this->view->getAvailabilityLink($offering), - 'schedule' => $this->view->formatScheduleInfo($offering->getScheduleInfo()), - 'conflicts' => $conflicts, - 'conflictString' => $conflictString, - ]; - - // Get the link id and ensure that we have a set and type-group for it. - $linkRecord = $offering->getCourseOfferingRecord($linkType); - $linkSetIdString = $this->_helper->osidId->toString($linkRecord->getLinkSetId()); - $info['link_set'] = $linkSetIdString; - if (!isset($sets[$linkSetIdString])) { - $sets[$linkSetIdString] = []; - } - if (!isset($sets[$linkSetIdString]['types'])) { - $sets[$linkSetIdString]['types'] = []; - } - - $linkTypeIdString = $this->_helper->osidId->toString($linkRecord->getLinkTypeId()); - $info['link_type'] = $linkTypeIdString; - if (!isset($sets[$linkSetIdString]['types'][$linkTypeIdString])) { - $sets[$linkSetIdString]['types'][$linkTypeIdString] = []; - } - - // To start with, enable the first section in each group. - // Later, we may want to check if the target schedule already has - // this course added and select the already-added versions so that - // a second addition will update that course's sections rather than - // add them again. - if (!count($sets[$linkSetIdString]['types'][$linkTypeIdString])) { - $info['selected'] = true; - } - - if ($schedule->includes($offering->getId())) { - if (count($sets[$linkSetIdString]['types'][$linkTypeIdString])) { - $sets[$linkSetIdString]['types'][$linkTypeIdString][0]['selected'] = false; - } - $info['selected'] = true; - $sets[$linkSetIdString]['selected'] = true; - } - - // Add the info to the appropriate set. - $sets[$linkSetIdString]['types'][$linkTypeIdString][] = $info; - } - // Use indexted arrays. - // foreach ($sets as $key => $types) { - // $sets[$key] = array_values($types); - // } - // $sets = array_values($sets); - - echo json_encode($sets); - } - - /** - * Answer an array of events for the schedule in JSON format. - * - * @return void - * - * @since 8/5/10 - */ - public function eventsjsonAction() - { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(true); - $this->getResponse()->setHeader('Content-Type', 'text/plain'); - - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - $schedule = $schedules->getSchedule($this->_getParam('schedule_id')); - - $thisWeek = Week::current(); - - $events = $schedule->getWeeklyEvents(); - foreach ($events as $i => &$event) { - $event['title'] = $event['name']; - - if ($event['location']) { - $event['title'] .= '
'.$event['location']; - } - - if ($event['crn']) { - $event['title'] .= ' - CRN: '.$event['crn']; - } - - $day = $thisWeek->asDateAndTime(); - if ($event['dayOfWeek']) { - $day = $day->plus(Duration::withDays($event['dayOfWeek'])); - } - - $dateTime = $day->plus(Duration::withSeconds($event['startTime'])); - $event['start'] = $dateTime->ymdString().' '.$dateTime->hmsString(); - $dateTime = $day->plus(Duration::withSeconds($event['endTime'])); - $event['end'] = $dateTime->ymdString().' '.$dateTime->hmsString(); - - $event['id'] = $i; - } - - echo json_encode($events); - } - - /** - * Answer a PNG Image of the schedule. - * - * @return void - * - * @since 8/5/10 - */ - public function pngAction() - { - $this->_helper->layout->disableLayout(); - - $this->initializeScheduleImage(); - - $this->getResponse()->setHeader('Content-Type', 'image/png'); - } - - /** - * Intitialize our schedule with the ID passed. - * - * @return void - */ - protected function initializeSchedule() - { - if (!isset($this->view->schedule)) { - $schedules = new Schedules(Zend_Registry::get('db'), $this->_helper->auth->getHelper()->getUserId(), $this->_helper->osid->getCourseManager()); - $this->view->schedule = $schedules->getSchedule($this->_getParam('schedule_id')); - } - } - - /** - * Initialize a schedule image. - * - * @return void - */ - protected function initializeScheduleImage() - { - $this->initializeSchedule(); - - $config = Zend_Registry::getInstance()->config; - $this->view->fontFile = $config->schedules->image->font_file; - - $this->view->events = $this->view->schedule->getWeeklyEvents(); - - $this->view->minTime = $this->view->schedule->getEarliestTime(); - if ($this->view->schedule->getLatestTime()) { - $this->view->maxTime = $this->view->schedule->getLatestTime(); - } else { - $this->view->minTime = 9 * 3600; - $this->view->maxTime = 17 * 3600; - } - - $this->view->height = 600; - } - - /** - * Answer a print-view of the schedule. - * - * @return void - * - * @since 8/5/10 - */ - public function printAction() - { - $this->_helper->layout->disableLayout(); - - $this->initializeSchedule(); - } - - /** - * Answer true if sending email is enabled. - * - * @return bool - */ - protected function emailEnabled() - { - $config = Zend_Registry::getInstance()->config; - if (!isset($config->schedules->email->enabled) || !$config->schedules->email->enabled) { - return false; - } - - // Allow enabling email for only some users - if (!empty($config->schedules->email->allowed_groups)) { - $userGroups = $this->_helper->auth()->getUserGroups(); - foreach ($config->schedules->email->allowed_groups as $group) { - if (in_array($group, $userGroups)) { - return true; - } - } - - return false; - } - - return true; - } - - /** - * Answer the email address to send mail from. - * - * @return string - */ - protected function getFromEmail() - { - $config = Zend_Registry::getInstance()->config; - $name = $this->_helper->auth()->getUserDisplayName(); - - if (isset($config->schedules->email->send_mail_as_user) && $config->schedules->email->send_mail_as_user) { - return $name.' <'.$this->_helper->auth()->getUserEmail().'>'; - } elseif (isset($config->schedules->email->send_mail_as) && $config->schedules->email->send_mail_as) { - return $name.' - Catalog <'.$config->schedules->email->send_mail_as.'>'; - } else { - throw new Exception('schedules.email.send_mail_as_user is false, but schedules.email.send_mail_as is not set (in frontend_config.ini).'); - } - } - - /** - * Email a schedule to one or more addresses. - * - * @return void - */ - public function emailAction() - { - $this->_helper->layout->disableLayout(); - $this->_helper->viewRenderer->setNoRender(true); - $this->getResponse()->setHeader('Content-Type', 'text/plain'); - - try { - if (!$this->emailEnabled()) { - throw new Exception('Emailing of schedules is not enabled in frontend_config.ini.'); - } - $this->verifyChangeRequest(); - - $this->initializeSchedule(); - $this->view->messageBody = $this->_getParam('message'); - - // Generate the text version of the email. - $this->render('email-text'); - $text = $this->getResponse()->getBody(); - $this->getResponse()->setBody(''); - - // Generate the html version of the email. - $this->render('email-html'); - $html = $this->getResponse()->getBody(); - $this->getResponse()->setBody(''); - - // Generate the Schedule image. - $this->initializeScheduleImage(); - $this->render('generate-image'); - ob_start(); - imagepng($this->view->image, null, 5); - imagedestroy($this->view->image); - $imageData = ob_get_clean(); - - // To - $to = $this->_helper->auth()->getUserEmail(); - if (strlen(trim($this->_getParam('to'))) && trim($this->_getParam('to')) != $to) { - $to .= ', '.trim($this->_getParam('to')); - } - - // Build the email - $mime = new Mail_mime(); - $headers = [ - 'From' => $this->getFromEmail(), - 'Reply-To' => $this->_helper->auth()->getUserEmail(), - 'CC' => $this->_helper->auth()->getUserEmail(), - 'Subject' => preg_replace('/[^\w \'"&-_.,\/*%#$@!()=+:;<>?]/', '', $this->_getParam('subject')), - ]; - $mime->setTXTBody($text); - $mime->setHTMLBody($html); - $mime->addHTMLImage($imageData, 'image/png', 'schedule_image.png', false); - $mime->addAttachment($imageData, 'image/png', 'schedule_image.png', false); - - // Send the email - $body = $mime->get(); - $headers = $mime->headers($headers); - - $mail = Mail::factory('mail'); - $result = $mail->send($to, $headers, $body); - - if (true === $result) { - echo 'Email sent.'; - } else { - throw $result; - } - } catch (Exception $e) { - error_log($e->getMessage()); - - $this->getResponse()->setHttpResponseCode(500); - $this->getResponse()->setBody($e->getMessage()); - } - } -} diff --git a/application/library/Schedules.php b/application/library/Schedules.php deleted file mode 100755 index bf468029..00000000 --- a/application/library/Schedules.php +++ /dev/null @@ -1,154 +0,0 @@ -db = $db; - $this->userId = $userId; - $this->courseManager = $courseManager; - } - - private $db; - private $userId; - private $courseManager; - - /** - * Create a schedule. - * - * @return Schedule - * - * @since 8/2/10 - */ - public function createSchedule(osid_id_Id $termId) - { - $stmt = $this->db->prepare('INSERT INTO user_schedules (user_id, term_id_keyword, term_id_authority, term_id_namespace, name) VALUES (?, ?, ?, ?, ?);'); - $name = 'Untitled Schedule'; - $stmt->execute([ - $this->userId, - $termId->getIdentifier(), - $termId->getAuthority(), - $termId->getIdentifierNamespace(), - $name, - ]); - $id = $this->db->lastInsertId(); - - return new Schedule($id, $this->db, $this->userId, $this->courseManager, $name, $termId); - } - - /** - * Delete a schedule. - * - * @param string $scheduleId - * - * @return void - * - * @since 7/29/10 - */ - public function deleteSchedule($scheduleId) - { - $stmt = $this->db->prepare('DELETE FROM user_schedules WHERE id = ? AND user_id = ? LIMIT 1;'); - $stmt->execute([ - $scheduleId, - $this->userId, - ]); - } - - /** - * Answer a schedule by Id. - * - * @param string $scheduleId - * - * @return Schedule - * - * @since 8/2/10 - */ - public function getSchedule($scheduleId) - { - $stmt = $this->db->prepare('SELECT * FROM user_schedules WHERE id = ? AND user_id = ? LIMIT 1;'); - $stmt->execute([ - $scheduleId, - $this->userId, - ]); - $rows = $stmt->fetchAll(); - if (!count($rows)) { - throw new InvalidArgumentException('Schedule was not found.'); - } - - return new Schedule($rows[0]['id'], $this->db, $this->userId, $this->courseManager, $rows[0]['name'], new phpkit_id_Id($rows[0]['term_id_authority'], $rows[0]['term_id_namespace'], $rows[0]['term_id_keyword'])); - } - - /** - * Answer all schedules for the current user. - * - * @return array of Schedule objects - * - * @since 8/2/10 - */ - public function getSchedules() - { - $stmt = $this->db->prepare('SELECT * FROM user_schedules WHERE user_id = ?;'); - $stmt->execute([ - $this->userId, - ]); - - $schedules = []; - foreach ($stmt->fetchAll() as $row) { - $schedules[] = new Schedule($row['id'], $this->db, $this->userId, $this->courseManager, $row['name'], new phpkit_id_Id($row['term_id_authority'], $row['term_id_namespace'], $row['term_id_keyword'])); - } - - return $schedules; - } - - /** - * Answer schedules for the current user for a given term. - * - * @return array of Schedule objects - * - * @since 8/2/10 - */ - public function getSchedulesByTerm(osid_id_Id $termId) - { - $stmt = $this->db->prepare('SELECT * FROM user_schedules WHERE user_id = ? AND term_id_keyword = ? AND term_id_authority = ? AND term_id_namespace = ?;'); - $stmt->execute([ - $this->userId, - $termId->getIdentifier(), - $termId->getAuthority(), - $termId->getIdentifierNamespace(), - ]); - - $schedules = []; - foreach ($stmt->fetchAll() as $row) { - $schedules[] = new Schedule($row['id'], $this->db, $this->userId, $this->courseManager, $row['name'], new phpkit_id_Id($row['term_id_authority'], $row['term_id_namespace'], $row['term_id_keyword'])); - } - - return $schedules; - } -} diff --git a/application/views/helpers/GetAvailabilityLink.php b/application/views/helpers/GetAvailabilityLink.php deleted file mode 100755 index a8e7a2f2..00000000 --- a/application/views/helpers/GetAvailabilityLink.php +++ /dev/null @@ -1,27 +0,0 @@ -config; - $bannerIdRecordType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:banner_identifiers'); - if (!empty($config->catalog->banner_web_url) && $courseOffering->hasRecordType($bannerIdRecordType)) { - $bannerIdRecord = $courseOffering->getCourseOfferingRecord($bannerIdRecordType); - - return 'View availability, prerequisites, and other requirements."; - } - - return null; - } -} diff --git a/application/views/scripts/schedules/bookmarks.phtml b/application/views/scripts/schedules/bookmarks.phtml deleted file mode 100755 index 46fe146f..00000000 --- a/application/views/scripts/schedules/bookmarks.phtml +++ /dev/null @@ -1,199 +0,0 @@ -bookmarked_courses->hasNext()) { - print "\n\t

You have no starred courses for this term. Please url(array('controller' => 'offerings', 'action' => 'search', 'catalog' => $this->catalogIdString, 'term' => $this->termIdString), null, true)."\">search for courses and star interesting ones first.

"; -} -?> - - - - - $(function() { // on DOM ready - - $("a.remove_course").click(function () { - if (confirm('Do you want to remove the bookmark for this course?')) { - var li = $(this).parents('li.bookmarked_course'); - $.ajax({ - url: $(this).attr('href'), - success: function () { - li.remove(); - } - }); - } - return false; - }); - - - /********************************************************* - * Set up the add-sections dialog controls - *********************************************************/ - - $(".add_section_dialog").each(function () { - var form = $(this).siblings("form.add_to_schedule_form"); - var addDialog = $(this).dialog({ - autoOpen: false, - width: 600, - modal: true, - close: function(event, ui) { - $(this).find("select.section_set").empty(); - } - }); - - form.data("addDialog", addDialog); - }); - - $("form.add_to_schedule_form select").change(function () { - var form = $(this).parent("form"); - var addDialog = form.data("addDialog"); - var scheduleId = $(this).val(); - $(this).val(""); - - addDialog.find("select.section_set").empty(); - getSectionSets(addDialog, scheduleId); - addDialog.dialog("open"); - }); - - }); - - function getSectionSets (dialog, scheduleId) { - var lookupUrl = dialog.children("input[name=section_lookup_url]").val(); - var courseId = dialog.children("input[name=course_id]").val(); - - dialog.find("input[name=schedule_id]").val(scheduleId); - - $.getJSON(lookupUrl, {course: courseId, schedule_id: scheduleId}, function (data, textStatus) { - populateSectionSetSelect(dialog, scheduleId, data); - populateSectionTypes(dialog, scheduleId, dialog.find("select.section_set").val(), data); - }); - } - - function populateSectionSetSelect(dialog, scheduleId, data) { - var selectList = dialog.find("select.section_set"); - selectList.empty(); - var i = 0; - for (var linkSetId in data) { - i++; - var option = $(''); - if (data[linkSetId].selected) { - option.attr('selected', 'selected'); - } - selectList.append(option); - } - if (i > 1) { - dialog.find("div.section_set").show(); - } else { - dialog.find("div.section_set").hide(); - } - - selectList.data('section_data', data); - selectList.data('dialog', dialog); - selectList.data('scheduleId', scheduleId); - selectList.change(function() { - populateSectionTypes($(this).data('dialog'), $(this).data('scheduleId'), $(this).val(), $(this).data('section_data')); - }); - } - - function populateSectionTypes (dialog, scheduleId, linkSetId, data) { - - var typesList = dialog.find("ul.section_types"); - typesList.empty(); - var i = 0; - for (var linkTypeId in data[linkSetId]['types']) { - var sectionType = data[linkSetId]['types'][linkTypeId]; - - var typeListItem = $('
  • '); - typesList.append(typeListItem); - var typeList = $('
      '); - typeListItem.append(typeList); - - for (var j = 0; j < sectionType.length; j++) { - var section = sectionType[j]; - - var item = $('
    • '); - typeList.append(item); - var radio = $(''); - item.append(radio); - if (section.selected) { - radio.attr('checked', 'checked'); - } - item.append(' '); - item.append(section.name); - item.append('
      '+section.type+' - '+section.instructor+'
      '); - item.append(''); - if (section.conflicts) { - var conflictsClass = ' conflicting'; - var conflictNames = '
          ' + section.conflictString; - } else { - var conflictsClass = ''; - var conflictNames = ''; - } - item.append('
      '+section.schedule+conflictNames+'
      '); - item.append('
      '+section.location+'
      '); - if (section.availability) { - item.append('
      '+section.availability+'
      '); - } - } - - i++; - } - } - -headScript()->appendScript(ob_get_clean()); diff --git a/application/views/scripts/schedules/catalog_select.phtml b/application/views/scripts/schedules/catalog_select.phtml deleted file mode 100755 index b6a9aa83..00000000 --- a/application/views/scripts/schedules/catalog_select.phtml +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/application/views/scripts/schedules/email-dialog.phtml b/application/views/scripts/schedules/email-dialog.phtml deleted file mode 100755 index c36cc8dd..00000000 --- a/application/views/scripts/schedules/email-dialog.phtml +++ /dev/null @@ -1,174 +0,0 @@ -emailEnabled) { - return; -} -?> - - - - - - - $(function() { // on DOM ready - - /********************************************************* - * Email controls - *********************************************************/ - $(".email_dialog").each(function() { - var button = $(this).siblings(".email_button"); - var emailDialog = $(this).dialog({ - autoOpen: false, - width: 700, - modal: true, - position: 'top' - }); - - button.data("emailDialog", emailDialog); - }); - $(".email_button").click(function(){ - var emailDialog = $(this).data('emailDialog'); - emailDialog.dialog("open"); - - // Store the original subject. - var field = emailDialog.find('input[name=subject]'); - if (!field.data('orig')) { - field.data('orig', field.val()); - } - - // Store the original message. - var field = emailDialog.find('textarea[name=message]'); - if (!field.data('orig')) { - field.data('orig', field.val()); - } - - return false; - }); - - $(".email_dialog form").submit(function() { - var to = $(this).find("input[name=to]").val(); - to = to.replace(/^\s*/, '').replace(/\s*$/, ''); - - if (!to.length) { - if (!confirm("You didn't specify a recipient.\n\nClick 'Cancel' to add one or 'Ok' to send only to yourself.")) { - return false; - } - } - if (to.length && !validateEmail(to)) { - alert("It doesn't look like you specified a valid email address in the 'To:' field."); - return false; - } - - // Submit the form asynchronously, clear the to & body, then close. - var form = $(this); - var emailDialog = form.parents('.email_dialog'); - - $.ajax({ - type: "POST", - url: form.attr('action'), - data: form.serialize(), - success: function (data, textStatus, req) { - if (data.length) { - alert(data); - } - - // Clear the form. - form.find('input[name=to]').val(''); - - var field = form.find('input[name=subject]'); - field.val(field.data('orig')); - - var field = form.find('textarea[name=message]'); - field.val(field.data('orig')); - }, - error: function(req, textStatus, errorThrown) { - emailDialog.dialog('open'); - alert("Couldn't send email.\n\n" + req.responseText); - } - }); - - // Close the dialog. - emailDialog.dialog('close'); - return false; - }); - - }); - - /** - * Validate the email field - * - * @param string emailString - * @return boolean - */ - function validateEmail (emailString) { - var addresses = emailString.split(","); - for (var i = 0; i < addresses.length; i++) { - var address = addresses[i].replace(/^\s*/, '').replace(/\s*$/, ''); - if (!validateEmailAddress(address)) { - return false; - } - } - return true; - } - - /** - * Validate an email address. - * By "sectrean" at http://stackoverflow.com/questions/46155/validate-email-address-in-javascript/46181#46181 - * - * @param string email - * @return boolean - */ - function validateEmailAddress (email) { - var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; - return email.match(re); - } - - -headScript()->appendScript(ob_get_clean()); - define('EMAIL_DIALOG_JS_ADDED', true); -} diff --git a/application/views/scripts/schedules/email-html.phtml b/application/views/scripts/schedules/email-html.phtml deleted file mode 100755 index 77671e6a..00000000 --- a/application/views/scripts/schedules/email-html.phtml +++ /dev/null @@ -1,8 +0,0 @@ - - -

      escape($this->messageBody)); ?>

      -
      - Weekly Schedule Image - render('schedules/email-offering-list.phtml'); ?> - - diff --git a/application/views/scripts/schedules/email-offering-list.phtml b/application/views/scripts/schedules/email-offering-list.phtml deleted file mode 100755 index cdf84e7a..00000000 --- a/application/views/scripts/schedules/email-offering-list.phtml +++ /dev/null @@ -1,32 +0,0 @@ -schedule->getOfferings(); - -if (!count($offerings)) { - return; -} -print "\n\t\t"; -foreach ($offerings as $offering) { - print "\n\t\t\t"; - - print "\n\t\t"; - - print "\n\t\t"; - - print "\n\t\t"; - print "\n\t\t"; - - print "\n\t\t\t"; -} -print "\n\t\t
      "; - print "\n\t\t\t 'offerings', 'action' => 'view', 'offering' => $this->getStringFromOsidId($offering->getId())))."' target='_blank'>"; - print $this->escape($offering->getDisplayName()); - print "
      CRN: ".$this->escape($offering->getCourseReferenceNumber()); - print "\n\t\t      		"; - print "\n\t\t\t 'offerings', 'action' => 'view', 'offering' => $this->getStringFromOsidId($offering->getId())))."' target='_blank'>"; - print nl2br($this->escape($offering->getTitle())); - print ""; - print "\n\t\t".$this->formatScheduleInfo($offering->getScheduleInfo())."".nl2br($this->escape($offering->getLocationInfo()))."
      "; diff --git a/application/views/scripts/schedules/email-preview.phtml b/application/views/scripts/schedules/email-preview.phtml deleted file mode 100755 index 6b0791d5..00000000 --- a/application/views/scripts/schedules/email-preview.phtml +++ /dev/null @@ -1,5 +0,0 @@ -url(array('action' => 'png', 'schedule_id' => $this->schedule->getId()))."' alt='Weekly Schedule Image'/>"; - -print $this->render('schedules/email-offering-list.phtml'); diff --git a/application/views/scripts/schedules/generate-image.phtml b/application/views/scripts/schedules/generate-image.phtml deleted file mode 100755 index eb0f5395..00000000 --- a/application/views/scripts/schedules/generate-image.phtml +++ /dev/null @@ -1,208 +0,0 @@ -events as $event) { - if ($event['dayOfWeek'] == 0) - $hasSunday = true; - if ($event['dayOfWeek'] == 6) - $hasSaturday = true; -} -$numDays = 7; -$startDay = 0; -$endDay = 6; -if (!$hasSunday) { - $numDays--; - $startDay = 1; -} -if (!$hasSaturday) { - $numDays--; - $endDay = 5; -} - - -/********************************************************* - * Set up our image. - *********************************************************/ - -$width = 910; -if ($this->width) - $width = $this->width; -$height = 800; -if ($this->height) - $height = $this->height; - -if (empty($this->fontFile)) { - throw new Exception("No font-file configured."); -} -if (!file_exists($this->fontFile)) { - throw new Exception("Font-file missing, not found at ".$this->fontFile); -} - -$im = ImageCreateTrueColor($width, $height); - -// Set colors -$black = ImageColorAllocate($im, 0, 0, 0); -$white = ImageColorAllocate($im, 255, 255, 255); -$orange = ImageColorAllocate($im, 255, 200, 0); -$yellow = ImageColorAllocate($im, 255, 255, 0); -$tan = ImageColorAllocate($im, 255, 255, 190); -$ltgrey = ImageColorAllocate($im, 235, 235, 235); -$grey = ImageColorAllocate($im, 200, 200, 200); -$dkgrey = ImageColorAllocate($im, 140, 140, 140); -$blue = ImageColorAllocate($im, 0, 90, 207); -$red = ImageColorAllocate($im, 255, 50, 50); -$darkred = ImageColorAllocate($im, 0, 0, 0); -$ltblue = ImageColorAllocate($im, 175, 210, 255); - - -// Background color -imagefilledrectangle($im, 0, 0, $width, $height, $white); - -$timeWidth = 97; -$gridWidth = $width - $timeWidth; -$dayWidth = floor($gridWidth / $numDays); - -$firstHour = floor($this->minTime/3600); -$gridStartTime = $firstHour * 3600; -$hoursToShow = ceil(($this->maxTime - $this->minTime)/3600); - -$headerHeight = 48; -$gridHeight = $height - $headerHeight; -$hourHeight = floor($gridHeight / $hoursToShow); - -// header row & time column -imagefilledrectangle($im, 1, 1, $width - 2, $headerHeight - 1, $ltgrey); -imagefilledrectangle($im, 1, 1, $timeWidth - 1, $height - 2, $ltgrey); - -// Hours -for ($h = 0; $h < $hoursToShow; $h++) { - $top = $headerHeight + ($hourHeight * $h); - $bottom = $top + $hourHeight; - imagerectangle($im, 0, $top, $width, $bottom, $grey); -} - -// Days -for ($d = $startDay; $d < $numDays; $d++) { - $left = $timeWidth + ($dayWidth * $d); - $right = $left + $dayWidth; - imagerectangle($im, $left, 0, $right, $height, $black); -} - -// Day Labels -$days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'); -for ($d = $startDay; $d <= $endDay; $d++) { - $label = $days[$d]; - - $dayPosition = $d - $startDay; - $left = $timeWidth + ($dayWidth * $dayPosition); - $size = 24; - $bb = imagettfbbox($size, 0, $this->fontFile, $label); - $textWidth = $bb[2] - $bb[0]; - ImageTTFText($im, $size, 0, round($left + (($dayWidth - $textWidth)/2)), $headerHeight - 5, $black, $this->fontFile, $label); -} - -// Hour Labels -for($i = 0; $i < $hoursToShow; $i++) { - $hour = $firstHour + $i; - if ($hour < 12) - $hourString = $hour.':00 am'; - else if ($hour == 12) - $hourString = '12:00 pm'; - else - $hourString = ($hour - 12).':00 pm'; - - $size = 12; - $bb = imagettfbbox($size, 0, $this->fontFile, $hourString); - $textWidth = $bb[2] - $bb[0]; - $textHeight = $bb[1] - $bb[5]; - $top = $headerHeight + ($hourHeight * $i) + $textHeight + intval(($hourHeight - $textHeight)/2); - $left = $timeWidth - $textWidth - 10; - ImageTTFText($im, $size, 0, $left, $top, $black, $this->fontFile, $hourString); -} - -/********************************************************* - * Events - *********************************************************/ - -foreach ($this->events as $event) { - if ($event['collisions']) { - $eventColor = $red; - $eventBorderColor = $darkred; - } else { - $eventColor = $ltblue; - $eventBorderColor = $blue; - } - $dayPosition = $event['dayOfWeek'] - $startDay; - $left = $timeWidth + ($dayWidth * $dayPosition) + 1; // 1px margin - $right = $left + $dayWidth - 2; // 1px margin - - $top = timePosition($gridStartTime, $hourHeight, $event['startTime']) + $headerHeight; - $bottom = timePosition($gridStartTime, $hourHeight, $event['endTime']) + $headerHeight; - - imagefilledrectangle($im, $left, $top, $right, $bottom, $eventColor); - imagerectangle($im, $left, $top, $right, $bottom, $eventBorderColor); - - $start = Time::withSeconds($event['startTime']); - $end = Time::withSeconds($event['endTime']); - $string = $start->hour12().':'.str_pad($start->minute(), 2, '0', STR_PAD_LEFT).'-'.$end->hour12().':'.str_pad($end->minute(), 2, '0', STR_PAD_LEFT); - $size = 10; - $bb = imagettfbbox($size, 0, $this->fontFile, $string); - $textWidth = $bb[2] - $bb[0]; - $textHeight = $bb[1] - $bb[5]; - $textTop = $top + $textHeight + 3; - $textLeft = $left + round(($dayWidth - $textWidth)/2); - ImageTTFText($im, $size, 0, $textLeft, $textTop, $black, $this->fontFile, $string); - - $size = 10; - $bb = imagettfbbox($size, 0, $this->fontFile, $event['name']); - $textWidth = $bb[2] - $bb[0]; - $textHeight = $bb[1] - $bb[5]; - $textTop = $top + $textHeight + 16; - $textLeft = $left + round(($dayWidth - $textWidth)/2); - ImageTTFText($im, $size, 0, $textLeft, $textTop, $black, $this->fontFile, $event['name']); - - $size = 10; - $bb = imagettfbbox($size, 0, $this->fontFile, $event['location']); - $textWidth = $bb[2] - $bb[0]; - $textHeight = $bb[1] - $bb[5]; - $textTop = $top + $textHeight +$textHeight + 22; - $textLeft = $left + round(($dayWidth - $textWidth)/2); - ImageTTFText($im, $size, 0, $textLeft, $textTop, $black, $this->fontFile, $event['location']); - - $size = 10; - $bb = imagettfbbox($size, 0, $this->fontFile, $event['crn']); - $textWidth = $bb[2] - $bb[0]; - $textHeight = $bb[1] - $bb[5]; - //$textTop = $top + $textHeight +$textHeight + 34; - $textTop += 14; - $textLeft = $left + round(($dayWidth - $textWidth)/3); - ImageTTFText($im, $size, 0, $textLeft, $textTop, $black, $this->fontFile, "CRN: ".$event['crn']); - -} - -function timePosition($gridStartTime, $hourHeight, $time) { - $diff = $time - $gridStartTime; - $hours = $diff/3600; - return round($hours * $hourHeight); -} - - -/********************************************************* - * Final Outlines. - *********************************************************/ - -// Background Outline -imagerectangle($im, 0, 0, $width - 1, $height - 1, $black); -// Header & time outlines -imagerectangle($im, 0, 0, $width, $headerHeight, $black); -imagerectangle($im, 0, 0, $timeWidth, $height, $black); - - -/********************************************************* - * Save the image for output by another view. - *********************************************************/ -$this->image = $im; diff --git a/application/views/scripts/schedules/index.phtml b/application/views/scripts/schedules/index.phtml deleted file mode 100755 index cda689ed..00000000 --- a/application/views/scripts/schedules/index.phtml +++ /dev/null @@ -1,39 +0,0 @@ -headScript()->appendScript(" - $(function() { // on DOM ready - - $('#schedules_term_choice select').change(function () { - window.location = $(this).val(); - }); - - }); -"); -$this->headTitle('Schedule Planner'); -?> - - - - - - - - - - - - - - - - - -
      -
      - render('schedules/catalog_select.phtml'); ?> - render('schedules/term_select.phtml'); ?> -
      -
      Saved Courses in render('schedules/selected_term_name.phtml'); ?>Schedules for render('schedules/selected_term_name.phtml'); ?>
      - render('schedules/bookmarks.phtml'); ?> - - render('schedules/schedules.phtml'); ?> -
      diff --git a/application/views/scripts/schedules/remove_offering_dialog.phtml b/application/views/scripts/schedules/remove_offering_dialog.phtml deleted file mode 100755 index 9db038ad..00000000 --- a/application/views/scripts/schedules/remove_offering_dialog.phtml +++ /dev/null @@ -1,117 +0,0 @@ -"; -print "

      What do you want to do?

      "; - -// Change form -$scheduleTermIdString = $this->getStringFromOsidId($this->schedule->getTermId()); -?> - - - -url(array('action' => 'remove'))."' method='post'>"; -print "\n\t\t\t"; -print "\n\t\t\t"; -print "\n\t\t\t"; -print "\n\t\t\t"; -print "\n\t\t"; - -// Cancel -print "\n\t\t"; - -print "\n\t\t
      "; - -// Remove/Change Button. -print "\n\t\t"; - - - -if (!defined('REMOVE_OFFERING_DIALOG_JS_ADDED')) { - ob_start(); -?> - - $(function() { // on DOM ready - - /********************************************************* - * Remove dialog controls - *********************************************************/ - $(".remove_dialog").each(function() { - var button = $(this).siblings(".remove_button"); - var removeDialog = $(this).dialog({ - autoOpen: false, - width: 600, - modal: true, - position: 'top' - }); - - button.data("removeDialog", removeDialog); - }); - - $(".remove_button").click(function(){ - var removeDialog = $(this).data('removeDialog'); - removeDialog.dialog("open"); - }); - - $(".remove_dialog .cancel").click(function() { - $(this).parent().dialog('close'); - }); - - $(".change_section_dialog").each(function () { - var button = $(this).siblings(".change_sections_button"); - var addDialog = $(this).dialog({ - autoOpen: false, - width: 600, - modal: true, - close: function(event, ui) { - $(this).find("ul.section_sets").empty(); - } - }); - - button.data("addDialog", addDialog); - }); - - $(".change_sections_button").click(function () { - var removeDialog = $(this).parent(); - removeDialog.dialog("close"); - - var addDialog = $(this).data("addDialog"); - var scheduleId = addDialog.find("input[name=schedule_id]").val(); - - addDialog.find("ul.section_sets").empty(); - getSectionSets(addDialog, scheduleId); - addDialog.dialog("open"); - }); - - }); - - -headScript()->appendScript(ob_get_clean()); - define('REMOVE_OFFERING_DIALOG_JS_ADDED', true); -} diff --git a/application/views/scripts/schedules/schedule_calendar_dialog.phtml b/application/views/scripts/schedules/schedule_calendar_dialog.phtml deleted file mode 100755 index 6dac15bb..00000000 --- a/application/views/scripts/schedules/schedule_calendar_dialog.phtml +++ /dev/null @@ -1,68 +0,0 @@ -url(array('action' => 'eventsjson', 'schedule_id' => $this->schedule->getId()))."' title='Click to zoom'>"; -print "\n\t 'png', 'schedule_id' => $this->schedule->getId()))."' alt='Weekly Schedule Image'/>"; -print "\n\t\t"; - -print "\n\t"; - - -if (!defined('CALENDAR_DIALOG_JS_ADDED')) { - ob_start(); -?> - - $(function() { // on DOM ready - - /********************************************************* - * Calendar controls - *********************************************************/ - headLink()->appendStylesheet($this->url(array(), null, true).'javascript/jquery-week-calendar/jquery.weekcalendar.css'); - $this->headStyle()->appendStyle(' - div.wc-toolbar {display: none;} - .wc-time-slots .wc-today { background-color: #FFF; } - .wc-header .wc-today { font-weight: normal; } - '); - $this->headScript()->appendFile($this->url(array(), null, true).'javascript/jquery-week-calendar/libs/date.js'); - $this->headScript()->appendFile($this->url(array(), null, true).'javascript/jquery-week-calendar/jquery.weekcalendar.js'); - $this->headScript()->appendFile($this->url(array(), null, true).'javascript/schedule.js'); - - ?> - - $(".calendar").each(function() { - var button = $(this).siblings(".calendar_button"); - var calendar = $(this).dialog({ - autoOpen: false, - width: 900, - modal: true, - position: 'top' - }); - - button.data("calendar", calendar); - }); - $(".calendar_button").click(function(){ - var jsonUrl = $(this).attr('href'); - var calendar = $(this).data('calendar'); - calendar.dialog("open"); - - if (!calendar.data('initialized')) { - renderSchedule(calendar, jsonUrl); - calendar.data('initialized', true); - } - - return false; - }); - - }); - - -headScript()->appendScript(ob_get_clean()); - define('CALENDAR_DIALOG_JS_ADDED', true); -} diff --git a/application/views/scripts/schedules/schedules.phtml b/application/views/scripts/schedules/schedules.phtml deleted file mode 100755 index ddfbe843..00000000 --- a/application/views/scripts/schedules/schedules.phtml +++ /dev/null @@ -1,112 +0,0 @@ -schedules as $schedule) { - print "\n
      "; - - // Print the Term the schedule is for if we don't have a term selected. - if (!$this->selectedTermId) { - print "\n\t
      "; - print $schedule->getTermName(); - print "
      "; - } - - // Delete Button - print "\n\t
      'delete'))."' method='post'>"; - print "\n\t\t"; - print "\n\t\t"; - print "\n\t\t"; - print "\n\t
      "; - - // Schedule name - print "\n\t
      'update'))."' method='post'>"; - print "\n\t\tescape($schedule->getName())."\"/>"; - print "\n\t\t"; - print "\n\t\t"; - print "\n\t\t"; - print "\n\t
      "; - - // Print view. - print "\n\t 'print', 'schedule_id' => $schedule->getId()))."' title='Click for print view.' target='print_view'>"; - print "\n\t"; - print "\n\t\t"; - - $this->schedule = $schedule; - - // Email view. - print $this->render('schedules/email-dialog.phtml'); - - // Calendar - print $this->render('schedules/schedule_calendar_dialog.phtml'); - - - - print "\n\t\t"; - - print "\n
      "; -} - -?> - -
      - for - render('schedules/terms.phtml'); ?> - - - -
      - - - - $(function() { // on DOM ready - - $('form.delete_schedule').submit(function () { - return confirm('Are you sure you want to delete this schedule?'); - }); - - $('a.print_button').click(function() { - var printView = window.open(this.href, this.target, "menubar=1,resizable=1,height=600,width=800,scrollbars=1"); - printView.focus(); - return false; - }); - - }); - - -headScript()->appendScript(ob_get_clean()); diff --git a/application/views/scripts/schedules/selected_term_name.phtml b/application/views/scripts/schedules/selected_term_name.phtml deleted file mode 100755 index bf4f06db..00000000 --- a/application/views/scripts/schedules/selected_term_name.phtml +++ /dev/null @@ -1,16 +0,0 @@ -selectedTermId)) { - print "All Terms"; - return; -} - -$found = false; -foreach($this->terms as $termInfo) { - if ($termInfo['id']->isEqual($this->selectedTermId)) { - print $termInfo['name']; - $found = true; - } -} -if (!$found) - if (isset($this->selectedTermId)); diff --git a/application/views/scripts/schedules/term_select.phtml b/application/views/scripts/schedules/term_select.phtml deleted file mode 100755 index 06d47700..00000000 --- a/application/views/scripts/schedules/term_select.phtml +++ /dev/null @@ -1,13 +0,0 @@ - diff --git a/application/views/scripts/schedules/terms.phtml b/application/views/scripts/schedules/terms.phtml deleted file mode 100755 index 0e201aaa..00000000 --- a/application/views/scripts/schedules/terms.phtml +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/assets/email_controls.js b/assets/email_controls.js new file mode 100644 index 00000000..01c7a08d --- /dev/null +++ b/assets/email_controls.js @@ -0,0 +1,114 @@ +import $ from 'jquery'; + +$('document').ready(function() { + + /********************************************************* + * Email controls + *********************************************************/ + $(".email_dialog").each(function() { + var button = $(this).siblings(".email_button"); + var emailDialog = $(this).dialog({ + autoOpen: false, + width: 700, + modal: true, + position: 'top' + }); + + button.data("emailDialog", emailDialog); + }); + $(".email_button").click(function(){ + var emailDialog = $(this).data('emailDialog'); + emailDialog.dialog("open"); + + // Store the original subject. + var field = emailDialog.find('input[name=subject]'); + if (!field.data('orig')) { + field.data('orig', field.val()); + } + + // Store the original message. + var field = emailDialog.find('textarea[name=message]'); + if (!field.data('orig')) { + field.data('orig', field.val()); + } + + return false; + }); + + $(".email_dialog form").submit(function() { + var to = $(this).find("input[name=to]").val(); + to = to.replace(/^\s*/, '').replace(/\s*$/, ''); + + if (!to.length) { + if (!confirm("You didn't specify a recipient.\n\nClick 'Cancel' to add one or 'Ok' to send only to yourself.")) { + return false; + } + } + if (to.length && !validateEmail(to)) { + alert("It doesn't look like you specified a valid email address in the 'To:' field."); + return false; + } + + // Submit the form asynchronously, clear the to & body, then close. + var form = $(this); + var emailDialog = form.parents('.email_dialog'); + + $.ajax({ + type: "POST", + url: form.attr('action'), + data: form.serialize(), + success: function (data, textStatus, req) { + if (data.length) { + alert(data); + } + + // Clear the form. + form.find('input[name=to]').val(''); + + var field = form.find('input[name=subject]'); + field.val(field.data('orig')); + + var field = form.find('textarea[name=message]'); + field.val(field.data('orig')); + }, + error: function(req, textStatus, errorThrown) { + emailDialog.dialog('open'); + alert("Couldn't send email.\n\n" + req.responseText); + } + }); + + // Close the dialog. + emailDialog.dialog('close'); + return false; + }); + +}); + +/** +* Validate the email field +* +* @param string emailString +* @return boolean +*/ +function validateEmail (emailString) { + var addresses = emailString.split(","); + for (var i = 0; i < addresses.length; i++) { + var address = addresses[i].replace(/^\s*/, '').replace(/\s*$/, ''); + if (!validateEmailAddress(address)) { + return false; + } + } + return true; +} + +/** +* Validate an email address. +* By "sectrean" at http://stackoverflow.com/questions/46155/validate-email-address-in-javascript/46181#46181 +* +* @param string email +* @return boolean +*/ +function validateEmailAddress (email) { + var re = /^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + return email.match(re); +} diff --git a/assets/schedules.js b/assets/schedules.js new file mode 100755 index 00000000..2576354c --- /dev/null +++ b/assets/schedules.js @@ -0,0 +1,304 @@ +import './styles/schedules.css'; +import $ from 'jquery'; +import './email_controls.js'; +import './jquery-week-calendar/jquery.weekcalendar.css' +import 'jquery_week_calendar_date' +import 'jquery_week_calendar' + +$('document').ready(function() { + + $('#schedules_term_choice select').change(function () { + window.location = $(this).val(); + }); + + $("a.remove_course").click(function () { + if (confirm('Do you want to remove the bookmark for this course?')) { + var li = $(this).parents('li.bookmarked_course'); + $.ajax({ + url: $(this).attr('href'), + success: function () { + li.remove(); + } + }); + } + return false; + }); + + + /********************************************************* + * Set up the add-sections dialog controls + *********************************************************/ + $(".add_section_dialog").each(function () { + var form = $(this).siblings("form.add_to_schedule_form"); + var addDialog = $(this).dialog({ + autoOpen: false, + width: 600, + modal: true, + close: function(event, ui) { + $(this).find("select.section_set").empty(); + } + }); + + form.data("addDialog", addDialog); + }); + + $("form.add_to_schedule_form select").change(function () { + var form = $(this).parent("form"); + var addDialog = form.data("addDialog"); + var scheduleId = $(this).val(); + $(this).val(""); + + addDialog.find("select.section_set").empty(); + getSectionSets(addDialog, scheduleId); + addDialog.dialog("open"); + }); + + $('form.delete_schedule').submit(function () { + return confirm('Are you sure you want to delete this schedule?'); + }); + + $('a.print_button').click(function() { + var printView = window.open(this.href, this.target, "menubar=1,resizable=1,height=600,width=800,scrollbars=1"); + printView.focus(); + return false; + }); + + /********************************************************* + * Remove dialog controls + *********************************************************/ + $(".remove_dialog").each(function() { + var button = $(this).siblings(".remove_button"); + var removeDialog = $(this).dialog({ + autoOpen: false, + width: 600, + modal: true, + position: 'top' + }); + + button.data("removeDialog", removeDialog); + }); + + $(".remove_button").click(function(){ + var removeDialog = $(this).data('removeDialog'); + removeDialog.dialog("open"); + }); + + $(".remove_dialog .cancel").click(function() { + $(this).parent().dialog('close'); + }); + + $(".change_section_dialog").each(function () { + var button = $(this).siblings(".change_sections_button"); + var addDialog = $(this).dialog({ + autoOpen: false, + width: 600, + modal: true, + close: function(event, ui) { + $(this).find("ul.section_sets").empty(); + } + }); + + button.data("addDialog", addDialog); + }); + + $(".change_sections_button").click(function () { + var removeDialog = $(this).parent(); + removeDialog.dialog("close"); + + var addDialog = $(this).data("addDialog"); + var scheduleId = addDialog.find("input[name=scheduleId]").val(); + + addDialog.find("ul.section_sets").empty(); + getSectionSets(addDialog, scheduleId); + addDialog.dialog("open"); + }); + + /********************************************************* + * Calendar controls + *********************************************************/ + $(".calendar").each(function() { + var button = $(this).siblings(".calendar_button"); + var calendar = $(this).dialog({ + autoOpen: false, + width: 900, + modal: true, + position: 'top' + }); + + button.data("calendar", calendar); + }); + + $(".calendar_button").click(function(){ + var jsonUrl = $(this).attr('href'); + var calendar = $(this).data('calendar'); + calendar.dialog("open"); + + if (!calendar.data('initialized')) { + renderSchedule(calendar, jsonUrl); + calendar.data('initialized', true); + } + + return false; + }); + + +}); + +function renderSchedule(calendarJQ, jsonUrl, timeslotHeight, textSize) { + if (!timeslotHeight) + timeslotHeight = 20; + if (!textSize) + textSize = 13; + + var year = new Date().getFullYear(); + var month = new Date().getMonth(); + var day = new Date().getDate(); + + var startHour = new Number(calendarJQ.find('input:hidden[name=start_hour]').val()); + var endHour = new Number(calendarJQ.find('input:hidden[name=end_hour]').val()); + + // 4 timeslots per hour, 20 height per slot. + // Add on the approximate size of the header. + var scheduleHeight = ((endHour - startHour + 1) * 4 * timeslotHeight) + 70; + + var daysToShow = 7; + var firstDayOfWeek = 0; + if (calendarJQ.find('input:hidden[name=show_sunday]').val() == 'no') { + daysToShow--; + firstDayOfWeek = 1; + } + if (calendarJQ.find('input:hidden[name=show_saturday]').val() == 'no') { + daysToShow--; + } + + calendarJQ.weekCalendar({ + date:new Date(year, month, day, 9), + readonly: true, + allowCalEventOverlap: true, + overlapEventsSeparate: true, + timeslotsPerHour: 4, + timeslotHeight: timeslotHeight, + textSize: textSize, + businessHours : { + start: startHour, + end: endHour, + limitDisplay : true + }, + daysToShow: daysToShow, + firstDayOfWeek: firstDayOfWeek, + height: function($calendarJQ){ + var maxHeight = $(window).height() - $("h1").outerHeight(true); + if (maxHeight > scheduleHeight) + return scheduleHeight; + else + return maxHeight; + }, + eventRender : function(calEvent, $event) { + if(calEvent.collisions > 0) { + $event.css({"backgroundColor":"#F77", "border":"1px solid #F00"}); + $event.find(".wc-time").css({"backgroundColor": "#F22", "border":"1px solid #F00"}); + } + }, + noEvents : function() { + displayMessage("There are no events for this week"); + }, + data: jsonUrl + }); + + calendarJQ.find('td.wc-day-column-header').each(function() { + $(this).html($(this).html().replace(/<.*$/, '')); + }); + + $('form.delete_schedule').submit(function () { + return confirm('Are you sure you want to delete this schedule?'); + }); + + $('a.print_button').click(function() { + var printView = window.open(this.href, this.target, "menubar=1,resizable=1,height=600,width=800,scrollbars=1"); + printView.focus(); + return false; + }); +} + +function getSectionSets (dialog, scheduleId) { + var lookupUrl = dialog.children("input[name=section_lookup_url]").val(); + var courseId = dialog.children("input[name=course_id]").val(); + + dialog.find("input[name=scheduleId]").val(scheduleId); + + $.getJSON(lookupUrl, {course: courseId, scheduleId: scheduleId}, function (data, textStatus) { + populateSectionSetSelect(dialog, scheduleId, data); + populateSectionTypes(dialog, scheduleId, dialog.find("select.section_set").val(), data); + }); +} + +function populateSectionSetSelect(dialog, scheduleId, data) { + var selectList = dialog.find("select.section_set"); + selectList.empty(); + var i = 0; + for (var linkSetId in data) { + i++; + var option = $(''); + if (data[linkSetId].selected) { + option.attr('selected', 'selected'); + } + selectList.append(option); + } + if (i > 1) { + dialog.find("div.section_set").show(); + } else { + dialog.find("div.section_set").hide(); + } + + selectList.data('section_data', data); + selectList.data('dialog', dialog); + selectList.data('scheduleId', scheduleId); + selectList.change(function() { + populateSectionTypes($(this).data('dialog'), $(this).data('scheduleId'), $(this).val(), $(this).data('section_data')); + }); +} + +function populateSectionTypes (dialog, scheduleId, linkSetId, data) { + + var typesList = dialog.find("ul.section_types"); + typesList.empty(); + var i = 0; + for (var linkTypeId in data[linkSetId]['types']) { + var sectionType = data[linkSetId]['types'][linkTypeId]; + + var typeListItem = $('
    • '); + typesList.append(typeListItem); + var typeList = $('
        '); + typeListItem.append(typeList); + + for (var j = 0; j < sectionType.length; j++) { + var section = sectionType[j]; + + var item = $('
      • '); + typeList.append(item); + var radio = $(''); + item.append(radio); + if (section.selected) { + radio.attr('checked', 'checked'); + } + item.append(' '); + item.append(section.name); + item.append('
        '+section.type+' - '+section.instructor+'
        '); + item.append(''); + if (section.conflicts) { + var conflictsClass = ' conflicting'; + var conflictNames = '
            ' + section.conflictString; + } else { + var conflictsClass = ''; + var conflictNames = ''; + } + item.append('
        '+section.schedule+conflictNames+'
        '); + item.append('
        '+section.location+'
        '); + if (section.availability) { + item.append('
        '+section.availability+'
        '); + } + } + + i++; + } +} diff --git a/assets/styles/schedules.css b/assets/styles/schedules.css new file mode 100644 index 00000000..da93057b --- /dev/null +++ b/assets/styles/schedules.css @@ -0,0 +1,3 @@ +div.wc-toolbar {display: none;} +.wc-time-slots .wc-today { background-color: #FFF; } +.wc-header .wc-today { font-weight: normal; } diff --git a/composer.json b/composer.json index 0270145f..5226c93f 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,8 @@ "symfony/monolog-bundle": "^3.0", "symfony/runtime": "6.4.*", "symfony/twig-bundle": "6.4.*", - "symfony/yaml": "6.4.*" + "symfony/yaml": "6.4.*", + "themouette/jquery-week-calendar": "*@dev" }, "config": { "allow-plugins": { @@ -96,5 +97,19 @@ "symfony/phpunit-bridge": "^7.1", "symfony/stopwatch": "6.4.*", "symfony/web-profiler-bundle": "6.4.*" + }, + "repositories": { + "jquery-week-calendar": { + "type": "package", + "package": { + "name": "themouette/jquery-week-calendar", + "version": "v2.0-dev", + "source": { + "url": "https://github.com/themouette/jquery-week-calendar", + "type": "git", + "reference": "master" + } + } + } } } diff --git a/composer.lock b/composer.lock index 1e7306ab..a5614f34 100644 --- a/composer.lock +++ b/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": "05ddfe19ed179978147737059ee823a7", + "content-hash": "48b27d3c51d8c4e59c007aa24ceab13c", "packages": [ { "name": "brick/math", @@ -1299,16 +1299,16 @@ }, { "name": "doctrine/persistence", - "version": "3.3.3", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/doctrine/persistence.git", - "reference": "b337726451f5d530df338fc7f68dee8781b49779" + "reference": "0ea965320cec355dba75031c1b23d4c78362e3ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/persistence/zipball/b337726451f5d530df338fc7f68dee8781b49779", - "reference": "b337726451f5d530df338fc7f68dee8781b49779", + "url": "https://api.github.com/repos/doctrine/persistence/zipball/0ea965320cec355dba75031c1b23d4c78362e3ff", + "reference": "0ea965320cec355dba75031c1b23d4c78362e3ff", "shasum": "" }, "require": { @@ -1322,12 +1322,11 @@ "require-dev": { "doctrine/coding-standard": "^12", "doctrine/common": "^3.0", - "phpstan/phpstan": "1.11.1", + "phpstan/phpstan": "1.12.7", "phpstan/phpstan-phpunit": "^1", "phpstan/phpstan-strict-rules": "^1.1", - "phpunit/phpunit": "^8.5 || ^9.5", - "symfony/cache": "^4.4 || ^5.4 || ^6.0", - "vimeo/psalm": "4.30.0 || 5.24.0" + "phpunit/phpunit": "^8.5.38 || ^9.5", + "symfony/cache": "^4.4 || ^5.4 || ^6.0 || ^7.0" }, "type": "library", "autoload": { @@ -1376,7 +1375,7 @@ ], "support": { "issues": "https://github.com/doctrine/persistence/issues", - "source": "https://github.com/doctrine/persistence/tree/3.3.3" + "source": "https://github.com/doctrine/persistence/tree/3.4.0" }, "funding": [ { @@ -1392,20 +1391,20 @@ "type": "tidelift" } ], - "time": "2024-06-20T10:14:30+00:00" + "time": "2024-10-30T19:48:12+00:00" }, { "name": "doctrine/sql-formatter", - "version": "1.5.0", + "version": "1.5.1", "source": { "type": "git", "url": "https://github.com/doctrine/sql-formatter.git", - "reference": "16ca9e39877369d664f06dacde468548298bdc40" + "reference": "b784cbde727cf806721451dde40eff4fec3bbe86" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/16ca9e39877369d664f06dacde468548298bdc40", - "reference": "16ca9e39877369d664f06dacde468548298bdc40", + "url": "https://api.github.com/repos/doctrine/sql-formatter/zipball/b784cbde727cf806721451dde40eff4fec3bbe86", + "reference": "b784cbde727cf806721451dde40eff4fec3bbe86", "shasum": "" }, "require": { @@ -1446,9 +1445,9 @@ ], "support": { "issues": "https://github.com/doctrine/sql-formatter/issues", - "source": "https://github.com/doctrine/sql-formatter/tree/1.5.0" + "source": "https://github.com/doctrine/sql-formatter/tree/1.5.1" }, - "time": "2024-09-11T07:29:40+00:00" + "time": "2024-10-21T18:21:57+00:00" }, { "name": "firebase/php-jwt", @@ -1641,16 +1640,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "shasum": "" }, "require": { @@ -1704,7 +1703,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.3" + "source": "https://github.com/guzzle/promises/tree/2.0.4" }, "funding": [ { @@ -1720,7 +1719,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T10:29:17+00:00" + "time": "2024-10-17T10:06:22+00:00" }, { "name": "guzzlehttp/psr7", @@ -2413,16 +2412,16 @@ }, { "name": "microsoft/microsoft-graph", - "version": "v2.16.0", + "version": "v2.17.0", "source": { "type": "git", "url": "https://github.com/microsoftgraph/msgraph-sdk-php.git", - "reference": "706c25c117fc2bbd8b781d77e0384f08b3261d64" + "reference": "b10cfa410c1687b2f9ed9f37fbb70d29edeb8da3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/706c25c117fc2bbd8b781d77e0384f08b3261d64", - "reference": "706c25c117fc2bbd8b781d77e0384f08b3261d64", + "url": "https://api.github.com/repos/microsoftgraph/msgraph-sdk-php/zipball/b10cfa410c1687b2f9ed9f37fbb70d29edeb8da3", + "reference": "b10cfa410c1687b2f9ed9f37fbb70d29edeb8da3", "shasum": "" }, "require": { @@ -2454,9 +2453,9 @@ "homepage": "https://developer.microsoft.com/en-us/graph", "support": { "issues": "https://github.com/microsoftgraph/msgraph-sdk-php/issues", - "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/v2.16.0" + "source": "https://github.com/microsoftgraph/msgraph-sdk-php/tree/v2.17.0" }, - "time": "2024-10-08T19:25:34+00:00" + "time": "2024-10-17T14:23:26+00:00" }, { "name": "microsoft/microsoft-graph-core", @@ -2937,16 +2936,16 @@ }, { "name": "open-telemetry/sdk", - "version": "1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/opentelemetry-php/sdk.git", - "reference": "126319e6b3996c609fded69f1e3e9dc1582c64af" + "reference": "fb0ff8d8279a3776bd604791e2531dd0cc147e8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/126319e6b3996c609fded69f1e3e9dc1582c64af", - "reference": "126319e6b3996c609fded69f1e3e9dc1582c64af", + "url": "https://api.github.com/repos/opentelemetry-php/sdk/zipball/fb0ff8d8279a3776bd604791e2531dd0cc147e8b", + "reference": "fb0ff8d8279a3776bd604791e2531dd0cc147e8b", "shasum": "" }, "require": { @@ -3023,7 +3022,7 @@ "issues": "https://github.com/open-telemetry/opentelemetry-php/issues", "source": "https://github.com/open-telemetry/opentelemetry-php" }, - "time": "2024-10-15T22:42:37+00:00" + "time": "2024-10-18T21:01:35+00:00" }, { "name": "open-telemetry/sem-conv", @@ -4007,16 +4006,16 @@ }, { "name": "symfony/asset", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/asset.git", - "reference": "c668aa320e26b7379540368832b9d1dd43d32603" + "reference": "2466c17d61d14539cddf77e57ebb9cc971185302" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/asset/zipball/c668aa320e26b7379540368832b9d1dd43d32603", - "reference": "c668aa320e26b7379540368832b9d1dd43d32603", + "url": "https://api.github.com/repos/symfony/asset/zipball/2466c17d61d14539cddf77e57ebb9cc971185302", + "reference": "2466c17d61d14539cddf77e57ebb9cc971185302", "shasum": "" }, "require": { @@ -4056,7 +4055,7 @@ "description": "Manages URL generation and versioning of web assets such as CSS stylesheets, JavaScript files and image files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/asset/tree/v6.4.8" + "source": "https://github.com/symfony/asset/tree/v6.4.13" }, "funding": [ { @@ -4072,20 +4071,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/asset-mapper", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/asset-mapper.git", - "reference": "36495ec868bff515c3e7006eca54a4aa9f8b8fc3" + "reference": "58d8b553908fcb04dd64eb9cf6d74a816d1f4033" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/asset-mapper/zipball/36495ec868bff515c3e7006eca54a4aa9f8b8fc3", - "reference": "36495ec868bff515c3e7006eca54a4aa9f8b8fc3", + "url": "https://api.github.com/repos/symfony/asset-mapper/zipball/58d8b553908fcb04dd64eb9cf6d74a816d1f4033", + "reference": "58d8b553908fcb04dd64eb9cf6d74a816d1f4033", "shasum": "" }, "require": { @@ -4135,7 +4134,7 @@ "description": "Maps directories of assets & makes them available in a public directory with versioned filenames.", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/asset-mapper/tree/v6.4.12" + "source": "https://github.com/symfony/asset-mapper/tree/v6.4.13" }, "funding": [ { @@ -4151,20 +4150,20 @@ "type": "tidelift" } ], - "time": "2024-09-19T08:00:44+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/cache", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8" + "reference": "36fb8aa88833708e9f29014b6f15fac051a8b613" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", - "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", + "url": "https://api.github.com/repos/symfony/cache/zipball/36fb8aa88833708e9f29014b6f15fac051a8b613", + "reference": "36fb8aa88833708e9f29014b6f15fac051a8b613", "shasum": "" }, "require": { @@ -4231,7 +4230,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.12" + "source": "https://github.com/symfony/cache/tree/v6.4.14" }, "funding": [ { @@ -4247,7 +4246,7 @@ "type": "tidelift" } ], - "time": "2024-09-16T16:01:33+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/cache-contracts", @@ -4327,16 +4326,16 @@ }, { "name": "symfony/clock", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/clock.git", - "reference": "7a4840efd17135cbd547e41ec49fb910ed4f8b98" + "reference": "b2bf55c4dd115003309eafa87ee7df9ed3dde81b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/clock/zipball/7a4840efd17135cbd547e41ec49fb910ed4f8b98", - "reference": "7a4840efd17135cbd547e41ec49fb910ed4f8b98", + "url": "https://api.github.com/repos/symfony/clock/zipball/b2bf55c4dd115003309eafa87ee7df9ed3dde81b", + "reference": "b2bf55c4dd115003309eafa87ee7df9ed3dde81b", "shasum": "" }, "require": { @@ -4381,7 +4380,7 @@ "time" ], "support": { - "source": "https://github.com/symfony/clock/tree/v6.4.8" + "source": "https://github.com/symfony/clock/tree/v6.4.13" }, "funding": [ { @@ -4397,20 +4396,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:51:39+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/config", - "version": "v6.4.8", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "12e7e52515ce37191b193cf3365903c4f3951e35" + "reference": "4e55e7e4ffddd343671ea972216d4509f46c22ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/12e7e52515ce37191b193cf3365903c4f3951e35", - "reference": "12e7e52515ce37191b193cf3365903c4f3951e35", + "url": "https://api.github.com/repos/symfony/config/zipball/4e55e7e4ffddd343671ea972216d4509f46c22ef", + "reference": "4e55e7e4ffddd343671ea972216d4509f46c22ef", "shasum": "" }, "require": { @@ -4456,7 +4455,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.4.8" + "source": "https://github.com/symfony/config/tree/v6.4.14" }, "funding": [ { @@ -4472,20 +4471,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-11-04T11:33:53+00:00" }, { "name": "symfony/console", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765" + "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/72d080eb9edf80e36c19be61f72c98ed8273b765", - "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765", + "url": "https://api.github.com/repos/symfony/console/zipball/897c2441ed4eec8a8a2c37b943427d24dba3f26b", + "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b", "shasum": "" }, "require": { @@ -4550,7 +4549,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.12" + "source": "https://github.com/symfony/console/tree/v6.4.14" }, "funding": [ { @@ -4566,20 +4565,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:15:52+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e" + "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e", - "reference": "cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", + "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", "shasum": "" }, "require": { @@ -4631,7 +4630,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.12" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.13" }, "funding": [ { @@ -4647,7 +4646,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:18:25+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/deprecation-contracts", @@ -4718,16 +4717,16 @@ }, { "name": "symfony/doctrine-bridge", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/doctrine-bridge.git", - "reference": "b5c0a0172bbe9b1435181d94ca5cbe4af3fb45af" + "reference": "402d5831a73217ea76ab7e032cc05045cd3fa678" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/b5c0a0172bbe9b1435181d94ca5cbe4af3fb45af", - "reference": "b5c0a0172bbe9b1435181d94ca5cbe4af3fb45af", + "url": "https://api.github.com/repos/symfony/doctrine-bridge/zipball/402d5831a73217ea76ab7e032cc05045cd3fa678", + "reference": "402d5831a73217ea76ab7e032cc05045cd3fa678", "shasum": "" }, "require": { @@ -4806,7 +4805,7 @@ "description": "Provides integration for Doctrine with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/doctrine-bridge/tree/v6.4.12" + "source": "https://github.com/symfony/doctrine-bridge/tree/v6.4.13" }, "funding": [ { @@ -4822,20 +4821,20 @@ "type": "tidelift" } ], - "time": "2024-09-08T12:31:10+00:00" + "time": "2024-10-18T09:23:39+00:00" }, { "name": "symfony/dotenv", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "815284236cab7d8e1280f53bf562c07a4dfe5954" + "reference": "436ae2dd89360fea8c7d5ff3f48ecf523c80bfb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/815284236cab7d8e1280f53bf562c07a4dfe5954", - "reference": "815284236cab7d8e1280f53bf562c07a4dfe5954", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/436ae2dd89360fea8c7d5ff3f48ecf523c80bfb4", + "reference": "436ae2dd89360fea8c7d5ff3f48ecf523c80bfb4", "shasum": "" }, "require": { @@ -4880,7 +4879,7 @@ "environment" ], "support": { - "source": "https://github.com/symfony/dotenv/tree/v6.4.12" + "source": "https://github.com/symfony/dotenv/tree/v6.4.13" }, "funding": [ { @@ -4896,20 +4895,20 @@ "type": "tidelift" } ], - "time": "2024-09-16T16:01:33+00:00" + "time": "2024-09-28T07:43:51+00:00" }, { "name": "symfony/error-handler", - "version": "v6.4.10", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "231f1b2ee80f72daa1972f7340297d67439224f0" + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0", - "reference": "231f1b2ee80f72daa1972f7340297d67439224f0", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9", + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9", "shasum": "" }, "require": { @@ -4955,7 +4954,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.10" + "source": "https://github.com/symfony/error-handler/tree/v6.4.14" }, "funding": [ { @@ -4971,20 +4970,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:30:32+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b" + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b", - "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", "shasum": "" }, "require": { @@ -5035,7 +5034,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" }, "funding": [ { @@ -5051,7 +5050,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -5131,16 +5130,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12" + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/f810e3cbdf7fdc35983968523d09f349fa9ada12", - "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3", + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3", "shasum": "" }, "require": { @@ -5177,7 +5176,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.12" + "source": "https://github.com/symfony/filesystem/tree/v6.4.13" }, "funding": [ { @@ -5193,20 +5192,20 @@ "type": "tidelift" } ], - "time": "2024-09-16T16:01:33+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/finder", - "version": "v6.4.11", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453" + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453", + "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", "shasum": "" }, "require": { @@ -5241,7 +5240,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.11" + "source": "https://github.com/symfony/finder/tree/v6.4.13" }, "funding": [ { @@ -5257,7 +5256,7 @@ "type": "tidelift" } ], - "time": "2024-08-13T14:27:37+00:00" + "time": "2024-10-01T08:30:56+00:00" }, { "name": "symfony/flex", @@ -5329,16 +5328,16 @@ }, { "name": "symfony/framework-bundle", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "6a9665bd1fae37b198429775c6132f193339434f" + "reference": "e8b0bd921f9bd35ea4d1508067c3f3f6e2036418" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/6a9665bd1fae37b198429775c6132f193339434f", - "reference": "6a9665bd1fae37b198429775c6132f193339434f", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/e8b0bd921f9bd35ea4d1508067c3f3f6e2036418", + "reference": "e8b0bd921f9bd35ea4d1508067c3f3f6e2036418", "shasum": "" }, "require": { @@ -5377,6 +5376,7 @@ "symfony/mime": "<6.4", "symfony/property-access": "<5.4", "symfony/property-info": "<5.4", + "symfony/runtime": "<5.4.45|>=6.0,<6.4.13|>=7.0,<7.1.6", "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4", "symfony/security-core": "<5.4", "symfony/security-csrf": "<5.4", @@ -5457,7 +5457,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.4.12" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.13" }, "funding": [ { @@ -5473,20 +5473,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T13:34:56+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/http-client", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56" + "reference": "05d88cbd816ad6e0202edd9a9963cb9d615b8826" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", - "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", + "url": "https://api.github.com/repos/symfony/http-client/zipball/05d88cbd816ad6e0202edd9a9963cb9d615b8826", + "reference": "05d88cbd816ad6e0202edd9a9963cb9d615b8826", "shasum": "" }, "require": { @@ -5550,7 +5550,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.12" + "source": "https://github.com/symfony/http-client/tree/v6.4.14" }, "funding": [ { @@ -5566,7 +5566,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:21:33+00:00" + "time": "2024-11-05T16:39:55+00:00" }, { "name": "symfony/http-client-contracts", @@ -5648,16 +5648,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "133ac043875f59c26c55e79cf074562127cce4d2" + "reference": "ba020a321a95519303a3f09ec2824d34d601c388" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/133ac043875f59c26c55e79cf074562127cce4d2", - "reference": "133ac043875f59c26c55e79cf074562127cce4d2", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388", + "reference": "ba020a321a95519303a3f09ec2824d34d601c388", "shasum": "" }, "require": { @@ -5705,7 +5705,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.12" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.14" }, "funding": [ { @@ -5721,20 +5721,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:18:25+00:00" + "time": "2024-11-05T16:39:55+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "96df83d51b5f78804f70c093b97310794fd6257b" + "reference": "8278a947d0369754a47b758a9e17b72cab970951" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96df83d51b5f78804f70c093b97310794fd6257b", - "reference": "96df83d51b5f78804f70c093b97310794fd6257b", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8278a947d0369754a47b758a9e17b72cab970951", + "reference": "8278a947d0369754a47b758a9e17b72cab970951", "shasum": "" }, "require": { @@ -5819,7 +5819,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.12" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.14" }, "funding": [ { @@ -5835,20 +5835,20 @@ "type": "tidelift" } ], - "time": "2024-09-21T06:02:57+00:00" + "time": "2024-11-06T09:45:21+00:00" }, { "name": "symfony/monolog-bridge", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bridge.git", - "reference": "0fbee64913b1c595e7650a1919ba3edba8d49ea7" + "reference": "9d14621e59f22c2b6d030d92d37ffe5ae1e60452" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/0fbee64913b1c595e7650a1919ba3edba8d49ea7", - "reference": "0fbee64913b1c595e7650a1919ba3edba8d49ea7", + "url": "https://api.github.com/repos/symfony/monolog-bridge/zipball/9d14621e59f22c2b6d030d92d37ffe5ae1e60452", + "reference": "9d14621e59f22c2b6d030d92d37ffe5ae1e60452", "shasum": "" }, "require": { @@ -5898,7 +5898,7 @@ "description": "Provides integration for Monolog with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/monolog-bridge/tree/v6.4.8" + "source": "https://github.com/symfony/monolog-bridge/tree/v6.4.13" }, "funding": [ { @@ -5914,7 +5914,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-14T08:49:08+00:00" }, { "name": "symfony/monolog-bundle", @@ -5999,16 +5999,16 @@ }, { "name": "symfony/password-hasher", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/password-hasher.git", - "reference": "90ebbe946e5d64a5fad9ac9427e335045cf2bd31" + "reference": "e97a1b31f60b8bdfc1fdedab4398538da9441d47" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/password-hasher/zipball/90ebbe946e5d64a5fad9ac9427e335045cf2bd31", - "reference": "90ebbe946e5d64a5fad9ac9427e335045cf2bd31", + "url": "https://api.github.com/repos/symfony/password-hasher/zipball/e97a1b31f60b8bdfc1fdedab4398538da9441d47", + "reference": "e97a1b31f60b8bdfc1fdedab4398538da9441d47", "shasum": "" }, "require": { @@ -6051,7 +6051,7 @@ "password" ], "support": { - "source": "https://github.com/symfony/password-hasher/tree/v6.4.8" + "source": "https://github.com/symfony/password-hasher/tree/v6.4.13" }, "funding": [ { @@ -6067,7 +6067,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/polyfill-intl-grapheme", @@ -6462,16 +6462,16 @@ }, { "name": "symfony/property-access", - "version": "v6.4.11", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/property-access.git", - "reference": "866f6cd84f2094cbc6f66ce9752faf749916e2a9" + "reference": "8cc779d88d12e440adaa26387bcfc25744064afe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-access/zipball/866f6cd84f2094cbc6f66ce9752faf749916e2a9", - "reference": "866f6cd84f2094cbc6f66ce9752faf749916e2a9", + "url": "https://api.github.com/repos/symfony/property-access/zipball/8cc779d88d12e440adaa26387bcfc25744064afe", + "reference": "8cc779d88d12e440adaa26387bcfc25744064afe", "shasum": "" }, "require": { @@ -6519,7 +6519,7 @@ "reflection" ], "support": { - "source": "https://github.com/symfony/property-access/tree/v6.4.11" + "source": "https://github.com/symfony/property-access/tree/v6.4.13" }, "funding": [ { @@ -6535,20 +6535,20 @@ "type": "tidelift" } ], - "time": "2024-08-30T16:10:11+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/property-info", - "version": "v6.4.10", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/property-info.git", - "reference": "edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77" + "reference": "ea388133aadf407dfa54092873d1b7e52f439515" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/property-info/zipball/edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77", - "reference": "edaea9dcc723cb4a0ab6a00f7d6f8c07c0d8ff77", + "url": "https://api.github.com/repos/symfony/property-info/zipball/ea388133aadf407dfa54092873d1b7e52f439515", + "reference": "ea388133aadf407dfa54092873d1b7e52f439515", "shasum": "" }, "require": { @@ -6602,7 +6602,7 @@ "validator" ], "support": { - "source": "https://github.com/symfony/property-info/tree/v6.4.10" + "source": "https://github.com/symfony/property-info/tree/v6.4.13" }, "funding": [ { @@ -6618,20 +6618,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T07:32:07+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/routing", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f" + "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f", - "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f", + "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278", + "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278", "shasum": "" }, "require": { @@ -6685,7 +6685,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.12" + "source": "https://github.com/symfony/routing/tree/v6.4.13" }, "funding": [ { @@ -6701,20 +6701,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:32:26+00:00" + "time": "2024-10-01T08:30:56+00:00" }, { "name": "symfony/runtime", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/runtime.git", - "reference": "bfe32a1adf41da4dd7f6b939a039779d7af5497f" + "reference": "4facd4174f45cd37c65860403412b67c7381136a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/runtime/zipball/bfe32a1adf41da4dd7f6b939a039779d7af5497f", - "reference": "bfe32a1adf41da4dd7f6b939a039779d7af5497f", + "url": "https://api.github.com/repos/symfony/runtime/zipball/4facd4174f45cd37c65860403412b67c7381136a", + "reference": "4facd4174f45cd37c65860403412b67c7381136a", "shasum": "" }, "require": { @@ -6764,7 +6764,7 @@ "runtime" ], "support": { - "source": "https://github.com/symfony/runtime/tree/v6.4.12" + "source": "https://github.com/symfony/runtime/tree/v6.4.14" }, "funding": [ { @@ -6780,20 +6780,20 @@ "type": "tidelift" } ], - "time": "2024-09-19T13:29:10+00:00" + "time": "2024-11-05T16:39:55+00:00" }, { "name": "symfony/security-bundle", - "version": "v6.4.11", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/security-bundle.git", - "reference": "620be16fceded671823ce6332d06f44bb327096d" + "reference": "181d1fcf5f88ef8212ed7f6434e5ff51c9d7dff3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-bundle/zipball/620be16fceded671823ce6332d06f44bb327096d", - "reference": "620be16fceded671823ce6332d06f44bb327096d", + "url": "https://api.github.com/repos/symfony/security-bundle/zipball/181d1fcf5f88ef8212ed7f6434e5ff51c9d7dff3", + "reference": "181d1fcf5f88ef8212ed7f6434e5ff51c9d7dff3", "shasum": "" }, "require": { @@ -6876,7 +6876,7 @@ "description": "Provides a tight integration of the Security component into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-bundle/tree/v6.4.11" + "source": "https://github.com/symfony/security-bundle/tree/v6.4.13" }, "funding": [ { @@ -6892,20 +6892,20 @@ "type": "tidelift" } ], - "time": "2024-08-20T11:22:16+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/security-core", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/security-core.git", - "reference": "8c7e52155262b3ef6b7885f6d9bd90fb24eaa66f" + "reference": "bbd1a919aec8696a95bf8749d5577fbe74de973c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-core/zipball/8c7e52155262b3ef6b7885f6d9bd90fb24eaa66f", - "reference": "8c7e52155262b3ef6b7885f6d9bd90fb24eaa66f", + "url": "https://api.github.com/repos/symfony/security-core/zipball/bbd1a919aec8696a95bf8749d5577fbe74de973c", + "reference": "bbd1a919aec8696a95bf8749d5577fbe74de973c", "shasum": "" }, "require": { @@ -6962,7 +6962,7 @@ "description": "Symfony Security Component - Core Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-core/tree/v6.4.12" + "source": "https://github.com/symfony/security-core/tree/v6.4.13" }, "funding": [ { @@ -6978,20 +6978,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:21:33+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/security-csrf", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/security-csrf.git", - "reference": "f46ab02b76311087873257071559edcaf6d7ab99" + "reference": "c34421b7d34efbaef5d611ab2e646a0ec464ffe3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-csrf/zipball/f46ab02b76311087873257071559edcaf6d7ab99", - "reference": "f46ab02b76311087873257071559edcaf6d7ab99", + "url": "https://api.github.com/repos/symfony/security-csrf/zipball/c34421b7d34efbaef5d611ab2e646a0ec464ffe3", + "reference": "c34421b7d34efbaef5d611ab2e646a0ec464ffe3", "shasum": "" }, "require": { @@ -7030,7 +7030,7 @@ "description": "Symfony Security Component - CSRF Library", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-csrf/tree/v6.4.8" + "source": "https://github.com/symfony/security-csrf/tree/v6.4.13" }, "funding": [ { @@ -7046,20 +7046,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/security-http", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/security-http.git", - "reference": "f6df97af71943cda726dc852335204eac02a716b" + "reference": "cc13b601fc844036fd6c8e7307845da145d5998b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/security-http/zipball/f6df97af71943cda726dc852335204eac02a716b", - "reference": "f6df97af71943cda726dc852335204eac02a716b", + "url": "https://api.github.com/repos/symfony/security-http/zipball/cc13b601fc844036fd6c8e7307845da145d5998b", + "reference": "cc13b601fc844036fd6c8e7307845da145d5998b", "shasum": "" }, "require": { @@ -7118,7 +7118,7 @@ "description": "Symfony Security Component - HTTP Integration", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/security-http/tree/v6.4.12" + "source": "https://github.com/symfony/security-http/tree/v6.4.14" }, "funding": [ { @@ -7134,7 +7134,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:18:25+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/service-contracts", @@ -7221,16 +7221,16 @@ }, { "name": "symfony/stopwatch", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/stopwatch.git", - "reference": "63e069eb616049632cde9674c46957819454b8aa" + "reference": "2cae0a6f8d04937d02f6d19806251e2104d54f92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/stopwatch/zipball/63e069eb616049632cde9674c46957819454b8aa", - "reference": "63e069eb616049632cde9674c46957819454b8aa", + "url": "https://api.github.com/repos/symfony/stopwatch/zipball/2cae0a6f8d04937d02f6d19806251e2104d54f92", + "reference": "2cae0a6f8d04937d02f6d19806251e2104d54f92", "shasum": "" }, "require": { @@ -7263,7 +7263,7 @@ "description": "Provides a way to profile code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/stopwatch/tree/v6.4.8" + "source": "https://github.com/symfony/stopwatch/tree/v6.4.13" }, "funding": [ { @@ -7279,20 +7279,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/string", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b" + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b", - "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b", + "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", "shasum": "" }, "require": { @@ -7349,7 +7349,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.12" + "source": "https://github.com/symfony/string/tree/v6.4.13" }, "funding": [ { @@ -7365,20 +7365,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:15:52+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/translation", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "cf8360b8352b086be620fae8342c4d96e391a489" + "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/cf8360b8352b086be620fae8342c4d96e391a489", - "reference": "cf8360b8352b086be620fae8342c4d96e391a489", + "url": "https://api.github.com/repos/symfony/translation/zipball/bee9bfabfa8b4045a66bf82520e492cddbaffa66", + "reference": "bee9bfabfa8b4045a66bf82520e492cddbaffa66", "shasum": "" }, "require": { @@ -7444,7 +7444,7 @@ "description": "Provides tools to internationalize your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/translation/tree/v6.4.12" + "source": "https://github.com/symfony/translation/tree/v6.4.13" }, "funding": [ { @@ -7460,7 +7460,7 @@ "type": "tidelift" } ], - "time": "2024-09-16T06:02:54+00:00" + "time": "2024-09-27T18:14:25+00:00" }, { "name": "symfony/translation-contracts", @@ -7542,16 +7542,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "09c0df13f822a1b80c5972ca1aa9eeb1288e1194" + "reference": "ec3511eef0576f378b2758da9e1c157086babd59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/09c0df13f822a1b80c5972ca1aa9eeb1288e1194", - "reference": "09c0df13f822a1b80c5972ca1aa9eeb1288e1194", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/ec3511eef0576f378b2758da9e1c157086babd59", + "reference": "ec3511eef0576f378b2758da9e1c157086babd59", "shasum": "" }, "require": { @@ -7631,7 +7631,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.12" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.13" }, "funding": [ { @@ -7647,20 +7647,20 @@ "type": "tidelift" } ], - "time": "2024-09-15T06:35:36+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/twig-bundle", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/twig-bundle.git", - "reference": "4e63369647e3924e110b37337c6a58aac3086ad4" + "reference": "c3beeb5336aba1ea03c37e526968c2fde3ef25c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/4e63369647e3924e110b37337c6a58aac3086ad4", - "reference": "4e63369647e3924e110b37337c6a58aac3086ad4", + "url": "https://api.github.com/repos/symfony/twig-bundle/zipball/c3beeb5336aba1ea03c37e526968c2fde3ef25c4", + "reference": "c3beeb5336aba1ea03c37e526968c2fde3ef25c4", "shasum": "" }, "require": { @@ -7715,7 +7715,7 @@ "description": "Provides a tight integration of Twig into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bundle/tree/v6.4.12" + "source": "https://github.com/symfony/twig-bundle/tree/v6.4.13" }, "funding": [ { @@ -7731,20 +7731,20 @@ "type": "tidelift" } ], - "time": "2024-09-08T12:30:05+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.11", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ee14c8254a480913268b1e3b1cba8045ed122694" + "reference": "93c09246038178717a9c14b809ea8151ffcf7091" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ee14c8254a480913268b1e3b1cba8045ed122694", - "reference": "ee14c8254a480913268b1e3b1cba8045ed122694", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/93c09246038178717a9c14b809ea8151ffcf7091", + "reference": "93c09246038178717a9c14b809ea8151ffcf7091", "shasum": "" }, "require": { @@ -7800,7 +7800,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.11" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.14" }, "funding": [ { @@ -7816,20 +7816,20 @@ "type": "tidelift" } ], - "time": "2024-08-30T16:03:21+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.4.9", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "f9a060622e0d93777b7f8687ec4860191e16802e" + "reference": "0f605f72a363f8743001038a176eeb2a11223b51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/f9a060622e0d93777b7f8687ec4860191e16802e", - "reference": "f9a060622e0d93777b7f8687ec4860191e16802e", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/0f605f72a363f8743001038a176eeb2a11223b51", + "reference": "0f605f72a363f8743001038a176eeb2a11223b51", "shasum": "" }, "require": { @@ -7877,7 +7877,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.9" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.13" }, "funding": [ { @@ -7893,20 +7893,20 @@ "type": "tidelift" } ], - "time": "2024-06-24T15:53:56+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/yaml", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "762ee56b2649659380e0ef4d592d807bc17b7971" + "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/762ee56b2649659380e0ef4d592d807bc17b7971", - "reference": "762ee56b2649659380e0ef4d592d807bc17b7971", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", + "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", "shasum": "" }, "require": { @@ -7949,7 +7949,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.12" + "source": "https://github.com/symfony/yaml/tree/v6.4.13" }, "funding": [ { @@ -7965,7 +7965,7 @@ "type": "tidelift" } ], - "time": "2024-09-17T12:47:12+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "tbachert/spi", @@ -8019,18 +8019,28 @@ }, "time": "2024-10-04T16:36:12+00:00" }, + { + "name": "themouette/jquery-week-calendar", + "version": "v2.0-dev", + "source": { + "type": "git", + "url": "https://github.com/themouette/jquery-week-calendar", + "reference": "master" + }, + "type": "library" + }, { "name": "twig/twig", - "version": "v3.14.0", + "version": "v3.14.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" + "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", - "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", + "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", "shasum": "" }, "require": { @@ -8084,7 +8094,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.14.0" + "source": "https://github.com/twigphp/Twig/tree/v3.14.2" }, "funding": [ { @@ -8096,7 +8106,7 @@ "type": "tidelift" } ], - "time": "2024-09-09T17:55:12+00:00" + "time": "2024-11-07T12:36:22+00:00" } ], "packages-dev": [ @@ -10740,16 +10750,16 @@ }, { "name": "symfony/browser-kit", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "62ab90b92066ef6cce5e79365625b4b1432464c8" + "reference": "65d4b3fd9556e4b5b41287bef93c671f8f9f86ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/62ab90b92066ef6cce5e79365625b4b1432464c8", - "reference": "62ab90b92066ef6cce5e79365625b4b1432464c8", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/65d4b3fd9556e4b5b41287bef93c671f8f9f86ab", + "reference": "65d4b3fd9556e4b5b41287bef93c671f8f9f86ab", "shasum": "" }, "require": { @@ -10788,7 +10798,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.4.8" + "source": "https://github.com/symfony/browser-kit/tree/v6.4.13" }, "funding": [ { @@ -10804,20 +10814,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/css-selector", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08" + "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08", - "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/cb23e97813c5837a041b73a6d63a9ddff0778f5e", + "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e", "shasum": "" }, "require": { @@ -10853,7 +10863,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.4.8" + "source": "https://github.com/symfony/css-selector/tree/v6.4.13" }, "funding": [ { @@ -10869,20 +10879,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/debug-bundle", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/debug-bundle.git", - "reference": "689f1bcb0bd3b945e3c671cbd06274b127c64dc9" + "reference": "7bcfaff39e094cc09455201916d016d9b2ae08ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/689f1bcb0bd3b945e3c671cbd06274b127c64dc9", - "reference": "689f1bcb0bd3b945e3c671cbd06274b127c64dc9", + "url": "https://api.github.com/repos/symfony/debug-bundle/zipball/7bcfaff39e094cc09455201916d016d9b2ae08ff", + "reference": "7bcfaff39e094cc09455201916d016d9b2ae08ff", "shasum": "" }, "require": { @@ -10927,7 +10937,7 @@ "description": "Provides a tight integration of the Symfony VarDumper component and the ServerLogCommand from MonologBridge into the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug-bundle/tree/v6.4.8" + "source": "https://github.com/symfony/debug-bundle/tree/v6.4.13" }, "funding": [ { @@ -10943,20 +10953,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/dom-crawler", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0" + "reference": "ae074dffb018c37a57071990d16e6152728dd972" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9d307ecbcb917001692be333cdc58f474fdb37f0", - "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ae074dffb018c37a57071990d16e6152728dd972", + "reference": "ae074dffb018c37a57071990d16e6152728dd972", "shasum": "" }, "require": { @@ -10994,7 +11004,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.4.12" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.13" }, "funding": [ { @@ -11010,7 +11020,7 @@ "type": "tidelift" } ], - "time": "2024-09-15T06:35:36+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/maker-bundle", @@ -11173,16 +11183,16 @@ }, { "name": "symfony/phpunit-bridge", - "version": "v7.1.4", + "version": "v7.1.6", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "e876eb90e32a8fc4c4911d458e09f88d65877d1c" + "reference": "c6b9d8f52d3e276bedb49612aa4a2a046171287f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/e876eb90e32a8fc4c4911d458e09f88d65877d1c", - "reference": "e876eb90e32a8fc4c4911d458e09f88d65877d1c", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/c6b9d8f52d3e276bedb49612aa4a2a046171287f", + "reference": "c6b9d8f52d3e276bedb49612aa4a2a046171287f", "shasum": "" }, "require": { @@ -11235,7 +11245,7 @@ "description": "Provides utilities for PHPUnit, especially user deprecation notices management", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/phpunit-bridge/tree/v7.1.4" + "source": "https://github.com/symfony/phpunit-bridge/tree/v7.1.6" }, "funding": [ { @@ -11251,20 +11261,20 @@ "type": "tidelift" } ], - "time": "2024-08-13T14:28:19+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/process", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3" + "reference": "25214adbb0996d18112548de20c281be9f27279f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/3f94e5f13ff58df371a7ead461b6e8068900fbb3", - "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3", + "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f", + "reference": "25214adbb0996d18112548de20c281be9f27279f", "shasum": "" }, "require": { @@ -11296,7 +11306,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.12" + "source": "https://github.com/symfony/process/tree/v6.4.14" }, "funding": [ { @@ -11312,20 +11322,20 @@ "type": "tidelift" } ], - "time": "2024-09-17T12:47:12+00:00" + "time": "2024-11-06T09:25:01+00:00" }, { "name": "symfony/web-profiler-bundle", - "version": "v6.4.11", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/web-profiler-bundle.git", - "reference": "ef4b8b4f9f51260d18abec40ceacc4bc9c5555e3" + "reference": "bfbade623f1cc7f1e243ce5488af33861a8f5be7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/ef4b8b4f9f51260d18abec40ceacc4bc9c5555e3", - "reference": "ef4b8b4f9f51260d18abec40ceacc4bc9c5555e3", + "url": "https://api.github.com/repos/symfony/web-profiler-bundle/zipball/bfbade623f1cc7f1e243ce5488af33861a8f5be7", + "reference": "bfbade623f1cc7f1e243ce5488af33861a8f5be7", "shasum": "" }, "require": { @@ -11378,7 +11388,7 @@ "dev" ], "support": { - "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.11" + "source": "https://github.com/symfony/web-profiler-bundle/tree/v6.4.14" }, "funding": [ { @@ -11394,7 +11404,7 @@ "type": "tidelift" } ], - "time": "2024-08-12T09:55:28+00:00" + "time": "2024-11-04T11:33:53+00:00" }, { "name": "theseer/tokenizer", @@ -11449,7 +11459,9 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "themouette/jquery-week-calendar": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/config/packages/asset_mapper.yaml b/config/packages/asset_mapper.yaml index d1ac653b..a9162e84 100644 --- a/config/packages/asset_mapper.yaml +++ b/config/packages/asset_mapper.yaml @@ -2,4 +2,5 @@ framework: asset_mapper: # The paths to make available to the asset mapper. paths: - - assets/ + assets/: '' + vendor/themouette/jquery-week-calendar/: 'jquery-week-calendar' diff --git a/config/services.yaml b/config/services.yaml index 1b0bafbc..f58ec439 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -8,6 +8,12 @@ parameters: app.osid.runtime.courseimpl: 'banner_course_CourseManager' app.osid.id.authority_to_shorten: 'middlebury.edu' app.osid.reference_date: 'now' + app.catalog.banner_web_url: '%env(CATALOG_BANNER_WEB_URL)%' + app.schedules.email.enabled: '%env(bool:SCHEDULES_EMAIL_ENABLED)%' + app.schedules.email.send_mail_as_user: '%env(bool:SCHEDULES_EMAIL_SEND_MAIL_AS_USER)%' + app.schedules.email.send_mail_as: '%env(SCHEDULES_SEND_MAIL_AS)%' + app.schedules.image.font_file: '%env(SCHEDULES_IMAGE_FONT_FILE)%' + when@test: parameters: app.osid.runtime.config_path: '../application/test/banner/configuration.plist' @@ -42,6 +48,9 @@ services: arguments: $configPath: '%app.osid.runtime.config_path%' $courseImpl: '%app.osid.runtime.courseimpl%' + App\Service\Osid\DataLoader: + arguments: + $bannerWebUrl: '%app.catalog.banner_web_url%' App\Service\Osid\IdMap: arguments: $idAuthorityToShorten: '%app.osid.id.authority_to_shorten%' diff --git a/docroot/javascript/jquery-week-calendar b/docroot/javascript/jquery-week-calendar deleted file mode 160000 index 620df166..00000000 --- a/docroot/javascript/jquery-week-calendar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 620df166b83e350f31efc77fd2c459f80a5a6e64 diff --git a/docroot/javascript/schedule.js b/docroot/javascript/schedule.js deleted file mode 100755 index a9c6340a..00000000 --- a/docroot/javascript/schedule.js +++ /dev/null @@ -1,65 +0,0 @@ -function renderSchedule(calendarJQ, jsonUrl, timeslotHeight, textSize) { - if (!timeslotHeight) - timeslotHeight = 20; - if (!textSize) - textSize = 13; - - var year = new Date().getFullYear(); - var month = new Date().getMonth(); - var day = new Date().getDate(); - - var startHour = new Number(calendarJQ.find('input:hidden[name=start_hour]').val()); - var endHour = new Number(calendarJQ.find('input:hidden[name=end_hour]').val()); - - // 4 timeslots per hour, 20 height per slot. - // Add on the approximate size of the header. - var scheduleHeight = ((endHour - startHour + 1) * 4 * timeslotHeight) + 70; - - var daysToShow = 7; - var firstDayOfWeek = 0; - if (calendarJQ.find('input:hidden[name=show_sunday]').val() == 'no') { - daysToShow--; - firstDayOfWeek = 1; - } - if (calendarJQ.find('input:hidden[name=show_saturday]').val() == 'no') { - daysToShow--; - } - - calendarJQ.weekCalendar({ - date:new Date(year, month, day, 9), - readonly: true, - allowCalEventOverlap: true, - overlapEventsSeparate: true, - timeslotsPerHour: 4, - timeslotHeight: timeslotHeight, - textSize: textSize, - businessHours : { - start: startHour, - end: endHour, - limitDisplay : true - }, - daysToShow: daysToShow, - firstDayOfWeek: firstDayOfWeek, - height: function($calendarJQ){ - var maxHeight = $(window).height() - $("h1").outerHeight(true); - if (maxHeight > scheduleHeight) - return scheduleHeight; - else - return maxHeight; - }, - eventRender : function(calEvent, $event) { - if(calEvent.collisions > 0) { - $event.css({"backgroundColor":"#F77", "border":"1px solid #F00"}); - $event.find(".wc-time").css({"backgroundColor": "#F22", "border":"1px solid #F00"}); - } - }, - noEvents : function() { - displayMessage("There are no events for this week"); - }, - data: jsonUrl - }); - - calendarJQ.find('td.wc-day-column-header').each(function() { - $(this).html($(this).html().replace(/<.*$/, '')); - }); -} diff --git a/importmap.php b/importmap.php index 8454803d..7041d864 100644 --- a/importmap.php +++ b/importmap.php @@ -13,14 +13,18 @@ */ return [ 'app' => [ - 'path' => './assets/app.js', + 'path' => 'app.js', 'entrypoint' => true, ], 'bookmarks' => [ - 'path' => './assets/bookmarks.js', + 'path' => 'bookmarks.js', ], 'offering_search' => [ - 'path' => './assets/offering_search.js', + 'path' => 'offering_search.js', + 'entrypoint' => true, + ], + 'schedules' => [ + 'path' => 'schedules.js', 'entrypoint' => true, ], 'jquery-expander' => [ @@ -29,4 +33,14 @@ 'jquery' => [ 'version' => '3.7.1', ], + 'jquery_week_calendar' => [ + 'path' => 'jquery-week-calendar/jquery.weekcalendar.js', + ], + 'jquery_week_calendar_date' => [ + 'path' => 'jquery-week-calendar/libs/date.js', + ], + '/assets/jquery-week-calendar/jquery.weekcalendar.css' => [ + 'path' => 'jquery-week-calendar/jquery.weekcalendar.css', + 'type' => 'css', + ], ]; diff --git a/src/Controller/Schedules.php b/src/Controller/Schedules.php new file mode 100755 index 00000000..a66a931d --- /dev/null +++ b/src/Controller/Schedules.php @@ -0,0 +1,875 @@ +initializeCatalogAndTerm($catalogId, $termId); + $data = [ + 'selectedCatalogId' => $this->catalogId, + 'selectedTermId' => $this->termId, + ]; + $data['emailEnabled'] = $this->emailEnabled(); + + // Catalogs + $catalogLookupSession = $this->osidRuntime->getCourseManager()->getCourseCatalogLookupSession(); + $catalogs = $catalogLookupSession->getCourseCatalogs(); + $data['catalogs'] = []; + while ($catalogs->hasNext()) { + $data['catalogs'][] = $catalogs->getNextCourseCatalog(); + } + + // Load all terms for our selection control + $this->termLookupSession->useFederatedCourseCatalogView(); + $terms = $this->termLookupSession->getTerms(); + $termCatalogSession = $this->osidRuntime->getCourseManager()->getTermCatalogSession(); + $data['terms'] = []; + while ($terms->hasNext()) { + $data['terms'][] = $terms->getNextTerm(); + } + + // Load the bookmarks for the selected catalog/terms + if ($this->termId) { + $data['bookmarked_courses'] = $this->bookmarks->getBookmarkedCoursesInCatalogForTerm($this->catalogId, $this->termId); + } else { + $data['bookmarked_courses'] = $this->bookmarks->getAllBookmarkedCourses(); + } + + // Load the Schedules for the selected catalog/terms + if ($this->termId) { + $data['schedules'] = $this->schedules->getSchedulesByTerm($this->termId); + } else { + $data['schedules'] = $this->schedules->getSchedules(); + } + + $data['leftText'] = " +

        Important: This tool is for planning purposes only. It does not register you for classes.

        + +
        Basic Usage: +
          +
        1. Search for courses in the catalog and save interesting ones.
          2. +
        2. Create one or more schedules in the Planner.
          3. +
        3. Add courses to schedules.
          4. +
        4. Print or email your schedules.
          5. +
        + +

        For more help see: go/catalog-help

        +

        Issues or Feedback? go/webbugs/Catalog/Planner

        +
        + "; + + return $this->render('schedules/index.html.twig', $data); + } + + /** + * Initialize the catalog and term we are working with. + * + * Sets the following member properties: + * catalogId osid_id_Id or NULL + * termLookupSession osid_course_TermLookupSession + * termId osid_id_Id or NULL + * + * @return void + */ + protected function initializeCatalogAndTerm(?\osid_id_Id $catalogId = null, ?\osid_id_Id $termId = null) + { + // Select the catalog. + if ($catalogId) { + $this->catalogId = $catalogId; + $this->schedules->setSavedUserCatalogId($catalogId); + } else { + // Check for a saved catalog id. + $this->catalogId = $this->schedules->getSavedUserCatalogId(); + } + + // Load the termLookupSession + if ($this->catalogId) { + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSessionForCatalog($this->catalogId); + } else { + $this->termLookupSession = $this->osidRuntime->getCourseManager()->getTermLookupSession(); + $this->catalogId = $this->termLookupSession->getCourseCatalogId(); + } + + // Select the term + if ($termId && 'ANY' == $termId->getIdentifier()) { + // Don't set a term + $this->termId = null; + } elseif (!$termId || 'CURRENT' == $termId->getIdentifier()) { + $this->termId = $this->osidTermHelper->getNextOrLatestTermId($this->catalogId); + } else { + $this->termId = $termId; + } + } + + /** + * Create a new schedule. + * + * @return void + * + * @since 8/2/10 + */ + #[Route('/schedules/create/{catalogId}', name: 'create_schedule', methods: ['POST'])] + public function createAction(Request $request, ?\osid_id_Id $catalogId = null) + { + if (!$this->isCsrfTokenValid('create-schedule', $request->get('csrf_key'))) { + throw new AccessDeniedException('Invalid CSRF key.'); + } + + $this->schedules->createSchedule($this->osidIdMap->fromString($request->get('term'))); + + return $this->redirectToRoute('schedules', [ + 'catalogId' => $catalogId, + 'termId' => $request->get('term'), + ]); + } + + /** + * Update a schedule. + * + * @return void + * + * @since 8/2/10 + */ + #[Route('/schedules/update/{scheduleId}/{catalogId}/{termId}', name: 'update_schedule', methods: ['POST'])] + public function updateAction(Request $request, string $scheduleId, ?\osid_id_Id $catalogId = null, ?\osid_id_Id $termId = null) + { + if (!$this->isCsrfTokenValid('update-schedule', $request->get('csrf_key'))) { + throw new AccessDeniedException('Invalid CSRF key.'); + } + + $schedule = $this->schedules->getSchedule($scheduleId); + $schedule->setName($request->get('name')); + + return $this->redirectToRoute('schedules', [ + 'catalogId' => $catalogId, + 'termId' => $termId, + ]); + } + + /** + * Delete a schedule. + * + * @return void + * + * @since 8/2/10 + */ + #[Route('/schedules/delete/{scheduleId}/{catalogId}/{termId}', name: 'delete_schedule', methods: ['POST'])] + public function deleteAction(Request $request, string $scheduleId, ?\osid_id_Id $catalogId = null, ?\osid_id_Id $termId = null) + { + if (!$this->isCsrfTokenValid('delete-schedule', $request->get('csrf_key'))) { + throw new AccessDeniedException('Invalid CSRF key.'); + } + + $this->schedules->deleteSchedule($scheduleId); + + return $this->redirectToRoute('schedules', [ + 'catalogId' => $catalogId, + 'termId' => $termId, + ]); + } + + /** + * Add sections to a schedule. + * + * @return void + * + * @since 8/2/10 + */ + #[Route('/schedules/add/{catalogId}/{termId}', name: 'add_to_schedule', methods: ['POST'])] + public function addAction(Request $request, string $scheduleId, ?\osid_id_Id $catalogId = null, ?\osid_id_Id $termId = null) + { + if (!$this->isCsrfTokenValid('add-to-schedule', $request->get('csrf_key'))) { + throw new AccessDeniedException('Invalid CSRF key.'); + } + + $schedule = $this->schedules->getSchedule($request->get('scheduleId')); + + // Get our ids from the POST + $offeringIds = []; + foreach ($_POST as $key => $val) { + if (preg_match('/^section_group_[0-9]+$/', $key)) { + $offeringIds[] = $this->osidIdMap->fromString($val); + } + } + if (!count($offeringIds)) { + throw new \InvalidArgumentException('No Sections selected.'); + } + + /********************************************************* + * Validate the set of offerings chosen + *********************************************************/ + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $lookupSession->useFederatedCourseCatalogView(); + $linkType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:link'); + + $offering = $lookupSession->getCourseOffering($offeringIds[0]); + $course = $offering->getCourse(); + $termId = $offering->getTermId(); + + $selectedLinkSet = $this->osidIdMap->fromString($request->get('section_set')); + $linkTypes = $course->getLinkTypeIdsForTermAndSet($termId, $selectedLinkSet); + $requiredLinkTypes = []; + while ($linkTypes->hasNext()) { + $requiredLinkTypes[] = [ + 'id' => $linkTypes->getNextId(), + 'found' => false, + ]; + } + + foreach ($offeringIds as $id) { + $offering = $lookupSession->getCourseOffering($id); + + // Verify that the offering is part of the selected link-set. + $linkRecord = $offering->getCourseOfferingRecord($linkType); + if (!$selectedLinkSet->isEqual($linkRecord->getLinkSetId())) { + throw new \Exception('The offering chosen is not part of the link-set selected.'); + } + + // Check that we are adding a single section from each link-type. + $linkTypeId = $linkRecord->getLinkTypeId(); + $checked = false; + foreach ($requiredLinkTypes as $key => $info) { + if ($info['id']->isEqual($linkTypeId)) { + $checked = true; + if ($info['found']) { + throw new \Exception('A second section from the same link-group is selected.'); + } else { + $requiredLinkTypes[$key]['found'] = true; + } + } + } + if (!$checked) { + throw new \Exception("The link-group id of the offering '".$linkTypeId->getIdentifier()."' wasn't in the required list."); + } + + // Also check that the sections are from the same course and term. + if (!$offering->getTermId()->isEqual($termId)) { + throw new \Exception('Trying to add offerings from multiple terms.'); + } + if (!$offering->getCourseId()->isEqual($course->getId())) { + throw new \Exception('Trying to add offerings from multiple courses.'); + } + } + // Check that we are adding a section for each link-group. + foreach ($requiredLinkTypes as $info) { + if (!$info['found']) { + throw new \Exception('No offering was added for the link-group '.$info['id']->getIdentifier().' when adding sections for '.$course->getDisplayName().'. POST: '.print_r($_POST, true)); + } + } + + /********************************************************* + * Remove any offerings for the course already added. + *********************************************************/ + foreach ($schedule->getOfferings() as $oldOffering) { + if ($oldOffering->getCourseId()->isEqual($course->getId())) { + $schedule->remove($oldOffering->getId()); + } + } + + /********************************************************* + * Add the offerings to the Schedule + *********************************************************/ + foreach ($offeringIds as $offeringId) { + try { + $schedule->add($offeringId); + } catch (Exception $e) { + if (23000 != $e->getCode()) { + throw $e; + } + } + } + + return $this->redirectToRoute('schedules', [ + 'catalogId' => $catalogId, + 'termId' => $termId, + ]); + } + + /** + * Remove an offering from a schedule. + * + * @return void + * + * @since 8/4/10 + */ + #[Route('/schedules/remove/{scheduleId}/{catalogId}/{termId}', name: 'remove_from_schedule', methods: ['POST'])] + public function removeAction(Request $request, string $scheduleId, ?\osid_id_Id $catalogId = null, ?\osid_id_Id $termId = null) + { + if (!$this->isCsrfTokenValid('remove-from-schedule', $request->get('csrf_key'))) { + throw new AccessDeniedException('Invalid CSRF key.'); + } + + $schedule = $this->schedules->getSchedule($scheduleId); + + $lookupSession = $this->osidRuntime->getCourseManager()->getCourseOfferingLookupSession(); + $lookupSession->useFederatedCourseCatalogView(); + + $offering = $lookupSession->getCourseOffering($this->osidIdMap->fromString($request->get('offering'))); + $courseId = $offering->getCourseId(); + + // Remove the selected offering. + $schedule->remove($offering->getId()); + + // Remove all other offerings for the course. + foreach ($schedule->getOfferings() as $offering) { + if ($offering->getCourse()->getId()->isEqual($courseId)) { + $schedule->remove($offering->getId()); + } + } + + return $this->redirectToRoute('schedules', [ + 'catalogId' => $catalogId, + 'termId' => $termId, + ]); + } + + /** + * Answer a JSON list of sections information for a course. + * + * @return void + * + * @since 8/3/10 + */ + #[Route('/schedules/sectionsforcourse/{courseId}/{termId}', name: 'schedule_sections_for_course')] + public function sectionsforcourseAction(Request $request, \osid_id_Id $courseId, \osid_id_Id $termId) + { + $offeringSearchSession = $this->osidRuntime->getCourseManager()->getCourseOfferingSearchSession(); + $offeringSearchSession->useFederatedCourseCatalogView(); + + $query = $offeringSearchSession->getCourseOfferingQuery(); + $query->matchCourseId($courseId, true); + $query->matchTermId($termId, true); + + $results = $offeringSearchSession->getCourseOfferingsByQuery($query); + + $schedule = $this->schedules->getSchedule($request->get('scheduleId')); + + $sets = []; + $linkType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:link'); + $instructorType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); + while ($results->hasNext()) { + $offering = $results->getNextCourseOffering(); + + $instructors = $offering->getInstructors(); + $instructorString = ''; + while ($instructors->hasNext()) { + $instructorString .= $instructors->getNextResource()->getDisplayName().', '; + } + $instructorString = trim($instructorString, ', '); + + $conflicts = $schedule->conflicts($offering); + if ($conflicts) { + $conflictString = ''; + $conflictingNames = []; + foreach ($schedule->getConflictingEvents($offering) as $event) { + $conflictingNames[] = $event['name']; + } + $conflictString = 'Conflicts with: '.implode(', ', array_unique($conflictingNames)); + } else { + $conflictString = ''; + } + $info = [ + 'id' => $this->osidIdMap->toString($offering->getId()), + 'name' => $offering->getDisplayName(), + 'type' => $offering->getGenusType()->getDisplayName(), + 'instructor' => $instructorString, + 'location' => $offering->getLocationInfo(), + 'availability' => $this->osidDataLoader->getAvailabilityLink($offering), + 'schedule' => $this->schedulesExtension->formatScheduleInfo($offering->getScheduleInfo()), + 'conflicts' => $conflicts, + 'conflictString' => $conflictString, + ]; + + // Get the link id and ensure that we have a set and type-group for it. + $linkRecord = $offering->getCourseOfferingRecord($linkType); + $linkSetIdString = $this->osidIdMap->toString($linkRecord->getLinkSetId()); + $info['link_set'] = $linkSetIdString; + if (!isset($sets[$linkSetIdString])) { + $sets[$linkSetIdString] = []; + } + if (!isset($sets[$linkSetIdString]['types'])) { + $sets[$linkSetIdString]['types'] = []; + } + + $linkTypeIdString = $this->osidIdMap->toString($linkRecord->getLinkTypeId()); + $info['link_type'] = $linkTypeIdString; + if (!isset($sets[$linkSetIdString]['types'][$linkTypeIdString])) { + $sets[$linkSetIdString]['types'][$linkTypeIdString] = []; + } + + // To start with, enable the first section in each group. + // Later, we may want to check if the target schedule already has + // this course added and select the already-added versions so that + // a second addition will update that course's sections rather than + // add them again. + if (!count($sets[$linkSetIdString]['types'][$linkTypeIdString])) { + $info['selected'] = true; + } + + if ($schedule->includes($offering->getId())) { + if (count($sets[$linkSetIdString]['types'][$linkTypeIdString])) { + $sets[$linkSetIdString]['types'][$linkTypeIdString][0]['selected'] = false; + } + $info['selected'] = true; + $sets[$linkSetIdString]['selected'] = true; + } + + // Add the info to the appropriate set. + $sets[$linkSetIdString]['types'][$linkTypeIdString][] = $info; + } + + return new JsonResponse($sets); + } + + /** + * Answer an array of events for the schedule in JSON format. + * + * @return void + * + * @since 8/5/10 + */ + #[Route('/schedules/eventsjson/{scheduleId}.json', name: 'schedule_events_json')] + public function eventsjsonAction() + { + $schedule = $this->schedules->getSchedule($this->_getParam('scheduleId')); + + $thisWeek = Week::current(); + + $events = $schedule->getWeeklyEvents(); + foreach ($events as $i => &$event) { + $event['title'] = $event['name']; + + if ($event['location']) { + $event['title'] .= '
        '.$event['location']; + } + + if ($event['crn']) { + $event['title'] .= ' - CRN: '.$event['crn']; + } + + $day = $thisWeek->asDateAndTime(); + if ($event['dayOfWeek']) { + $day = $day->plus(Duration::withDays($event['dayOfWeek'])); + } + + $dateTime = $day->plus(Duration::withSeconds($event['startTime'])); + $event['start'] = $dateTime->ymdString().' '.$dateTime->hmsString(); + $dateTime = $day->plus(Duration::withSeconds($event['endTime'])); + $event['end'] = $dateTime->ymdString().' '.$dateTime->hmsString(); + + $event['id'] = $i; + } + + echo json_encode($events); + } + + /** + * Answer a PNG Image of the schedule. + * + * @return void + * + * @since 8/5/10 + */ + #[Route('/schedules/png/{scheduleId}.png', name: 'schedule_png')] + public function pngAction(string $scheduleId) + { + $data = $this->getScheduleImageData($scheduleId); + $image = $this->generateImage($data); + ob_start(); + imagepng($image); + imagedestroy($image); + $response = new Response(ob_get_clean()); + $response->headers->set('Content-Type', 'image/png'); + return $response; + } + + /** + * Get data needed for rendering the schedule image. + * + * @return array + */ + protected function getScheduleImageData(string $scheduleId): array + { + $data = []; + $schedule = $this->schedules->getSchedule($scheduleId); + $data['fontFile'] = $this->getParameter('app.schedules.image.font_file'); + $data['schedule'] = $schedule; + $data['events'] = $schedule->getWeeklyEvents(); + $data['minTime'] = $schedule->getEarliestTime(); + $data['events'] = $schedule->getWeeklyEvents(); + if ($schedule->getLatestTime()) { + $data['maxTime'] = $schedule->getLatestTime(); + } else { + $data['minTime'] = 9 * 3600; + $data['maxTime'] = 17 * 3600; + } + $data['width'] = null; + $data['height'] = 600; + return $data; + } + + /** + * Answer a print-view of the schedule. + * + * @return void + * + * @since 8/5/10 + */ + #[Route('/schedules/print/{scheduleId}', name: 'print_schedule')] + public function printAction(string $scheduleId) + { + $this->_helper->layout->disableLayout(); + + $this->initializeSchedule(); + } + + /** + * Answer true if sending email is enabled. + * + * @return bool + */ + protected function emailEnabled() + { + if (!$this->getParameter('app.schedules.email.enabled')) { + return false; + } + + // Allow enabling email for only some users + return in_array('ROLE_CAN_SEND_EMAIL', $this->getUser()->getRoles()); + } + + /** + * Answer the email address to send mail from. + * + * @return string + */ + protected function getFromEmail() + { + $name = $this->getUser()->getName(); + if ($this->getParameter('app.schedules.email.send_mail_as_user')) { + return $name.' <'.$this->getUser()->getEmail().'>'; + } elseif ($this->getParameter('app.schedules.email.send_mail_as')) { + return $name.' - Catalog <'.$this->getParameter('app.schedules.email.send_mail_as').'>'; + } else { + throw new \Exception('schedules.email.send_mail_as_user is false, but schedules.email.send_mail_as is not set.'); + } + } + + /** + * Email a schedule to one or more addresses. + * + * @return void + */ + #[Route('/schedules/email', name: 'email_schedule')] + public function emailAction() + { + try { + if (!$this->emailEnabled()) { + throw new \Exception('Emailing of schedules is not enabled in frontend_config.ini.'); + } + $this->verifyChangeRequest(); + + $this->initializeSchedule(); + $this->view->messageBody = $this->_getParam('message'); + + // Generate the text version of the email. + $this->render('email-text'); + $text = $this->getResponse()->getBody(); + $this->getResponse()->setBody(''); + + // Generate the html version of the email. + $this->render('email-html'); + $html = $this->getResponse()->getBody(); + $this->getResponse()->setBody(''); + + // Generate the Schedule image. + $data = $this->getScheduleImageData($scheduleId); + $this->render('generate-image'); + ob_start(); + imagepng($this->view->image, null, 5); + imagedestroy($this->view->image); + $imageData = ob_get_clean(); + + // To + $to = $this->_helper->auth()->getUserEmail(); + if (strlen(trim($this->_getParam('to'))) && trim($this->_getParam('to')) != $to) { + $to .= ', '.trim($this->_getParam('to')); + } + + // Build the email + $mime = new \Mail_mime(); + $headers = [ + 'From' => $this->getFromEmail(), + 'Reply-To' => $this->_helper->auth()->getUserEmail(), + 'CC' => $this->_helper->auth()->getUserEmail(), + 'Subject' => preg_replace('/[^\w \'"&-_.,\/*%#$@!()=+:;<>?]/', '', $this->_getParam('subject')), + ]; + $mime->setTXTBody($text); + $mime->setHTMLBody($html); + $mime->addHTMLImage($imageData, 'image/png', 'schedule_image.png', false); + $mime->addAttachment($imageData, 'image/png', 'schedule_image.png', false); + + // Send the email + $body = $mime->get(); + $headers = $mime->headers($headers); + + $mail = Mail::factory('mail'); + $result = $mail->send($to, $headers, $body); + + if (true === $result) { + echo 'Email sent.'; + } else { + throw $result; + } + } catch (Exception $e) { + error_log($e->getMessage()); + + $this->getResponse()->setHttpResponseCode(500); + $this->getResponse()->setBody($e->getMessage()); + } + } + + protected function generateImage(array $data): \GdImage + { + /********************************************************* + * Figure out how many days we are working with. + *********************************************************/ + $hasSunday = false; + $hasSaturday = false; + foreach ($data['events'] as $event) { + if ($event['dayOfWeek'] == 0) + $hasSunday = true; + if ($event['dayOfWeek'] == 6) + $hasSaturday = true; + } + $numDays = 7; + $startDay = 0; + $endDay = 6; + if (!$hasSunday) { + $numDays--; + $startDay = 1; + } + if (!$hasSaturday) { + $numDays--; + $endDay = 5; + } + + + /********************************************************* + * Set up our image. + *********************************************************/ + + $width = 910; + if ($data['width']) + $width = $data['width']; + $height = 800; + if ($data['height']) + $height = $data['height']; + + if (empty($data['fontFile'])) { + throw new \Exception("No font-file configured."); + } + if (!file_exists($data['fontFile'])) { + throw new \Exception("Font-file missing, not found at ".$data['fontFile']); + } + + $im = ImageCreateTrueColor($width, $height); + + // Set colors + $black = ImageColorAllocate($im, 0, 0, 0); + $white = ImageColorAllocate($im, 255, 255, 255); + $orange = ImageColorAllocate($im, 255, 200, 0); + $yellow = ImageColorAllocate($im, 255, 255, 0); + $tan = ImageColorAllocate($im, 255, 255, 190); + $ltgrey = ImageColorAllocate($im, 235, 235, 235); + $grey = ImageColorAllocate($im, 200, 200, 200); + $dkgrey = ImageColorAllocate($im, 140, 140, 140); + $blue = ImageColorAllocate($im, 0, 90, 207); + $red = ImageColorAllocate($im, 255, 50, 50); + $darkred = ImageColorAllocate($im, 0, 0, 0); + $ltblue = ImageColorAllocate($im, 175, 210, 255); + + + // Background color + imagefilledrectangle($im, 0, 0, $width, $height, $white); + + $timeWidth = 97; + $gridWidth = $width - $timeWidth; + $dayWidth = floor($gridWidth / $numDays); + + $firstHour = floor($data['minTime']/3600); + $gridStartTime = $firstHour * 3600; + $hoursToShow = ceil(($data['maxTime'] - $data['minTime'])/3600); + + $headerHeight = 48; + $gridHeight = $height - $headerHeight; + $hourHeight = floor($gridHeight / $hoursToShow); + + // header row & time column + imagefilledrectangle($im, 1, 1, $width - 2, $headerHeight - 1, $ltgrey); + imagefilledrectangle($im, 1, 1, $timeWidth - 1, $height - 2, $ltgrey); + + // Hours + for ($h = 0; $h < $hoursToShow; $h++) { + $top = $headerHeight + ($hourHeight * $h); + $bottom = $top + $hourHeight; + imagerectangle($im, 0, $top, $width, $bottom, $grey); + } + + // Days + for ($d = $startDay; $d < $numDays; $d++) { + $left = $timeWidth + ($dayWidth * $d); + $right = $left + $dayWidth; + imagerectangle($im, $left, 0, $right, $height, $black); + } + + // Day Labels + $days = array('Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'); + for ($d = $startDay; $d <= $endDay; $d++) { + $label = $days[$d]; + + $dayPosition = $d - $startDay; + $left = $timeWidth + ($dayWidth * $dayPosition); + $size = 24; + $bb = imagettfbbox($size, 0, $data['fontFile'], $label); + $textWidth = $bb[2] - $bb[0]; + ImageTTFText($im, $size, 0, round($left + (($dayWidth - $textWidth)/2)), $headerHeight - 5, $black, $data['fontFile'], $label); + } + + // Hour Labels + for($i = 0; $i < $hoursToShow; $i++) { + $hour = $firstHour + $i; + if ($hour < 12) + $hourString = $hour.':00 am'; + else if ($hour == 12) + $hourString = '12:00 pm'; + else + $hourString = ($hour - 12).':00 pm'; + + $size = 12; + $bb = imagettfbbox($size, 0, $data['fontFile'], $hourString); + $textWidth = $bb[2] - $bb[0]; + $textHeight = $bb[1] - $bb[5]; + $top = $headerHeight + ($hourHeight * $i) + $textHeight + intval(($hourHeight - $textHeight)/2); + $left = $timeWidth - $textWidth - 10; + ImageTTFText($im, $size, 0, $left, $top, $black, $data['fontFile'], $hourString); + } + + /********************************************************* + * Events + *********************************************************/ + + foreach ($data['events'] as $event) { + if ($event['collisions']) { + $eventColor = $red; + $eventBorderColor = $darkred; + } else { + $eventColor = $ltblue; + $eventBorderColor = $blue; + } + $dayPosition = $event['dayOfWeek'] - $startDay; + $left = $timeWidth + ($dayWidth * $dayPosition) + 1; // 1px margin + $right = $left + $dayWidth - 2; // 1px margin + + $top = $this->timePosition($gridStartTime, $hourHeight, $event['startTime']) + $headerHeight; + $bottom = $this->timePosition($gridStartTime, $hourHeight, $event['endTime']) + $headerHeight; + + imagefilledrectangle($im, $left, $top, $right, $bottom, $eventColor); + imagerectangle($im, $left, $top, $right, $bottom, $eventBorderColor); + + $start = \Time::withSeconds($event['startTime']); + $end = \Time::withSeconds($event['endTime']); + $string = $start->hour12().':'.str_pad($start->minute(), 2, '0', STR_PAD_LEFT).'-'.$end->hour12().':'.str_pad($end->minute(), 2, '0', STR_PAD_LEFT); + $size = 10; + $bb = imagettfbbox($size, 0, $data['fontFile'], $string); + $textWidth = $bb[2] - $bb[0]; + $textHeight = $bb[1] - $bb[5]; + $textTop = $top + $textHeight + 3; + $textLeft = $left + round(($dayWidth - $textWidth)/2); + ImageTTFText($im, $size, 0, $textLeft, $textTop, $black, $data['fontFile'], $string); + + $size = 10; + $bb = imagettfbbox($size, 0, $data['fontFile'], $event['name']); + $textWidth = $bb[2] - $bb[0]; + $textHeight = $bb[1] - $bb[5]; + $textTop = $top + $textHeight + 16; + $textLeft = $left + round(($dayWidth - $textWidth)/2); + ImageTTFText($im, $size, 0, $textLeft, $textTop, $black, $data['fontFile'], $event['name']); + + $size = 10; + $bb = imagettfbbox($size, 0, $data['fontFile'], $event['location']); + $textWidth = $bb[2] - $bb[0]; + $textHeight = $bb[1] - $bb[5]; + $textTop = $top + $textHeight +$textHeight + 22; + $textLeft = $left + round(($dayWidth - $textWidth)/2); + ImageTTFText($im, $size, 0, $textLeft, $textTop, $black, $data['fontFile'], $event['location']); + + $size = 10; + $bb = imagettfbbox($size, 0, $data['fontFile'], $event['crn']); + $textWidth = $bb[2] - $bb[0]; + $textHeight = $bb[1] - $bb[5]; + //$textTop = $top + $textHeight +$textHeight + 34; + $textTop += 14; + $textLeft = $left + round(($dayWidth - $textWidth)/3); + ImageTTFText($im, $size, 0, $textLeft, $textTop, $black, $data['fontFile'], "CRN: ".$event['crn']); + + } + + + /********************************************************* + * Final Outlines. + *********************************************************/ + + // Background Outline + imagerectangle($im, 0, 0, $width - 1, $height - 1, $black); + // Header & time outlines + imagerectangle($im, 0, 0, $width, $headerHeight, $black); + imagerectangle($im, 0, 0, $timeWidth, $height, $black); + + + /********************************************************* + * Return the image for output by another view. + *********************************************************/ + return $im; + } + + protected function timePosition($gridStartTime, $hourHeight, $time) { + $diff = $time - $gridStartTime; + $hours = $diff/3600; + return round($hours * $hourHeight); + } +} diff --git a/application/library/Schedule.php b/src/Schedule.php similarity index 86% rename from application/library/Schedule.php rename to src/Schedule.php index 82975394..c064d624 100755 --- a/application/library/Schedule.php +++ b/src/Schedule.php @@ -1,19 +1,19 @@ db = $db; - $this->userId = $userId; - $this->courseManager = $courseManager; - $this->id = $id; - $this->name = $name; - $this->termId = $termId; } - private $db; - private $userId; - private $courseManager; - private $name; - private $id; - private $termId; - /** * Answer the name of the Schedule. * @@ -81,7 +69,7 @@ public function setName($name) { $name = trim(preg_replace('/\W/', ' ', $name)); if (!strlen($name)) { - throw new InvalidArgumentException('Name is invalid.'); + throw new \InvalidArgumentException('Name is invalid.'); } $stmt = $this->db->prepare('UPDATE user_schedules SET name = ? WHERE id = ? AND user_id = ?;'); @@ -108,7 +96,7 @@ public function getId() /** * Answer the Id of the term this schedule is associated with. * - * @return osid_id_Id + * @return \osid_id_Id * * @since 8/16/10 */ @@ -131,7 +119,7 @@ public function getTermName() $session->useFederatedCourseCatalogView(); return $session->getTerm($this->termId)->getDisplayName(); - } catch (osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { return $this->termId->getIdentifier(); } } @@ -143,7 +131,7 @@ public function getTermName() * * @since 8/3/10 */ - public function add(osid_id_Id $offeringId) + public function add(\osid_id_Id $offeringId) { unset($this->offerings); $stmt = $this->db->prepare('INSERT INTO user_schedule_offerings (schedule_id, offering_id_keyword, offering_id_authority, offering_id_namespace) VALUES (?, ?, ?, ?);'); @@ -157,7 +145,7 @@ public function add(osid_id_Id $offeringId) ]); } catch (Zend_Db_Statement_Exception $e) { if (23000 == $e->getCode()) { - throw new Exception('Offering already added.', 23000); + throw new \Exception('Offering already added.', 23000); } else { throw $e; } @@ -171,7 +159,7 @@ public function add(osid_id_Id $offeringId) * * @since 8/3/10 */ - public function includes(osid_id_Id $offeringId) + public function includes(\osid_id_Id $offeringId) { // If we've already loaded our offerings, look at the object properties // rather than doing another query. @@ -187,14 +175,13 @@ public function includes(osid_id_Id $offeringId) // Do the lookup in the database. $stmt = $this->db->prepare('SELECT * FROM user_schedule_offerings WHERE schedule_id = ? AND offering_id_keyword = ? AND offering_id_authority = ? AND offering_id_namespace = ? LIMIT 1;'); - $stmt->execute([ + $result = $stmt->execute([ $this->getId(), $offeringId->getIdentifier(), $offeringId->getAuthority(), $offeringId->getIdentifierNamespace(), ]); - - return count($stmt->fetchAll()) > 0; + return $result->fetchAssociative() !== false; } /** @@ -204,7 +191,7 @@ public function includes(osid_id_Id $offeringId) * * @since 8/3/10 */ - public function remove(osid_id_Id $offeringId) + public function remove(\osid_id_Id $offeringId) { unset($this->offerings); $stmt = $this->db->prepare('DELETE FROM user_schedule_offerings WHERE schedule_id = ? AND offering_id_keyword = ? AND offering_id_authority = ? AND offering_id_namespace = ? LIMIT 1;'); @@ -227,7 +214,7 @@ public function getOfferings() { if (!isset($this->offerings)) { $stmt = $this->db->prepare('SELECT * FROM user_schedule_offerings WHERE schedule_id = ?;'); - $stmt->execute([ + $result = $stmt->execute([ $this->getId(), ]); @@ -235,8 +222,8 @@ public function getOfferings() $lookupSession->useFederatedCourseCatalogView(); $offerings = []; - foreach ($stmt->fetchAll() as $row) { - $offeringId = new phpkit_id_Id($row['offering_id_authority'], $row['offering_id_namespace'], $row['offering_id_keyword']); + while (($row = $result->fetchAssociative()) !== false) { + $offeringId = new \phpkit_id_Id($row['offering_id_authority'], $row['offering_id_namespace'], $row['offering_id_keyword']); try { $offering = $lookupSession->getCourseOffering($offeringId); @@ -248,7 +235,7 @@ public function getOfferings() $offering->getDisplayName(); $offerings[] = $offering; - } catch (osid_NotFoundException $e) { + } catch (\osid_NotFoundException $e) { // Ignore offerings that are no longer being offered. } } @@ -272,7 +259,7 @@ public function getWeeklyEvents() { if (!isset($this->events)) { $this->events = []; - $scheduleType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); + $scheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); foreach ($this->getOfferings() as $offering) { $this->events = array_merge($this->events, $this->getWeeklyOfferingEvents($offering)); @@ -327,9 +314,9 @@ private function getDailyEvents($name, $offeringIdString, $location, $crn, $dayO * * @since 8/9/10 */ - private function getWeeklyOfferingEvents(osid_course_CourseOffering $offering) + private function getWeeklyOfferingEvents(\osid_course_CourseOffering $offering) { - $scheduleType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); + $scheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); $events = []; $name = $offering->getDisplayName(); @@ -341,8 +328,8 @@ private function getWeeklyOfferingEvents(osid_course_CourseOffering $offering) $crn = $offering->getCourseReferenceNumber(); try { $rec = $offering->getCourseOfferingRecord($scheduleType); - } catch (osid_UnsupportedException $e) { - throw new InvalidArgumentException($e->getMessage(), $e->getCode()); + } catch (\osid_UnsupportedException $e) { + throw new \InvalidArgumentException($e->getMessage(), $e->getCode()); } $idString = $this->idToString($offering->getId()); @@ -381,7 +368,7 @@ private function getWeeklyOfferingEvents(osid_course_CourseOffering $offering) * * @since 8/9/10 */ - public function conflicts(osid_course_CourseOffering $offering) + public function conflicts(\osid_course_CourseOffering $offering) { $events = $this->getWeeklyOfferingEvents($offering); foreach ($events as $event) { @@ -400,7 +387,7 @@ public function conflicts(osid_course_CourseOffering $offering) * * @since 8/9/10 */ - public function getConflictingEvents(osid_course_CourseOffering $offering) + public function getConflictingEvents(\osid_course_CourseOffering $offering) { $myEvents = $this->getWeeklyOfferingEvents($offering); $conflictingEvents = []; @@ -422,16 +409,16 @@ public function getConflictingEvents(osid_course_CourseOffering $offering) * The offering must exist in the schedule to obtain a result. * An InvalidArgumentException will be thrown if the offering is not in the schedule. * - * @param osid_id_Id + * @param \osid_id_Id * * @return bool * * @since 8/9/10 */ - public function hasCollisions(osid_id_Id $id) + public function hasCollisions(\osid_id_Id $id) { if (!$this->includes($id)) { - throw new InvalidArgumentException('The offering Id passed is not in the schedule.'); + throw new \InvalidArgumentException('The offering Id passed is not in the schedule.'); } $idString = $this->idToString($id); foreach ($this->getWeeklyEvents() as $event) { @@ -485,12 +472,12 @@ private function eventsCollide(array $event1, array $event2) return false; } - $timespan1 = Timespan::startingEnding( - DateAndTime::today()->plus(Duration::withSeconds($event1['startTime'])), - DateAndTime::today()->plus(Duration::withSeconds($event1['endTime']))); - $timespan2 = Timespan::startingEnding( - DateAndTime::today()->plus(Duration::withSeconds($event2['startTime'])), - DateAndTime::today()->plus(Duration::withSeconds($event2['endTime']))); + $timespan1 = \Timespan::startingEnding( + \DateAndTime::today()->plus(\Duration::withSeconds($event1['startTime'])), + \DateAndTime::today()->plus(\Duration::withSeconds($event1['endTime']))); + $timespan2 = \Timespan::startingEnding( + \DateAndTime::today()->plus(\Duration::withSeconds($event2['startTime'])), + \DateAndTime::today()->plus(\Duration::withSeconds($event2['endTime']))); return null !== $timespan1->intersection($timespan2); } @@ -612,7 +599,7 @@ public function timeSort(array &$offerings) $sortkeys = []; $names = []; - $weeklyScheduleType = new phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); + $weeklyScheduleType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:weekly_schedule'); foreach ($offerings as $offering) { $key = 0; @@ -700,7 +687,7 @@ public function nameSort(array &$offerings) * * @since 8/9/10 */ - private function idToString(osid_id_Id $id) + private function idToString(\osid_id_Id $id) { return $id->getIdentifierNamespace().':'.$id->getAuthority().':'.$id->getIdentifier(); } diff --git a/src/Security/SamlUser.php b/src/Security/SamlUser.php index 17786f59..d6e5f04e 100644 --- a/src/Security/SamlUser.php +++ b/src/Security/SamlUser.php @@ -44,7 +44,14 @@ public function setSamlAttributes(array $attributes): void */ public function getRoles(): array { - return ['ROLE_USER']; + $roles = ['ROLE_USER']; + + // This is just a placeholder implementation. It should be configurable. + if ($this->email && preg_match('/@middlebury\.edu$/', $this->email)) { + $roles[] = 'ROLE_CAN_SEND_EMAIL'; + } + + return $roles; } /** @@ -67,4 +74,29 @@ public function getUserIdentifier(): string { return $this->id; } + + /** + * Returns a name for the user. + */ + public function getName(): string + { + if ($this->givenName || $this->surname) { + return trim($this->givenName . ' ' . $this->surname); + } elseif ($this->email) { + return $this->email; + } else { + return $this->id; + } + } + + /** + * Answer the email address for the user. + */ + public function getEmail(): string { + if ($this->email) { + return $this->email; + } else { + throw new \Exception('No email is set for user '.$this->id); + } + } } diff --git a/src/Service/Bookmarks.php b/src/Service/Bookmarks.php index 6df250c2..f833eac1 100755 --- a/src/Service/Bookmarks.php +++ b/src/Service/Bookmarks.php @@ -73,7 +73,7 @@ public function remove(\osid_id_Id $courseId) * * @return bool */ - public function isBookmarked(\osid_id_Id $courseId) + public function isBookmarked(\osid_id_Id $courseId): bool { $stmt = $this->entityManager->getConnection()->prepare('SELECT COUNT(*) as is_bookmarked FROM user_savedcourses WHERE user_id = ? AND course_id_keyword = ? AND course_id_authority = ? AND course_id_namespace = ?'); $result = $stmt->executeQuery([ @@ -90,56 +90,61 @@ public function isBookmarked(\osid_id_Id $courseId) /** * Answer an array of all bookmarked courseIds. * - * @return \osid_id_IdList[] + * @return [] */ - public function getAllBookmarkedCourseIds() + public function getAllBookmarkedCourseIds(): array { $stmt = $this->entityManager->getConnection()->prepare('SELECT * FROM user_savedcourses WHERE user_id = ?'); $result = $stmt->executeQuery([ $this->getUserIdentifier(), ]); $ids = []; - foreach ($stmt->fetchAll() as $row) { + while (($row = $result->fetchAssociative()) !== false) { $ids[] = new \phpkit_id_Id($row['course_id_authority'], $row['course_id_namespace'], $row['course_id_keyword']); } - return new \phpkit_id_ArrayIdList($ids); + return $ids; } /** * Answer an array of all bookmarked courses. * - * @return \osid_course_CourseList + * @return array */ - public function getAllBookmarkedCourses() + public function getAllBookmarkedCourses(): array { $courseIdList = $this->getAllBookmarkedCourseIds(); if (!$courseIdList->hasNext()) { return new \phpkit_course_ArrayCourseList([]); } - $courseLookupSession = $this->courseManager->getCourseLookupSession(); + $courseLookupSession = $this->osidRuntime->getCourseManager()->getCourseLookupSession(); $courseLookupSession->useFederatedCourseCatalogView(); - return $courseLookupSession->getCoursesByIds($courseIdList); + $courseList = $courseLookupSession->getCoursesByIds($courseIdList); + $courses = []; + while ($courseList->hasNext()) { + $courses[] = $courseList->getNextCourse(); + } + return $courses; } /** * Answer an array of all bookmarked courses that match a given catalog and term. * - * @return \osid_course_CourseList + * @return array */ - public function getBookmarkedCoursesInCatalogForTerm(\osid_id_Id $catalogId, \osid_id_Id $termId) + public function getBookmarkedCoursesInCatalogForTerm(\osid_id_Id $catalogId, \osid_id_Id $termId): array { $courseIdList = $this->getAllBookmarkedCourseIds(); - if (!$courseIdList->hasNext()) { - return new \phpkit_course_ArrayCourseList([]); + if (empty($courseIdList)) { + return []; } - $searchSession = $this->courseManager->getCourseSearchSessionForCatalog($catalogId); + $searchSession = $this->osidRuntime->getCourseManager()->getCourseSearchSessionForCatalog($catalogId); $search = $searchSession->getCourseSearch(); - $search->searchAmongCourses($courseIdList); + $search->searchAmongCourses(new \phpkit_id_ArrayIdList($courseIdList)); $query = $searchSession->getCourseQuery(); $record = $query->getCourseQueryRecord(new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:term')); @@ -150,10 +155,21 @@ public function getBookmarkedCoursesInCatalogForTerm(\osid_id_Id $catalogId, \os $results = $searchSession->getCoursesBySearch($query, $search); - return $results->getCourses(); + $courseList = $results->getCourses(); + $courses = []; + while ($courseList->hasNext()) { + $courses[] = $courseList->getNextCourse(); + } + return $courses; } - protected function getUserIdentifier() + /** + * Get the ID of the currently authenticated user. + * + * @return string + * The currently authenticated user's ID + */ + protected function getUserIdentifier(): string { $user = $this->security->getUser(); if (!$user) { diff --git a/src/Service/Osid/DataLoader.php b/src/Service/Osid/DataLoader.php index ce2eb809..9c005152 100644 --- a/src/Service/Osid/DataLoader.php +++ b/src/Service/Osid/DataLoader.php @@ -17,6 +17,7 @@ public function __construct( private IdMap $osidIdMap, private TermHelper $osidTermHelper, private TopicHelper $osidTopicHelper, + private ?string $bannerWebUrl = null, ) { $this->alternateType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:alternates'); $this->instructorsType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:instructors'); @@ -362,7 +363,7 @@ public function getOfferingData(\osid_course_CourseOffering $offering) // Availability link. @todo $data['availabilityLink'] = null; - // $this->getAvailabilityLink($this->offering); + $this->getAvailabilityLink($offering); $data['properties'] = []; $properties = $offering->getProperties(); @@ -416,4 +417,21 @@ public function getOfferingAlternates(\osid_course_CourseOffering $offering) return $data; } + + /** + * Answer a safe HTML string for the schedule info passed. + * + * @return string + */ + public function getAvailabilityLink(\osid_course_CourseOffering $courseOffering) + { + $bannerIdRecordType = new \phpkit_type_URNInetType('urn:inet:middlebury.edu:record:banner_identifiers'); + if (!empty($this->bannerWebUrl) && $courseOffering->hasRecordType($bannerIdRecordType)) { + $bannerIdRecord = $courseOffering->getCourseOfferingRecord($bannerIdRecordType); + + return 'View availability, prerequisites, and other requirements."; + } + + return null; + } } diff --git a/src/Service/Schedules.php b/src/Service/Schedules.php new file mode 100755 index 00000000..463443d2 --- /dev/null +++ b/src/Service/Schedules.php @@ -0,0 +1,238 @@ +entityManager->getConnection()->prepare('INSERT INTO user_schedules (user_id, term_id_keyword, term_id_authority, term_id_namespace, name) VALUES (?, ?, ?, ?, ?);'); + $name = 'Untitled Schedule'; + $stmt->execute([ + $this->getUserIdentifier(), + $termId->getIdentifier(), + $termId->getAuthority(), + $termId->getIdentifierNamespace(), + $name, + ]); + $id = $this->entityManager->getConnection()->lastInsertId(); + + return new Schedule($id, $this->entityManager->getConnection(), $this->getUserIdentifier(), $this->osidRuntime->getCourseManager(), $name, $termId); + } + + /** + * Delete a schedule. + * + * @param string $scheduleId + * + * @return void + * + * @since 7/29/10 + */ + public function deleteSchedule($scheduleId) + { + $stmt = $this->entityManager->getConnection()->prepare('DELETE FROM user_schedules WHERE id = ? AND user_id = ? LIMIT 1;'); + $stmt->execute([ + $scheduleId, + $this->getUserIdentifier(), + ]); + } + + /** + * Answer a schedule by Id. + * + * @param string $scheduleId + * + * @return Schedule + * + * @since 8/2/10 + */ + public function getSchedule($scheduleId) + { + $stmt = $this->entityManager->getConnection()->prepare('SELECT * FROM user_schedules WHERE id = ? AND user_id = ? LIMIT 1;'); + $result = $stmt->execute([ + $scheduleId, + $this->getUserIdentifier(), + ]); + while (($row = $result->fetchAssociative()) !== false) { + return new Schedule( + $row['id'], + $this->entityManager->getConnection(), + $this->getUserIdentifier(), + $this->osidRuntime->getCourseManager(), + $row['name'], + new \phpkit_id_Id( + $row['term_id_authority'], + $row['term_id_namespace'], + $row['term_id_keyword'], + ), + ); + } + throw new \InvalidArgumentException('Schedule was not found.'); + } + + /** + * Answer all schedules for the current user. + * + * @return array of Schedule objects + * + * @since 8/2/10 + */ + public function getSchedules() + { + $stmt = $this->entityManager->getConnection()->prepare('SELECT * FROM user_schedules WHERE user_id = ?;'); + $result = $stmt->execute([ + $this->getUserIdentifier(), + ]); + + $schedules = []; + while (($row = $result->fetchAssociative()) !== false) { + $schedules[] = new Schedule( + $row['id'], + $this->entityManager->getConnection(), + $this->getUserIdentifier(), + $this->osidRuntime->getCourseManager(), + $row['name'], + new \phpkit_id_Id( + $row['term_id_authority'], + $row['term_id_namespace'], + $row['term_id_keyword'], + ), + ); + } + return $schedules; + } + + /** + * Answer schedules for the current user for a given term. + * + * @return array of Schedule objects + * + * @since 8/2/10 + */ + public function getSchedulesByTerm(\osid_id_Id $termId) + { + $stmt = $this->entityManager->getConnection()->prepare('SELECT * FROM user_schedules WHERE user_id = ? AND term_id_keyword = ? AND term_id_authority = ? AND term_id_namespace = ?;'); + $result = $stmt->execute([ + $this->getUserIdentifier(), + $termId->getIdentifier(), + $termId->getAuthority(), + $termId->getIdentifierNamespace(), + ]); + + $schedules = []; + while (($row = $result->fetchAssociative()) !== false) { + $schedules[] = new Schedule( + $row['id'], + $this->entityManager->getConnection(), + $this->getUserIdentifier(), + $this->osidRuntime->getCourseManager(), + $row['name'], + new \phpkit_id_Id( + $row['term_id_authority'], + $row['term_id_namespace'], + $row['term_id_keyword'], + ), + ); + } + return $schedules; + } + + /** + * Get the ID of the currently authenticated user. + * + * @return string + * The currently authenticated user's ID + */ + protected function getUserIdentifier(): string + { + $user = $this->security->getUser(); + if (!$user) { + throw new \Exception('No authenticated user found.'); + } + return $user->getUserIdentifier(); + } + + /** + * Answer a saved catalog Id or null. + * + * @return osid_id_Id or NULL + */ + public function getSavedUserCatalogId() + { + if (!isset($this->savedCatalogId)) { + $stmt = $this->entityManager->getConnection()->prepare('SELECT * FROM user_catalog WHERE user_id = ?'); + $result = $stmt->execute([$this->getUserIdentifier()]); + $row = $result->fetchAssociative(); + if ($row) { + $this->savedCatalogId = new \phpkit_id_Id( + $row['catalog_id_authority'], + $row['catalog_id_namespace'], + $row['catalog_id_keyword'], + ); + } else { + $this->savedCatalogId = null; + } + } + + return $this->savedCatalogId; + } + + /** + * Set the saved catalog id. + * + * @return void + */ + public function setSavedUserCatalogId(\osid_id_Id $catalogId) + { + if (null !== $this->getSavedUserCatalogId() && $catalogId->isEqual($this->getSavedUserCatalogId())) { + return; + } + + $insert = $this->entityManager->getConnection()->prepare('INSERT INTO user_catalog (user_id, catalog_id_authority, catalog_id_namespace, catalog_id_keyword) VALUES (?, ?, ?, ?);'); + try { + $insert->execute([$this->getUserIdentifier(), $catalogId->getAuthority(), $catalogId->getIdentifierNamespace(), $catalogId->getIdentifier()]); + } catch (UniqueConstraintViolationException $e) { + // Already exists + $update = $this->entityManager->getConnection()->prepare('UPDATE user_catalog SET catalog_id_authority = ?, catalog_id_namespace = ?, catalog_id_keyword = ? WHERE user_id = ?'); + $update->execute([$catalogId->getAuthority(), $catalogId->getIdentifierNamespace(), $catalogId->getIdentifier(), $this->getUserIdentifier()]); + } + + $this->savedCatalogId = $catalogId; + } +} diff --git a/src/Twig/SchedulesExtension.php b/src/Twig/SchedulesExtension.php new file mode 100644 index 00000000..b3630f76 --- /dev/null +++ b/src/Twig/SchedulesExtension.php @@ -0,0 +1,44 @@ +hasCollisions($offeringId); + } + + public function formatScheduleInfo(string $scheduleInfo): string + { + $scheduleInfo = nl2br(strip_tags($scheduleInfo)); + $scheduleInfo = preg_replace('/\([^\)]+\)/', '$0', $scheduleInfo); + return $scheduleInfo; + } +} diff --git a/templates/schedules/bookmarks.html.twig b/templates/schedules/bookmarks.html.twig new file mode 100755 index 00000000..b11cc999 --- /dev/null +++ b/templates/schedules/bookmarks.html.twig @@ -0,0 +1,48 @@ +{% if bookmarked_courses is empty %} +

        You have no starred courses for this term. Please search for courses and star interesting ones first.

        + +{% else %} +
          +{% for course in bookmarked_courses %} +
        • +
          + {{ course.displayname }} - {{ course.title }} +
          +
          + + + +
          +
          + +
          + +
          • +{% endfor %} +
        +{% endif %} diff --git a/templates/schedules/catalog_select.html.twig b/templates/schedules/catalog_select.html.twig new file mode 100755 index 00000000..97b403d3 --- /dev/null +++ b/templates/schedules/catalog_select.html.twig @@ -0,0 +1,6 @@ + diff --git a/templates/schedules/email-dialog.html.twig b/templates/schedules/email-dialog.html.twig new file mode 100755 index 00000000..253bf506 --- /dev/null +++ b/templates/schedules/email-dialog.html.twig @@ -0,0 +1,46 @@ +{% if emailEnabled %} + + + +{% endif %} diff --git a/templates/schedules/email-html.html.twig b/templates/schedules/email-html.html.twig new file mode 100755 index 00000000..1e7fda1f --- /dev/null +++ b/templates/schedules/email-html.html.twig @@ -0,0 +1,8 @@ + + +

        {{ messageBody | nl2br }}

        +
        + Weekly Schedule Image + {{ include('schedules/email-offering-list.html.twig', {schedule: schedule}, with_context = false) }} + + diff --git a/templates/schedules/email-offering-list.html.twig b/templates/schedules/email-offering-list.html.twig new file mode 100755 index 00000000..fb503e72 --- /dev/null +++ b/templates/schedules/email-offering-list.html.twig @@ -0,0 +1,21 @@ +{% if schedule.offerings is not empty %} + +{% for offering in schedule.offerings %} + + + + + + +{% endfor %} +
        + ";{{ offering.displayname }} +
        CRN: {{ offering.coursereferencenumber }} +         		+ ";{{ offering.title | nl2br }} + + {{ formatScheduleInfo(offering.scheduleinfo) | raw }} + + {{ offering.locationinfo | nl2br }} +
        +{% endif %} diff --git a/templates/schedules/email-preview.html.twig b/templates/schedules/email-preview.html.twig new file mode 100755 index 00000000..246d0bcb --- /dev/null +++ b/templates/schedules/email-preview.html.twig @@ -0,0 +1,3 @@ +Weekly Schedule Image + +{{ include('schedules/email-offering-list.html.twig', {schedule: schedule}, with_context = false) }} diff --git a/application/views/scripts/schedules/email-text.phtml b/templates/schedules/email-text.txt.twig similarity index 100% rename from application/views/scripts/schedules/email-text.phtml rename to templates/schedules/email-text.txt.twig diff --git a/templates/schedules/index.html.twig b/templates/schedules/index.html.twig new file mode 100755 index 00000000..614b461f --- /dev/null +++ b/templates/schedules/index.html.twig @@ -0,0 +1,37 @@ +{% extends 'base.html.twig' %} + +{% block importmap %} + {# do NOT call parent() #} + {{ importmap(['app', 'schedules']) }} +{% endblock %} + +{% block body %} +

        Schedule Planner

        + + + + + + + + + + + + + + + + + +
        +
        + {{ include('schedules/catalog_select.html.twig', {selectedCatalogId: selectedCatalogId, catalogs: catalogs}, with_context = false) }} + {{ include('schedules/term_select.html.twig', {selectedCatalogId: selectedCatalogId, selectedTermId: selectedTermId, terms: terms}, with_context = false) }} +
        +
        Saved Courses in {{ include('schedules/selected_term_name.html.twig', {selectedTermId: selectedTermId, terms: terms}, with_context = false) }}Schedules for {{ include('schedules/selected_term_name.html.twig', {selectedTermId: selectedTermId, terms: terms}, with_context = false) }}
        + {{ include('schedules/bookmarks.html.twig', {bookmarked_courses: bookmarked_courses, schedules: schedules, selectedCatalogId: selectedCatalogId, selectedTermId: selectedTermId}, with_context = false) }} + + {{ include('schedules/schedules.html.twig', {schedules: schedules, selectedCatalogId: selectedCatalogId, selectedTermId: selectedTermId, emailEnabled: emailEnabled, terms: terms}, with_context = false) }} +
        +{% endblock %} diff --git a/application/views/scripts/schedules/print.phtml b/templates/schedules/print.html.twig similarity index 100% rename from application/views/scripts/schedules/print.phtml rename to templates/schedules/print.html.twig diff --git a/templates/schedules/remove_offering_dialog.html.twig b/templates/schedules/remove_offering_dialog.html.twig new file mode 100755 index 00000000..72c59da6 --- /dev/null +++ b/templates/schedules/remove_offering_dialog.html.twig @@ -0,0 +1,35 @@ +
        +

        What do you want to do?

        + + + + + +
        "; + + + +
        + + + +
        + diff --git a/templates/schedules/schedule_calendar_dialog.html.twig b/templates/schedules/schedule_calendar_dialog.html.twig new file mode 100755 index 00000000..c63b9d74 --- /dev/null +++ b/templates/schedules/schedule_calendar_dialog.html.twig @@ -0,0 +1,10 @@ + + Weekly Schedule Image + + + diff --git a/templates/schedules/schedules.html.twig b/templates/schedules/schedules.html.twig new file mode 100755 index 00000000..42551a7c --- /dev/null +++ b/templates/schedules/schedules.html.twig @@ -0,0 +1,61 @@ +{% for schedule in schedules %} +
        + {% if selectedTermId is empty %} +
        {{ schedule.termname }}
        + {% endif %} + +
        + + +
        + +
        + + + +
        + + + + + + {{ include('schedules/email-dialog.html.twig', {schedule: schedule, emailEnabled: emailEnabled}, with_context = false) }} + + {{ include('schedules/schedule_calendar_dialog.html.twig', {schedule: schedule}, with_context = false) }} + +
          + {% if schedule.offerings is empty %} +
        •  
          • + {% else %} + {% for offering in schedule.offerings %} +
        • + {{ include('schedules/remove_offering_dialog.html.twig', {schedule: schedule, selectedCatalogId: selectedCatalogId, selectedTermId: selectedTermId, offering: offering}, with_context = false) }} +
          + + {{ offering.displayname}} + +
          +
          -
          +
          + + {{ offering.title | nl2br }} + +
          +
          + {{ formatScheduleInfo(offering.scheduleinfo) | raw }} +
          +
          {{ offering.locationinfo | nl2br }}
          +
          • + {% endfor %} + {% endif %} + +
        + +
        +{% endfor %} + +
        + for + {{ include('schedules/terms.html.twig', {terms: terms, selectedTermId: selectedTermId}, with_context = false) }} + +
        diff --git a/templates/schedules/selected_term_name.html.twig b/templates/schedules/selected_term_name.html.twig new file mode 100755 index 00000000..816cd9dd --- /dev/null +++ b/templates/schedules/selected_term_name.html.twig @@ -0,0 +1,7 @@ +{% if selectedTermId %} +{%- for term in terms %} +{{ selectedTermId and osidIdsEqual(selectedTermId, term.id) ? term.displayname }} +{%- endfor %} +{% else %} +All Terms +{% endif %} diff --git a/templates/schedules/term_select.html.twig b/templates/schedules/term_select.html.twig new file mode 100755 index 00000000..f4bcb3f4 --- /dev/null +++ b/templates/schedules/term_select.html.twig @@ -0,0 +1,11 @@ + diff --git a/templates/schedules/terms.html.twig b/templates/schedules/terms.html.twig new file mode 100755 index 00000000..af01d752 --- /dev/null +++ b/templates/schedules/terms.html.twig @@ -0,0 +1,5 @@ + From 369af20c09c64068efc132f0d38f98f942deb88f Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 14 Nov 2024 11:11:24 -0500 Subject: [PATCH 119/173] #47: Remove the jquery-week-calendar library, hasn't been updated in years. Will re-add this functionality once a replacement library is identified which can be added without bringing in ancient versions of jqueryui. --- assets/schedules.js | 5 ++--- composer.json | 17 +---------------- composer.lock | 16 ++-------------- config/packages/asset_mapper.yaml | 1 - importmap.php | 10 ---------- 5 files changed, 5 insertions(+), 44 deletions(-) diff --git a/assets/schedules.js b/assets/schedules.js index 2576354c..05ee922b 100755 --- a/assets/schedules.js +++ b/assets/schedules.js @@ -1,9 +1,6 @@ import './styles/schedules.css'; import $ from 'jquery'; import './email_controls.js'; -import './jquery-week-calendar/jquery.weekcalendar.css' -import 'jquery_week_calendar_date' -import 'jquery_week_calendar' $('document').ready(function() { @@ -129,6 +126,8 @@ $('document').ready(function() { }); $(".calendar_button").click(function(){ + alert('not yet re-implemented. Needs a new calendar library.'); + return false; var jsonUrl = $(this).attr('href'); var calendar = $(this).data('calendar'); calendar.dialog("open"); diff --git a/composer.json b/composer.json index 5226c93f..0270145f 100644 --- a/composer.json +++ b/composer.json @@ -25,8 +25,7 @@ "symfony/monolog-bundle": "^3.0", "symfony/runtime": "6.4.*", "symfony/twig-bundle": "6.4.*", - "symfony/yaml": "6.4.*", - "themouette/jquery-week-calendar": "*@dev" + "symfony/yaml": "6.4.*" }, "config": { "allow-plugins": { @@ -97,19 +96,5 @@ "symfony/phpunit-bridge": "^7.1", "symfony/stopwatch": "6.4.*", "symfony/web-profiler-bundle": "6.4.*" - }, - "repositories": { - "jquery-week-calendar": { - "type": "package", - "package": { - "name": "themouette/jquery-week-calendar", - "version": "v2.0-dev", - "source": { - "url": "https://github.com/themouette/jquery-week-calendar", - "type": "git", - "reference": "master" - } - } - } } } diff --git a/composer.lock b/composer.lock index a5614f34..7fdc3c36 100644 --- a/composer.lock +++ b/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": "48b27d3c51d8c4e59c007aa24ceab13c", + "content-hash": "9d5d3eaa3a3ee84957fd94304406b347", "packages": [ { "name": "brick/math", @@ -8019,16 +8019,6 @@ }, "time": "2024-10-04T16:36:12+00:00" }, - { - "name": "themouette/jquery-week-calendar", - "version": "v2.0-dev", - "source": { - "type": "git", - "url": "https://github.com/themouette/jquery-week-calendar", - "reference": "master" - }, - "type": "library" - }, { "name": "twig/twig", "version": "v3.14.2", @@ -11459,9 +11449,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "themouette/jquery-week-calendar": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/config/packages/asset_mapper.yaml b/config/packages/asset_mapper.yaml index a9162e84..ebfd69c9 100644 --- a/config/packages/asset_mapper.yaml +++ b/config/packages/asset_mapper.yaml @@ -3,4 +3,3 @@ framework: # The paths to make available to the asset mapper. paths: assets/: '' - vendor/themouette/jquery-week-calendar/: 'jquery-week-calendar' diff --git a/importmap.php b/importmap.php index 7041d864..b525cc4d 100644 --- a/importmap.php +++ b/importmap.php @@ -33,14 +33,4 @@ 'jquery' => [ 'version' => '3.7.1', ], - 'jquery_week_calendar' => [ - 'path' => 'jquery-week-calendar/jquery.weekcalendar.js', - ], - 'jquery_week_calendar_date' => [ - 'path' => 'jquery-week-calendar/libs/date.js', - ], - '/assets/jquery-week-calendar/jquery.weekcalendar.css' => [ - 'path' => 'jquery-week-calendar/jquery.weekcalendar.css', - 'type' => 'css', - ], ]; From 47b058df0e036bbf4c2eb2c323690b47b379534c Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Thu, 14 Nov 2024 13:53:29 -0500 Subject: [PATCH 120/173] #47: Add a static copy of jquery-ui 1.14.1 for schedule dialogs. Unfortunately, the normal way of using AssetMapper to include it as a module was failing because jQuery isn't registered in the global scope at the point that jquery-ui gets imported. My work-around was to add a line at the top of jquery-ui.js to import jquery and make the variable available to the library for modification. This is a bit of a hack, but get both libraries loaded and available for now. --- .../images/ui-icons_444444_256x240.png | Bin 0 -> 7126 bytes .../images/ui-icons_555555_256x240.png | Bin 0 -> 7110 bytes .../images/ui-icons_777620_256x240.png | Bin 0 -> 4654 bytes .../images/ui-icons_777777_256x240.png | Bin 0 -> 7147 bytes .../images/ui-icons_cc0000_256x240.png | Bin 0 -> 4654 bytes .../images/ui-icons_ffffff_256x240.png | Bin 0 -> 6523 bytes assets/jquery-ui/jquery-ui.css | 1285 ++ assets/jquery-ui/jquery-ui.js | 18812 ++++++++++++++++ assets/jquery-ui/jquery-ui.min.css | 7 + assets/jquery-ui/jquery-ui.min.js | 6 + assets/jquery-ui/jquery-ui.structure.css | 863 + assets/jquery-ui/jquery-ui.structure.min.css | 5 + assets/jquery-ui/jquery-ui.theme.css | 439 + assets/jquery-ui/jquery-ui.theme.min.css | 5 + assets/schedules.js | 2 + importmap.php | 3 + 16 files changed, 21427 insertions(+) create mode 100644 assets/jquery-ui/images/ui-icons_444444_256x240.png create mode 100644 assets/jquery-ui/images/ui-icons_555555_256x240.png create mode 100644 assets/jquery-ui/images/ui-icons_777620_256x240.png create mode 100644 assets/jquery-ui/images/ui-icons_777777_256x240.png create mode 100644 assets/jquery-ui/images/ui-icons_cc0000_256x240.png create mode 100644 assets/jquery-ui/images/ui-icons_ffffff_256x240.png create mode 100644 assets/jquery-ui/jquery-ui.css create mode 100644 assets/jquery-ui/jquery-ui.js create mode 100644 assets/jquery-ui/jquery-ui.min.css create mode 100644 assets/jquery-ui/jquery-ui.min.js create mode 100644 assets/jquery-ui/jquery-ui.structure.css create mode 100644 assets/jquery-ui/jquery-ui.structure.min.css create mode 100644 assets/jquery-ui/jquery-ui.theme.css create mode 100644 assets/jquery-ui/jquery-ui.theme.min.css diff --git a/assets/jquery-ui/images/ui-icons_444444_256x240.png b/assets/jquery-ui/images/ui-icons_444444_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..f6e5294b95001930031e2f8ec05079193a23e7d8 GIT binary patch literal 7126 zcmZu$cQ{<#_CBN6QG(H9Bs!z_(FsBjqC_2?=)E&KK}eJkL`je!I?;_9(R=TSUZVH% z^WA%&``qu|-#>fpea?QLbN0LT+WT4Wiq=q5B*de}0|0^tLzE$|> zDt&Jl%#}2s0e~+v03gEv;PUe}QJEq9_l@&%*N? z?nl_}%Fh(AH}Ju@g0P{>;B)|>PF9wedEq^?n`sxzr0DS@$U(du=U@ifVZ3uvQbuY| z$}>%6KoYN{*HM?KlnxwGBlhw@>(Z4Whx`hl-n zt$&t>Eiwc*2)qd>i~(veH^4U&R)w7z-5&-)a?TV39M4FDjqy=Sv+C((u6^W)hhijA zTJ-)@emF0IJ~~9|bsEA>>hj$5__#(Wc6XZhK~b`FS&$$pNUP`3n4$${HiT}enVPM` z<(H=(y~m2IG>X0KsWd{VPK_!OEK>m{hVVLKi-l=?`N%0RCX;vW!Z9kbc)C+&wP2)G zlk9>I-39g0Wpk)H3`zP&6{PFgsO1^Y3J}UnCvBhb%SB`#Kh3TqPn$vLf7PCSBZ28Q zE3iI4hn>$hdzr=+eu##6BC=m-TdDaH)hDNsak$hwC3mb3)QHU#$CCQ(?xPJkpC_Xt z+VQ2^moc-K{~CLPY(yFX0ouRVa3V^G7vH#c;_I10uYHLzmBj1tNdkF+>v=j>j$KyN zuCSo^RHIDqaBdy?jVCt3)wl0mX(Zk4DEuWuI)m-CGV0XRPX?reM zV}NTYn;hkrLWa`0M&$sP=fQHAb!1QhRzJf-2&K)TSDkeSnIB=QiVa2f5Gjp)oL*0m zCyp~$^ML*jV`Uj4vGbuX(N%G|9*X;SMK9lD{Fa!ayHrNqiQPFj#$%%SQ?(B zlwwu%2CR_H;)$;LR2q@bj%Eoe_1bo*F$|-Tnn{^p<26B^-4#RGueNKjAz160fW1+% z0mQ*hrlz1lm9eM|w&Gcz6v`)oG?;wpltLqN%6HRaj@UuWj}X$fy$JV76(U0R)UMm0 z5rRVpT6F>g!)pVX%KpdS|6);YftFfag^qUT7IlUDp4xdhN+-s8mS*=dNmB`vVS#dW zWv@ve^B6onQn5Ps4NJAeO3T5p!QDQmAolLq(nhx=nCHEUbd%^=JX!z`dyt2 ze($WoMK*!^2&(XrFOdRh8hcy}-;nI=F${?jVka7xLJ}=_BmTOXa;YDixpTW7)y{+> zH!oaNPiRpou3HVQRV|`fz3=Y#DP95#PyR|ezcqUz+lQLX7Cvku@1^OBK-`MzWGhL#KT^m^Z0W~ho|oSp_qD?vgkrYroexL`t7-=FA+-^_aCP^nUj z8|+Ba!2EOzb_E>h2{XU!G0l^GSqH>Ep;tDu(@_^vaz&+>3#X4<@!+_OpI|cW6@D!8 zZ4R(L(qIfSmevoqR9_k(g5LAYJMMsA6>#L~0U>1;n(@UsOL``WCPZaRl%P$f^Yg>* zV^Bjy_1*@hg)gxO5j3bs_Bfxs=p(}!y)wjdoHDlRShxCnJth4vXKka20?M2RsBLKq;E282r&`=`oU8sR2~J|T z=E;J@@QM0kX#I!t18u>At?7jyyI(Fy6xo4_hBHRZfZ72|Uuoj#P$FUVAKP&M95nCvM7`M7e;o#-EguM#vxe zZU1pk#J&Uim^lb51C;Ohx^i23v5dwRWN=V9Usi-fUWn!?a(xJ-k^PuZjM>BIl5+9e z*OF`>nTZU^;%$%{CufT#7D;%+_SaYK6Rzq#}gn~`W59R|9rmS zQQZo;pEvDuUzEj+9*gxDw-4l+ZK0{a(@de9N6cSc*WH%aMf5^o>l(=oH?%2%>Mrre zezA5h5wv>N5sD%u-#{n)h8fD+>bF&NueoGD3p#O_SNw+HqZom##E?=;Qf|C%Wl!6} zGgejw1`Bwdu`by`kzw)$7d~Pk?v4ds{rAL3~h-h+`zs9g6W4b&1bLV?D;#4 z*OZlkLlI7gJ4wzHZ2%ie5-bW{^9`#)J0Y)&`|)nuF3D%ARRIIOn9$oIFw`fJ{gUn> zt0o(Z8Sm9y1d)YP0Y|Wr3L49~3p6$(9P*^TQNwib(SA|HG0R2a!9{#xVJy*+w+x_3 z!s>a8_HE9K*K3l>O{`tYg=OE-D(OHSUER7QCe>W>!X9RJy7=SBg2dSfPp4ce9s)R1 z4BE;W0@-QVQ@%(&j3u6UyLOE1%-=?tR|DoW593P~^0SR)vGo9}jj{qBjNgJ^wZEs$ zG(Db@^$+<@v4?y5aMcGT4$75j34>*K-}-~N%kmFYevW$wTWy1uDxwbJ-Kf;rHY(wr z&?Ofu!2l#xOJ74`5qxH6Mdp+rJ>yw7!Jsf@QlE>)&(B6_@nG{Q1pWaJ}(58tqfRUwSozJ%$?8->OQ#XSRU1)flw^+V#y7|iZQ z2&YX1DENZf=-RiR_*MEFKL%1zciG}&z%6attU$}+ZvC8QQWBLXX(YM16XLS6@SqqZFjg?s%rr`_Q=iuLCPI zg^eLl)~UtbF-)varwfCoX*cbU0ebXS)=e}xJL*3|#v4S*1y32a7LlPqrnGn2OBkvx zxVIN;ev*7YYzbLBBqDhlZqsDirGKd#WlRnq1HLZ*ok>sWV-%=$2X+Q~w@l?mampVgGA^Jf_fYHH2}BgKIr zAmc|m$fi665A|T=)g{~wo}-<DNIK{nC@qvt+(B933+;e=3)eY;9da_$ zqG5=#=93>zAl?^Fpa;=0)YZst*5(3#WQ*Wh30Q(bpkh%nPEA4j1k0J`&nl<{`;9Z* z_oKk*`i{p$2U^TWE=Ov)BVHF3B2Sf+-os2SsEWCBVIErRQiJ_zCc==*L^k;!i*Y?X zdD-cK?UGzqTchv4?LeOB=bC3R@J_!g>%y=R8oG;(S3J7iz7Ubp3Y%(w+d}!wI^<>#w|}brcs_*lSeg87_GW zGBFY;Xqee|oXUnjNErVP0`lI~_7(r*KZImE54C*p@Z5CAlO*yvXNIEnr8qgR3d&Wt zb<0~grs2OQXIlExVjpFgho6_`qthZ-#4;Cz29jV}uT|dt!48(v3_ItL-r&h6_LZW7 ze$^vSALQIeUs})T2Rp7lcMC2`IBiE`@y78c;~ix+iyPec8Te(GCpwYQ+1iC^h-xxKmCE1sPkpO} z41!AJ=d(Rsgc_zgVN3ZU@?sb`caYo%8B}d-*;BLj_2kcH~RJ4J`L2|%~~!(a{7DM3WGno_AQ)a5N@cjwMkb&@whA`ml0M=hV>UYQBa zrw)R7`>`52G$P%T(){}FiEr+%cDil*$B!I6_Qo$DM={nH<`azVu@2V)5U=E*b!DCE zYBJKtSD0W(W5Nye=&kYs?On#UIhbt+V(~uUf>vxQG zsJY+bBD$|%!Wwp!R3&+fXWR;2;MwT&8&j;ot_|%4)niIV2p)Z z741tsCo(g!qV5X+qD7@J{`K-FA$A4Y5E^r8_Lo=w$$TYSd#4+px-N##Kq@6-c%g)P zui1l?X$C3Uo)C#9r`nOdyk_h_NqNE!Ub?1KHh}>0jXI=gpYpW!zY%Io|!R7!$tU>_4d>jHqiCbN@>s% z5RJYKc=Ppy+pc7_A<_K-H(cS;uQrp{aa{t-WOg=_^%1{Z6j9uW#-~5C-dQ1+!*le< z0!#se*}5#V;z13Gm@_A%&%dw)v%D10JK1n~*BN#blZJ<<7rVD-_BIjBwt5D0rZ#!k3gy~ zvr$@1mrZ^CUAH4aIfT<0EE?c2GyMPoqK&q?A5@mHYg zTmXO^3dNNME?mIIaX9yVgHt9xUtTHCCK7%@HY0ka%~55onRPNl)E@ zFY{x%|GhU8G;38~Hc#9lnBuH#bW62nqfq3|z%yyesXh`*7SMOUAc275oil6$yTe~g zG(w$28tUQ+Jzs%&$d_L<7yfwUwKXf!UK1j=U!Orvi0^!73jmwka?#h7I zyN%qBC=@Qk8@Vr2S7LZ($=!*VRzy));)%~jRaDtCYjK$Nq4~AJMQJ0K?K*@Y#VL-P zfmxc9^t~JzPGAKd`|#kI@j&<&bpoYtAc|o09=DRVVZK!A0E_sztIBTmA+PhR=jA>p zWv#R50k# zOWPK1T3n?OXyO}aCRlb8u@jZDlCCKf1bfinb$p3*vI=;tO6~;g8I=cij zYfpvdZyL~c^-VviYtM*98n*W0wPt9NlhwGugaiewJcvM*7F1>X< zo(ID%2bXn`H*zYz?9bTIdVkB)Vk8oKINE4Ax^V+r%-$4azyNOFuDejYf8rHi-e;n; zyftzc3~_ZdJ38~A?=G|E|L45qWkOkMa4Dhvzoqv75U}5BV@<2A(|Oh_Vs_7<4t~Ef zqN<0@n{Q~)qHUEs&VP_?N}(B3Yn78V2J8t8t>=~E=lM4f=Gg=9y<*F9OBUrq8-du+ zx52++X*S#BBI%)4p}3>L+z8<>`>fF`#5~4Oa?u*maNpfYW@&n+94S7lbE}J6u52P! zH)B-Us02HT8$<9P`u~6Y)L-R+sd}`bQ+(MbBqwk(IW232o3`uMJX@>;W`MKHQXm6{ zt%u609b0e5Wvt!E81PYe2hGhgZ4>npSAIB?^bDVk&XeTy&b8#qbh#sVuWo3wSrWKH zbo4A0rfbj;f@f^l!e_g@S7%h4MS7U-0zI9h5o4AJad;Qd)eJh7SGBkd-T zcmwpiDfoo0DYB2Z6kb|zZk0fkXxYL}^zkMDX-A~-@bpnePkGBX-1X;p?Z*_vWz+$$ zHOdzULB4^h3)juR0UVqxY^{9$7r-n0 zPr$Bt)suSw>%YI?ZtGy_=5FfX{4WeI7q7qz9#JttelY=|e_|YPJQ?pXRDWT#oUGiv oOkFJj84D*fO9o{JQ)^32OH&IUm!Fn@72g151vU8+SwzVH0Uy&s*Z=?k literal 0 HcmV?d00001 diff --git a/assets/jquery-ui/images/ui-icons_555555_256x240.png b/assets/jquery-ui/images/ui-icons_555555_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..dae06ac57d2a823bb3f463c307e330a4c54bb986 GIT binary patch literal 7110 zcmZu$byQU0wm&n(&^dr0-H3Ea2@=vR-3a-4-hFS~yWaihd}n{>{Jz+0@3r^-?brIcYNSLAL;wJgYN)Fi0s!dt71$@hy?v_Y z`6=EGtd8o2Isg#H4FK>M0JylFf^PyqpfCVz*#Uq|1_03co^B=Px0no;;$bD#|b&mDTlKjw*lsgJO0j|@y=6}?78CmP0 zBMu4g2zgN3Od}6CJ6y}`mIUVHcDsPJeHi{ums&uu5p|Z)=TpzDSF9pyVOK-RY`m>hZm>7nBX%aAjS)=Y zMC+~-Il=xc8AYCdUF)F()TjiXMdJyVBGHZ^W&M=H#lb1%qb$IZ$;;&N=g^&fT(<{U zO}nlo!cm_PusCBLKpM-V_B*==p-v`znY}4M8QJHtYlO6y7M47K-0{M$JV__BcXgU$B2j4+aT=`gysCv5#iTg_|ChvT>7f?PKFI+ z&GPWqR`u6Be2u1%yTWG!pFPNhH?iKLEiw&D`^1m_?bQEri5#&_5)!6PQ2F6+TYiDu z8~-iUJuNO0QAmLVWYYN2Nd^vYqa1FG-OuCZGYA2{`oPC6dC&8ttcSwI4m@g;Q_r}3 z2#wiy%?$y|1Dsg!<_d(2X4NoeG=JOoyRBXFcf{K6JN0b|JHdiX#R4wLDP{-0n`Mec zi|4s@Z(CEMm;?3;45;1js{UPN)pmqvehvwqv`*>MLd1@;N|ofM{lMOdYb43v<`fPH z3G*zlnlj&^5B8Wvu>~68G!|Oc;cF-5YyCNq;q4!6!FRFF(c-Nen#KD=@2T7MtEVY& zte&SoC^%ii$#{zIS-O@q?*vXmVD7O?W2B?dM1>rFFWE1FITV|=aYn2=1}IGkf6G0( zD7?w&xprw9_tzABmrM`-s_Vb4-tB=Lh~a<5WT{y0ABGS}v%)^Cvk2cx{Nv>E^vUDq z`68$&nDg!@tJzl5GWdLfg++Z%^CbNHq-SxWNBUbPG+%1Og=j7RZ^ev3uKan%r}LfY zk7LjH%a7lJn`&pRls7SZCOA#uwf-|6Ger)rT$RU)$MwZ@lA8mTT~@Q7XX@?#O2##r zk5BpMYxV7R&gJ<_#U4FPd{pHgoikfsCFj97dEKqAIsHZW7vGm?hm2}mp9*-siq$v9 zjIzyy^2i^~~@83MZs9DkfYgm&D?uYk3Aa5Yis$7+HY@t>b#$4k)H#>s2VTa29n zr!T6+={qKwakWqN9FQA8{d=(m(&DS(bE^-v5Mg7uT%-uiLXNZ%rH*@?YEAZw&siv4 zMI%BJe=<%Jt&&B2BTRX5-+aSbO0_aPTiVzykkXzR?{9ZdnN6VdZ13U)w^wlhlI5u* z0*80$3MbCZQcs&f`X62f-&u+byew;t3_Q^JOinPZl$;^Z{B2>` z;ZuV|^&j*?Iq|UF_|&umh4(QGOoIW&+vJ1=7>4)S;F_UOK3T zua!KS!qnPUe;K*ehP<2!mL%sA1^2({JcRVCLB8+|n?8go77v!yN6HWz{l-(RyKH({ zy0Y?#yq|#e9#NUkR8R`sdfFm5fFy=lWlp&tfuv{+ePbM)9G+Bw=ILg$lNf%F#7UAl z>z~z1H2x$HkFQ_YW$sKEqE+-Vv@gH#q!Sc?xWfitk_i#-+C8H zOjoA8XV(qedil4CN+wh#vQjun9oq4<0_z70TQg|`@nUF`jjMiej|6e1YCL?W*{rC) z2>~zdA|v}f^*Ec8_SM-Cbat{n-A+N~r=0P1;$G>$`%woLQO4LWwy*8Q2t-Cea$#@n zWu<=xk7Oq-P2h!i-uoA0y~70_D&{Axd7*J5+PfT)PTEx3s;mN6_U-ZVDfQD#vJk(L zjFDqACw}kMZN5IShZ&fvsoV6W*Yg$l`^8^CkB?8-WBBUYtjX4&ymgkAdUyCrY=O40l`RkVhpQ$*PHPI2W(CXoW1aD7_A!GKnFjwKv1ZE}1%&pQQd()U2x5i44k|zC zSmf-^M&(iXoAAN~N2@{b3Q9&yuG80xv~+K2S=%Dwuw+Mnn^(mIQ!iSq1tSE}g3el? z&vn#W)RR-U$DiyO=o_*+$z8RT^Dh5x&^!~MW*x`XF0RJXRwYZn2Kx_r$luwNY)jN? z$4E0e=K2N!LK|HP9t1u_a602zduYmicgPPak(f*%^bI6g0GCT=VHgs3!08i(*mqYx z>08#jT3(h^-geG=PmtVaU!czxThvCh$XW=^Sg|Wt>%XUO`)(%W{uL}ylw7tU4!&{M z?>rqpvk@X*wt}O2Z;khZ_|3xpqXWNss;RnvtP1VyHxIG@GDu8wB1Z|EOTOl`6`Q~D z6?HzgXBMJh{iIlhNg5q^LF*r!D^encr49z~**~Vg5#O)fZ;g{)pJ*Re9mk#?$Yp}d zwK|aNBP)17PLKZ|3Oc}zo41~swE$pT_w~vEYExUv{1Ks^E7S+yzVR2PkAi67^fKFg zB%n~8r;}dAK|+M}6o^%?mmUTfmbFk+GqC)qJw`Bp3VRN=vC~;G9rs?r%lry~4=%ro z$QcaLWJ9d+k%5xL%FsANXU6lXu)$Bmg3L||VyNkuq5bF4kG?ZP(h_U6&L-?h?s~G# zBUw?<*vMAK#0`UZZMCSafqeFMgmtd%YSZPy)rh2_3@okByiZ!p-zqcQ^jbhlm5 zIMPzJ) zTq4tn+7VxVCjM3>c(cCeyhVxs>12MyzVSTvHNcG1!HWjV-9!CbWF6~tjC$BbCGc{#2P!2 z!1cjQ6BbtyDbO?o!Vt}1N$2lWD9R6Tv}EuV$(*{MfYm}pOxNDmEne?tZ=S5}`_EF@ zCK@)I7wpMqUH`F++e0QLnVivHuiIqap3KoiQKe1jnTQDek1 zWE;p^GF09X?1|SHe4cly0#+Gjai4etC74d1F*iCn+ILe}DhZ)REbGX1Gwa|D`z0%D z(*%Sq|I(XevU=-%BP6(_X4NgWJ$m*aqd-|5B~EN1ZI>MJQp|HDIPI|TB0chZibRHb zQt?)h0jw}TMq%Li%_WP&8|U4U>?zB*twks4z`RDyw-((3)=!6*1fC;Eb$#9h!b(X* z2IXWM-nm{>lAVduVdMo@!>u|`>k2;B9npVcG%pccBI&E!%34KdKhfkVw3zTpHmaDt zdeub(R{(yj2mrNag9Q6AwOJ2G81>vHi)Fsp`>#J2Bd>}bIlO!x`I|3c&?R$2*yx2j zEJWmHz#GGYrCnI{B1#)*j_fvjYC);+4hR2SvRC|-kd|TB#_vN}M)irL`hLNCdmnox zu*4OVum}zN@k25@o=Ql^{5>|*Bxf&lY@?%1yyNx~H|v8r%Y&ZKLJiCa{T>s;(GvCN za0X-YBPN@HZ|6E~!-Lft`fntIQ#LP4Xa*44Fv)h|{u*g`g6DSPeosoE)H{Bow%Cxb zPxvb)=M_%jZ&FdKXyci}#2UoiP&LmV22QTLJpyklRcnUxS*0Y}pW7ISB(c$he!V{o z-e+@ZNF?8sx9r_D<{@M1G$uj~ovHrku*SMc^q32Yo2UCcewE!M? zcKS8#cYXaJGD?ZcYqZ`xn5uLh%xy>~@ieNRx2@!Pa=XNO`CB8R(#zWlm;{Yd~f6D zKQ$R~JMXKd!~=760h8eD&s!IB5rf!oI3`gU+80i{XCy{0c{`Bi^QBO6k*F|`=LVWffs9+-^*5x z2Pr0z8}~8ja-~U*+TQ3W8r7=Uc;1kr+Zds+Mh9S78(GOf?A+^2~an1)QtdSC-MT!X`gJ!Wk&U3y?2nI~np277- zWN7alS1WgeQ3rCLIQ1&anCZD-#dP|h%6P3t@f!M+Q~bxn3dKiI=z5#6(Md+Nn=%jV z!rpvZA(2q89eLiIGOP^ydL^4f$+*PG-yK29vSpQfD*hc)GSq0wR{$h9dQY0q3BNa{d@q>+o z+WF(zt4Cvky3b(7IJy{~&Wh&75uae14)))7#uj}aqrt9940RYsEa~`h@+FZ!U|{|{ ziaae3XBM}Lrq|GTY|zbsSR>BqYt;1rA{`%{NZbGq zZ-m>%-$*%rTec8|G*BJm)Wz3K_Xq}oq`26s*;o%FCh|rd&D(>qyfQ~d7ef16 zc9h{~9*bRBB_Xdd4YI|?@s2G`iXxQvz;Q0VK{C&XZj;Nm>$fqJ^PePyS{@Kvd)>LW z{1?r>^SjYwl>T&+bhT(PV#RMU(8_?|)ZP6BHmxOvsl|6R^R$$_3epfg2x`cY^()xb z%vP{02#>C&d!TwJe8^-eVwt(SZAd(U*q{Vgb@KDYcT$K7xE4;x&5LBP{hCnL)Fgjx zw1Pduz`0DBUUuN$?@4PfOmro-PmRsd9F};agJmB+6-Z0~#xU)@3_TB7Esvm+wLum2 zp}4qY8&QuhoiNaTNh#f@45PFTuQhhjPrz|bCpGj~zM`MrQh7JlpoXKq{hxwWr?$E6gx}9-p_`ztQWA+dmvrHu1>T;CZ3AC;z{kd7(%Wp5LD`o`jLXaIEg_ruZIHzI9raw3lJ$IQSX37jpGmH)p|?*HWY zlQ7^5L$m}-`HMqYzy>r$l_Q(Z^XTrkO?rHrmwS>Vdsx}3Wi^F6W#@}iku{;DNR=- zHXKwI=5xRww&gq)$}$rorJ1St#``lBm3p7yOW4ta?+$;k@k)4j_j^r)tNJx!p#haW z3ycXW6KcFvtWTp3Wg0nc;z?-R)P!mr_R0m2HhXa9-hd&dKJ z-}~BkTf{2Hj{rVw-oMZOBprDoCe-EYIjO+4o5j0oLM3IMtMs(ey?@a%_n{j!)oOlu zs3gzoS>d|=`_vD__qqyne4h7GBr zI2c{CSbPf{$h`@27N6}pM(1YXXn*p#XFIu4C420ZV{h4k2y?P=3arCc{iJKx zeE1^_8{297Ef)MvaPjG)C16F2`W7N@O2-iLia&GJ#!kU{zK9FXU<%OTROZ$|!znp7 zL}#RlLv#;<{Cu&&c>6i*S34*zhjT6LOd>x!SPs;p)Nt|UEGvP`N5T4;3mwnYCv81% zZr_5Vzm8R|mn1Wx?TYaqu}bqSH<`<7_VxU$%$l73aMGaS?Beu{Co;aT-=ktPmhsD7 zH2;!YO5id+`X#frlXxL;I?BqX7{J_{bQ=;Em45QzJN*LUQJ^(x(7GP;dwfAE^3>;<3W z3sgk95%kO5#LpDld_Ci47qZn!`d~fTOHOj&h2AjQRC{iD?sYEJry$^^J<%iey~nCl z%bF_GwCbtrsHAE2^zOnf-@P^05jYY2+FQ?djci5&1`mriH(L(oEi`=3f@fDzf1Ogs zvTPDot*liiao={Rg)vbsp>J+EBu9_urt%i_PXP*(U6qF1vT(a2_hKNnZ z!Y`~_9!B&)k%3FaM>^;HdF}eT%m#{{*UTiKG0xE-W_b2#^C(8@Z-wX*h-(6@q~pDt`eFtByhc6yqf)MAKpHd2Xlud&JV$Z0>(* zI}X@Sl1r*-5N``haK2U|GBv#>Z%Oty%5L}GhmXo-v;EJ1B;FL`J|SNJk#>(8V4Xp? zbP1l80_JxgBV3`hhwX^;t?#C@{|3NFN)$h50nR8L~1C|UZ zML{P$5z()9&~LLM0!ODA@%nMi*rtC=sZZrSTfoZ4c#uY6TdjLayB}wUkQE;@dYpFL zv`A2@odq`xZodWUUMH{hyIuUH2f04W2}jO=M1&>vk5AB7XaQC`iEDnPNi2+P6sLct zYv#*1^S}>@1lcQWiJDHx4M5uWYZ5Qy2=|6O<3*0<&P@Gn7YpDDP&Es1vJY^UarAS( z9RN{bQE>qgVF5AWCn8cZ!VhF59`Fkb%LohaI{Bgh4dCVNn?uaRsJWwmI*>Z?Z!5wWYcC|?#K$|_M(v>=49Y>G~Z=&LLt zT0)|Wwg|x@qDxpm`F`)*xp(fraNl$0JkL2ZuQ@Z%^UP^U*G=^q>3HY>0AMsg>R12( zc;*6IG|;nt!ocw8%m_InEldC)3OZ?FIFtAev3}NJvT#a9Ge>I932^V`sz<+9LVuJR1)Xl>k9o+)br%? zMCI0})Wj-$ciG~@zO(cIpp%il4v4msaNQkXceSB|BB890A_Ck9Zjpd zUpH>kJ5SZIQuQKBSF_W38;x?6d|P0FSEYL$ZjT4~j1+n=s+8bglfq6<6Bvl}398pR zEebt&pWo@##{!#+U^5hPGx1EULeVZ$CKJ_UcmP$HqBPh>rgcNO3S_Z3MdQ$Hh$-jS zWg`@VAo@JE2oex^^c@G&luTt${k+e$x=SYuSy^p{WGQo}f@6_*x_rz4PN?yuU`qD# ztT8X;JM^qhSajq4yOr>IzziB+52%WjC#gdwCJDx!mMSvs^W9j5!-f$&u%Y#SjhqfE80!*eOH_{ zf_6*iY3Z(TtngUmy@zVOS=^bOflV~Vpq2pvJq%9A-2deE*u&@X5w=s})A*}8AMnP- ze2#%V%dwi|dH`^K~Ccs5#p5Q3F1(n^?and+{GR#8zJLQh%W z2pCZ1cU|MR_uQvzW~_Ssi&URU6iF<2*O5)ttRj>|MBd?YT}opoWH#uXT(gg70mC6Q z$2@Un2QD(_%LAV%Uy)Ol{M`RsAz?hOnIAbJ5eN5Gp7DD*&(l=QxxSdCrb9Gi&Ol00 zQ%ECm5SB5OnUbkidi(98`6-uwW7BD(d+Jl7HuI>nns?^*>rc##Qr48EKgO`N;#=K2 zcYH>NfDEavg%KWyzx&piObJcRgS@>DFynqnekG9B>h>^mRt<=>+4h*-Rs3ZK2;|=T z`=cMj8SWk#Nert+uTqQT`E<-L1GiK!b98n%8p#g`OtN^(6Y{-WvolNw>nE_kF?xVE z=$D^kinq-M?m_dO`d7Gc!11(IZz^`qhkd6+-^OCn(418V+nqVFGV3#ZgdJN3<7`Tr zIxRsVEJMu2Oh%&@+)~cL}5Q zEQfRZ`J% zknSNLtiCknUdzZ_;s65#ccDGey(DqZ1Z_`Yn>DAbDV8P%9$MNuDPkl%@e{U91Rf5; zcCPAG@fbc1#K9GLOp0Dqp$IP&$wXo>DXoZ02D2DtU&%zxz_dFAlZ6GB%r@wvm!$85 zZCBnwp?S%^oJq6L2&5hofx>*z_>+4)!k%ol?XTC=vk>PZf=`(x<*CObdJM zg)=yej_HS>=~lF@?NdN3k4McR?%D~0eQWa`zD24-?eG?1b-U_Wp9!~vE?Vq z7ZIybzsbLSA#4E%0fY1tiu-W?yLVRvplFn=&|Wu1hK3}#B$P;V7dH^Og;VyoVvNz( z;m1HOW7S>?(}02tM@dHub>Y(X6rbtlU$GT;EG{~KhV@AZO+7bV%H4z%tiy;6S`k9M z^DWofpvsYYG(p0l#QG(AlIjZzV;T@`ORy*X5XMPvF0yrggGquTkm?h*PnVozi)Di8 z^qzm**_TRH-1}}yPo#)z0!%AE5MF+oW=qZ4tL?Im1e!(ogg9857;kLk6x z{IV?|gQ=F>r|9;{RHM%`=B%xNCr?(-{W9GcKN*35gLv2b|xsg`d~M+P&D z8hK*_C1KAP_jR&z=>svftM`MH#fHiaISwC87j3Z{H4A7aa4jPE6nu8I?{$QGgPH?` zOc9k;*@mXfB$>JJh4)O{O}Ct@&-8XzuN^7t|)WYbBZ9F-Tf9? zEQ26%!ic@G%o^#^cyet~GA;5&UXa(fD1!U;o>`4^$I4<0agHye@FE=-f!^m)0U^N$DAdSyq~-Kx*mg&ASWHl~-G_z6 zZo3pt>byfXX~DJ=0{HT?1=+k9~5V5w0GpxmQ%LY3{Q&)VuV6u<=q&(3X}e z;4eyZ49ym!py)rlI(_y+lIK!iyG;L%{b^|LEqdz}a27AP>#0e1<*2ozewiKdX8HHl zs0}KL5rtb`7dtWP(b$|$xNJrw{|)PnRq48I)r`bt;3xF)qt zpNvC0eZTJ{$^aWs`sYQ`z>YLOo!7fPU`gO=7Ns;TOdM_B6ONtA{ zEjGN}z0|2#w~Q-B=jm)71aX4$&EMA2cdLzrAKGPBk7+3EXnT_I8>`Z;Lkx{&aA98A zk30QA*E2vXqS&Hxv?N-+`}gS1JGt`?UXa&hh)J~h2hS=rXHruAhTk1v6?MDajp2|X z_!7}I_l4-Aoq2*8A?Z zKn1AbX$Ot|kK%oSwPBlk{xMwFDfwSGR^~K&?*2Yp{FT6!7|4+A=I-w9AJ2`eZ#S8v z6evr&IU~T+RIwbW=6FdTarDHCig4&bp7vq-JcagTy~O7X7@voOb>0&RKuk^ZehRM! zp<4elpJPF7GjbGp)NG&@m7a|vUFb7^l?BUrHq`%&k$2_Q0u- zS9D#V>{;c!YV^44Kb;6@~CBW*!G`kJl~9gKZu{~Z96%x z`As$9k({<|_1ha2X^xG$kO#|QoW2mcp(W7NGB19wo;8&RX6Y;coNK;D6G7F#6rf~g zb7dWdeIC2}w23#?$&a2Zm_>pS7v@noGM@<}p6|0dq$jMlbYmS~DX6TdjV@T`CFSXG z!4Fp>I9Z$s!u}=a-`M%jCVscoSD`|eOdN0SR8WyLN<44gJsQ3`1uvX@@aI;am}sO2 zs{gD8Ny^Y-Spo#_Z2552Z7oIb~6&IPbfLR7(TG1knHN7lBx#?vUC=BiP zMXda-uwyJ>_@}CbMeqX4Safg#^p5y?vi`CqraEU zcF*^5;)17sDAS0x@kmbkwW65WkZeJ?w1ZKjsMCDIr~2t9X>8Z+u$^M93tslN-1sM~ zAj-(rYwDy&AOhrtPH#0)n(7gP-1;@5$$)APA?i^~^Co>-1Z&v5D z*)BQyC-k$pLFzb{rliuc>Dt!T0Giz+Y^rhnm!M4i*tiXoLzKtQF#a6h*X!aT6_u5I z6cOsg$5Obo!A!rq4*jDyzRI3hUx8-cmpgfE8nsxC!Ybb0Sh=_wQ->mc=MM*NgEaw` ziN!XtgM&ZU{6#g)+>iFy8YTHF^CvahJyH&ro}%I=1%wC2>`~BN<4WxtEeCn>T#AWH zoW{aYky?lU@^^Y%bT+PW6R7j>VjzQk!PCMnVm4H5OF-UHA%>TR1{mDGrP5zZY}7sBoyEJ zc(3JgaOQiiuW73!WY8ZcbAx0Uk}2|M`@eAES}}iu(Gz{8-6+yOxo!GRL+_1@br%Uq=>-_36omCCb4CDmr)ADiP5Ko`LC6j-t4zSLVDiJl2#%Qqv$L1@ zC5)~u#>Elis^T2rdS(DwxU9US3|vwUZY86r0#{N|P`Uz#tH9x#E&;3m3-IxC@pKFQ zzkrP5zrcoSjouj``rj*HJbhdPF^)d||Ha5i%E(*6l~okvROGMz%lOa)UpQm9|1g$* rZkQ0q09QcM#m~uA$iT0I&ikG3zIX1u|Mc$N{jG0zud2PPYE_)JrV;@jH68!}1S-n%x&Q!rxCM@IFdnW7 z`R>vW1EZC)t_A@3vjaeABmi7LJPO?c052#2>{tMRSQY?)U2|J>o44g+6R$mdwLCn33p7osS!%|GH7LlUUG7LQ>G#DU~I>gIg) z>~IP}SbS{9KSb?`^&ATy0uaQ20V*fi*@&SZZ#wZqV}-anRMX{QQ)tjjRTm&Re*Qr4|}%QX#{mbDCauK4vRc!O98tH zu861d=QG_0rMxC$;%dAKQesNoD!raha;a75tP1M0VT4R%WlHiHn%bPfqy3)4jS}J& z**;SlPBwpJfBHWxvxTQeQ%}V3drX5{utXQ`^f8)|Z`~g?n99WQjnvLrp;#zO-+rRO zO6&U{p90$h?HBh```JGRT@3>rJ%W2TMGnArH`u?H66?5L} zyoS@60n~&D(rH&;kex^yAV~Z7{Qq(h8r_92-Lp3IK!?fE@l}r+RFt z)c2u$F(lya<(qMlM*7Yj2{=a{%fKQ<(x8paLX7q7>adZ=M`M8q-(>ikIl z?YT2g6Gw0Wpm#8+)z~Y{k~pT>u7p-A5xVoTr%Vq5BeZfU;6(z($juMJ-!3B!93uF& zW=Ts6AKBNvcC_kpB(fmoHMvjEcuva}WC{N(ECNoO?%VQ%&ht)~%8c%h>tz(|KOc<= zTRuV?`TzeZ`GiJJk!~3(#172~5DdlL~V$Q}?%d(|?v#Cp6{puEW%cmL|O>bJnqvzo{cm zC@IB_8a>ftp!$~d#lO&D{0E{Rr6amv9@Xy)%$cgpaUK6x%Ri8qDjdT;q>GK+Ds>dx z`338hVBy5d3{tUG@(US1NLfg+xhVi{0Qx5PSG}XCPdO;Pd`6vSikD7&RF6I6n!lcF zN;+$R4YojQztFi|_}iK5;9L{K^KEl;^vLF7C6?!~-Dbm7gIf2Hs>N>Dj*|w&apZkt zbaRtlqto|ECt|O<&o!IUnaT4}trDBggxeF;5zGz|wDS!$ZBAzjw5psrZ!2oFmI5ZNv<&$ChU)iv;j!}1w~kDwAi`! zwU7h?uQt#yPcAFJ9a7BB(li?px_zaheoou*!F{9kdp$z5VBp<@JL082ffldi2-rR? z14{YW3M`a!Lq5ahh^;?smeq#s$u*_oc&0My@iR<&CzvxeI&Z)3 zJZm+$-$1y$yX>(>rV48`t>gDD>ozf?o)OPqIhY7ijv~vw3$zj6|8|n~9^pzm7*VL? zgtY-p+qD``b4KFI@P8M!a>8FnAS0lH9Gkog8sq{xEK;VVOmC^W^u3G=EF(1mIJz+~ zSU$cnaqwBcaqFo9qdHi1BH*I1DukKf_rwpasxnc1a6rKc^#F-HJ5bwt!OS1jG-Ts1 zOLA84G%E0ItDtT`=1TzD)6uiE{+% ztzceIKQyX=rb8=il++pQASM9WYqTMNk){a?jthf*8Ou9baG~ z4efI4c5-cUS50{-h!To?&SZ?AVY9-0x_#cpk96cYZb~d^`rtL${GlX+8S3y0b(hs* ze)>pap5pPrFI09xsypW_CFu#V7TTr&8^(}XA7RNwifa-3wqx2BWdMPALi|@HqZO5~ zsOmwJ&;5DBQ3b0OxGlMI`Ugl4`D=-8iP1y8Dw{Aji##g&<;VuC@nKgt_DZR%F>elU zGUjqW6RI&bggih2x@;p0)KG5YU>vSi)BDyd&56dex_#bK7;C=zbh(imNMpC)|FYf~ z8#SoH4DD^3j0kgHoohN1FX-Z%q_V|6!jl|qQUo+XNAKdr6J_7A?RR7|M?>+Y&3>T& zqzEUS^f?8+evX^F)*CpRimJH`fD8Q)lH0S%&%j_zVUhhLo2(o}-XWu`V38crOwUv< z9i-sAT61byg2M6B#PvQ;~%EU`-QMyAyr ztr%s3pYHiF-ZAh}67Mq8Q(j$!7qU~TJ= z_E50V*yWcq`!?yibHLSj@Upi#v4rf*IDZ9tBvSWLvLn%awoQWx(4z$*-MRCXct~CF;Z={G_Fv#vx*a4UddUS%h=}Yi)By4sS3S$iTGNLfaPx%G6Ij}v*5qG;Zu)3HEcIwza{~~Q0$@T+t&eB%nA{*Baw%3g70Vn?BWfU(-mKMF>PM1xoqXMR4-ZJqC8r5haeI z3V2Be^soG?!)}>RreGPv7NiGErPcFGA3#76b&P|(M3 z9eif}`l2>GO^6%zmLSnv+QuHAqH$-Pt()X82qeWy>&|Ksd3#j*NIDc$&HA+!Bt~ly z&I^?hzHiq|;B`&h740|EJ}9`96c4p+9@lPFJAOUNU$7~u127|%X6p-aBKHRND>wuE zed`O3^xCquj^EI~PALw5Bl^>_7*9;XZMS3xm$$d^9-Mh3$Gc+eZ5K#8IKsqg@ez}U z4myJ9q-r=8SM}FL4Rl!dQLC5s>Uy;*OTEVV;WmRy6kC+afOuG52R%kWxjazC&Q~1UPK1oYY&?;; z%Yk^rL+W&3?0W?QlH!6}T~Bl`1k32R#M^RRPIm)y7W>&{IA{N;6do2BaD?z*&)oiz z9^L@>Yioo%!D^H9@>S|r^ebMvm2H|gx3AF2pMd$>nsw<%JvvnNO$r#d(H=(sm zc#|U&=KLBFXr{xL!juhEaBd&2$ql-SGc2*(@-U=trDLY0>dSgT!{BV{|V%?mi2U7N7V$;^n#|F8(!)mlI!EnPrk*9AYb2c_u*YF#mg zSPh!e`AgebBZ8>&;zD-_mb{%;Kvmeu?sPs!ptzPFtVG9p?5A$0nuWDKSG6LF%F3C% zmX1^vkV0NBy-lfMo=&(49;%N_r*|=F0Qv=%6Wk@qbF(v+S-F>zSYMbN6h3aP)=B*s zHY0s6AW1TO1K)gnt4{KoD4lzAwWTbg#DQDOH$w(nRsHS{34snK$r0K)nzAQObfBf&>c9|1PXmzAptsHG8c;PDmB`a$o!=v~cj!OL$XHGfwAQT^H5+)TW<*Us$nE49&qpG|Wy_`g+?+Crgt%$Vndo5SZxFt|M|8!;+T3OGT9SQ~Po^vT6lxg* z&@XgfaRz$%2Sp!pOv-AV=oe>wdR)Q+iJ6;N?%N46{HiPj|5oHeXjP_SGpHgDh&9(ZS85OARD!v$cH4%RY`!6X6+1!5qFUV=trov zXc3I(k8&-9pIljQ7dA6+TE$oHeb$xtZ%|o&`NL@NBod{N7nmSSd3uDn#Rx4pQp7wL z(TkK8e-q+n?DOhU&&te$ZasuP%Qn%i=RE}`4-$xpBWqR2nh(PE%(ldCZOTv+$YJtx zvG{Sv_oV~|_0iXuvFa}*$ZI<9s;v#7e*6*%MC$fOAA+4O-(H zMAHe~L*A6_;NtV0);f^j-V}vdC<*n0vcJzUKgQ@s&MkwydqWhEU1(4IaC|fDigkWa z7p&vw_BN|}REQ=-B;hxO1~iA7$KB`Dn7Bc*(O<>2$n38;deP75(}x;Cac8AOGt&$xVR`cSF*z08s3-%g3hq9k3+~kj1BXTz z`LzHU`Kk8(zJI-Ax4Dq`U~KgIvfP(k+;y-UZSD zUUpzSCeu%X>-6Z)&(nvDi%8u`TJ-5FSyqG8+}0s)S7&6Wx0p(FJ(8Fc%nO?rMt@>3 z+TS}==_iHhNSD(4Ck*WUUde(vB7bbJ;0T@{k^u zD0SfF@%@LRa-6xiPrcH0JluY&U|&U>&ug|NLOm zz=L_5N!BW3z#gaE&l}l#`E~1DzU42tdg>X*zU{wI}xkkjjmjV4qs3DvxwC>0NcIj}b;R^I5g#qr43VnW_g-ZSPfVVpHX6YBuTG zv~oJP>raPcMA#nTmnhj#5T66a4lcNPA>J2U{Y_=9bOW?f+O&^|#%h9+zn()Js@7Z6 zJ@p{Z6|QfZBKQuLg0Rfz=JGgL1mu(nlSZ{y59j<4;ny{P=+C&>f`(y+Pv*o!TGKI2 zaA+jf1bup6w&;BnGCOBYWl~@TN-{`!ygj(;J;wEsoGYFp7PJTrBt}D1S6CVu0Omew z-OjmpYqxvOXO;2W=pmg_@pZEJuj=Ffm3${#Mr~IveAvW7v1r7#mO7yG1LatmW!!w| zsJNm@RPw|-%K@1KkhgosQw)3S&au(r5lfayLCk!BGTSqR8;bHJIESN@u|sBzus z5d>p3BgL72UM|9#X$zzEiXYCt z=J86c)H85TZEQlQlE`;KsWsVd`UPTn8hz0X!IaOt-mAMqstb4zC-Fk54FNEEbzU7=013+`|C}hkui3G;yW4Funy*>f zo%fOrAIj!#zlS^xcn)gQZMx~d%ughAl`?g<1V5Q6QrB`}cl&g#&S42swtE@stKE?9Z6!X)a1?3Sc3thl<@B6J1y?L?f=3 zGw%QLaDGsA9=3L7dq<}3btc*7-FeQ!;R(S+ezLIUHm7~7RUaK7h$Ifl_5%Nq-RtNH(dJ3LF z>3tGb-6Zq0Jr;A@zjde(SwCn~3PWsOrgyJKiTDC2nuf9>a+)SJeupPe(CVlcrFq@fAPwW2BBcPSQj;^0$Hh*xqg=c1ZVJqpT4me zqu1Tv%+wQB_mH;!e|6^1BEw>QAmuVRDi^)6C0o4k*KL7U8FuF?Z zf>MkuCe**eq_J2VzK->m-cf2Q7@$F)G8P_veDO$ZnzHnCJ&&=XboXL}5dy4QSTBjJ zD*CT|l1m}3`yRR70j{Qb;hQ1vhC>NYji;Th z-Gq#-2N@%N2VP%$yG-X~i^NR;&J;c4XVc3JIipKGme+8zM~{&=qS9K7CK#2~{qeO< zm>u>9dW6mgbB~dS0;7f~T9{!fX2&@Co|yQzcMbw)v4O&t=iU9&h0@(26^d~@_?#}2e2<*ulNAq_^%Z_-#XcNcv?ES z{)6G;;S+oT6%~6XASNjEAB+=@H}eCA>Tism%NtK0OLrSU#@gkz4Wo*arLB#wjit4p UTc6F}9XUWnK~ug;)*}4>09D~lQUCw| literal 0 HcmV?d00001 diff --git a/assets/jquery-ui/images/ui-icons_cc0000_256x240.png b/assets/jquery-ui/images/ui-icons_cc0000_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..555c694baabe597a746965af36968008da0eec75 GIT binary patch literal 4654 zcmeI0hcn#YyT?DDUA>n?uaRsJW%U-U-bs`Y5xaVe@@4h5N|Y2t5W-hBMVAoKS6QMH zL>HY9tQK9u`pNfu=gz%z|AqUWGv|5EnR(5bd7fuZOT1;QLrcX$1pol8p01`T0Du=R zutNd8=qL2_Pc96fgRZF&0EEB*022!Uzb>XQs{r5+2Y_`H04Qbx0IN?<{q36YgiS-9GRzZP^oADk%L z`I3@Qj_WL0dfao79ssmA(9r}ENV#<{2IOcxBQ5e(YC1|8vB6(a*#JQAp{J>49`tSV zKDEPCH6vNKZt+@XDrcQRw!Bv(%uiOl+xGsrzvoE4$C6?Z?j0fI{5+m!o;qIXW}9ig zE9a{R-8vXxYYA+CBJL(!h>;DAl_&vT^JN!eQz zTAKgp3EPV;O0P+JeXB~ckzkWmc4-{r{Pj}ETo{nekeWxYpO^vbbOs<8@dEYu>Bgzf8fZBgsXp|a@dJ+@ zS#JAHZX35lss`HfcfSZV>GJ{!d7oM{$r=>-66bXvusJP1W5%b~YMN;o-5ptQW72PeI*k=9^1gJJ0TJa_fnYgezU+)U&y+#l%cFSZ$h7@D@INt zu8V~*j493(O*K*5?4B%4IsO})HY2Tb&m!fSCv6p+Gxy(pp{EtIAT8b=!&C|HbnZRy z932AE#C8@(IBfs!*`PDV*EbAsc0WRodnbAqL7FOBLT)pvLc~pW$E;;>*KHw?(9aJ? z`@(2~P7Fkbm7~_k1#&!F7gm6KO4nK1TI~#^`*|iAJf!it?oOF$#sf7InBQn^zytKo z%`(PWWdfnloEJXt9a-Qw%JL8I_b!M0AVuBBpr4^w%a3;3vSK7QX1MTsRy2m0q!iWa zynGm%=&R|p2Cvz{F6Ai^#j*?b>Ij(u_D!X;67%H^cl>d{xB?Oj9~Vvr_dEyfP2?p&s|)r z9(Cg@njfIye8=~(GUXu-V|1w@e8QCDZ-$>+cRw;AaBUr*m6QvMx=C36&KfwnH$Mo+ zB+C3sb`!$a_t}Ra-F##iOic?dFWH+v=6^t_K>U1UD)aCXsfKgd3w0+@vAJ9Vh5|>V@?~bqsfhi zT*oNC;imw37f%vT7OTU=ZAb>G7Tz)ywk|C>48nRu_@-VNFK2H-@-|@ewd&z~-3yI3 zo1qF3+7$l$!SglC)C8s1B!(0q$_j5o*yhKIZY?pjeTRvHBan(SrZ3m*B?~12sI*`8 z?H!7x$Q}GJrk*E>tp|+DI`D74Of#iq9aObjL;wu}Tzo7H^|W_3v$Fl*Sxx>>OL_RJ zsL#PEa1HB-WysdZ5YgfiwXBAI_8#w2+Mx;cQ?;B&s*A_6FVwxdTGQxZyonYd~71lKolxj9tlkVZ7QZ;^5&iGXx9@F^nJC-TnC3`kED|jG?5kb)tsp$P< z-Vt4U#2$c=%&!uf2|{@e_F!ilBq@nXbqBtwH9e;1n z?MlkjsLKZ(^i@9&p0+ku-Kc-r17Q)VbsK&W2AMK7y14j6oIps*=OijJA8Q2af+qeaJA}VmpSo<|CeNkb)u<53U zi@ORLRqo6=SM0dm3&8+~%6N(-2Kv37nr(vTv`~ z|5h4kJ}HIyq_etuqtvlo$5n>c|yTh#<#hRE{v+4Z+SVP`#ai%$@3Ai@z zl>J)p$=(9q1pn-GPxnl^y9b}|lOTf8EE~w(R8@+3UX5oh_W$&S5g|JN+tkZ>+5N04 z`lPt+b#Oh5W{94Sj*bShe&b#^mwuR7WLI2#x*v_ak{LHZA1$6gJV{2bCP@~COa^73 z`sb|_I@^VZJnO@jp+3=Uw@A5P+m&TCxb6QwUiuZ!mf%N|>Fna-;uFV?t!XiuBjqVc zygS3gQU89$PucF84&vmwI~o4il{oE5H#miIW4y-Y02p3|gVi1r@j!HC!(lR~D!xKz zkjpNwszG;D_oP8jIWjd9Nx0H;`)vj+>*Y}IOIpsEGtB1F>S&3;Rk6cMmTP+%65mkO zev%iJ^M*A)C~%*^JHoK{ncyksj<5l2DqEAk6#ibS&X!@@67t_3Z6&NHy`8P16|qY+ zIZkfRV$7Zjt`<2#9*Vo(w}TOLS`!!5~fgl0#rtn_d>Abg)|2KCdiQ9X3go6 zOHJ{@1s}*gO!Vn5eG`Om%B7zM?2g&|?KDcOhv5RvDZ=f{y{he!SUZHz4tDMB*1f0d zak{Kl%{9B5@1NP#X+a*Xgs^%+sD_q7W3!yNgBr#Z4w#vj^eeW7N;L#o@3ODFiRFzA z80J;X{)>9f7<+GOwg3hZT5O1G{>VZ)Z2oeO`7t$qt+5kh_f|%6Re5yLEGIEXlMQ~n z7S76GkLUL(y8OY~XEx!7m5w4As%YYLYwtZ7LAA*3ZqUiF>=ZnI^3k7LeL{kPHmLHm z0+d?pDm{qRs8g5a z17V~v(879ZWp`Kiz?Ccp$myrVwp@8d1D9K(QwL^g3@HT*RM)jLc%`OS6rnJb^H-tL zkNjS{=j5eYcnnK93kbc3FLwai$2u`l+mNs(hu**_Miedr@y|i=CGK3If{?V|42d9e zZO)|G_H@(!%C$M*5<0cP{$Sr-%v%N@b;!M*iyXAz;l8t@s)s?~o?pHp)d7T8m~W47 z!;)!*a;Sd#@f-gf9xKsc|N3%Z++7Ps&U`ZLH5UiabA~ACJH&?H&MOP!|e{hEZ_rXeEvxGv+ zn1O+x>pp_2CN3ujOm(8%Wx128Ew0JO%P)|zlRW(WV>U?WzG0choyMaaX*RipWmZG} z$Ov^rx$>J6|1OtwVzvM(swt*l9kcoAv3kodQI^F|7^&N9&9dNv7`7?APWmQ6KQLY3&-Q=i%FROVc!TFU^tcjb{YesyJ8^tGJ;RWckG7N0z^k+?=Z( zparp{BoawoyZh^?ky?Jgx!M5%Sf7_TK-H*MA$fs&oQx8_r@Tpz^TSzY;!Q4I;@8kx zR%k~%w3DKPuhWGAB;k_Mq7raXDY&_WoFZIaQAYj-9Ign5Z#nv|{V%}N+tJNA`2PYD za{mIGN|o9dfZ%_xfOhkA@WDqyq(d3 ocD_!4nxnV96Q7=^or{yHlbvJmU)@d@pE>}br)8}9K^+zSA8AZS>;M1& literal 0 HcmV?d00001 diff --git a/assets/jquery-ui/images/ui-icons_ffffff_256x240.png b/assets/jquery-ui/images/ui-icons_ffffff_256x240.png new file mode 100644 index 0000000000000000000000000000000000000000..0de53bffa57a1660ecdb7b77def509e41efbd7f3 GIT binary patch literal 6523 zcmZu$XIK-_ww;7f0@9TtNK-+;K#*RfS80MEh(L+?_Bhxgw1zWeTbe`e2_`PQ7hXRq(h(r{R+>uUpmH#Y!af&k#;@)3pr0B&#qSTzFxsSg0a=$zW9Cv*7%Y@w;9 z3|xdn^|xM*NKqQvDx?GoDyXQy(20Kv05C~uC@UCvPHi9@A`o3q(C_GZ`M!Md`NZu~ z73(Jg;?!)>ymd9m>S~rf8geZjTYFRXdbV59ND*1LV@Z?T*JSst07ZR9JA`DkoOqK7 zV{U_-@uL)jJRye7GNN3G+?P|eO7%;+cIVMtzY^J(?PX_=C6=d~4mSs6vS(gzdD$-Y z_n)Rp+Rl2|=qQGgF*m6qFrmX-bR5pg;BEqDh}n&^jxGk^k}?KYT%{u>(Z&p$%H0_A zEz=(NyUI6e9}Tc;?sS=@wO|BMxGkavMNV3wuSlQ>MTcujrpE43#5ZcXjO3{X(W(pT!0iY zNEOiq3chs$zJ;m?$~I8fQi&@$>T#IWUPOO|A-RuP91}#T_!59Q$w7W z2HUKoyhgk29O_vfe9JRo_PLTsTi4?QBnsXWJbibM*vJVG2Te;hAnT9m9U^f%dj z=u9c!hW>P@kL~hfgcVmJ=x=5-8uR_gQIssUps%%qvoVlJO$0*x5AUEf5?mngzqvlY zsmExxF0ZcYxygFa_ptKJLtIn#y(*J6wEIbbfreWzK}Rwmxvw4w=vFKvPXbLo`Svol zsNgk~(ea~kp6}157Yb6Q%1LA^`Eq7%t2i6V?G#`nedmVdWewq`S+dO`rBq?NPc~RT zwaaV7K$&Vqf4bxFdSVq!t4Z8748t&iFd3{CZor1p6g9HO>CN zEMER6WiU#f>0tLoVySb(wjGE)>P0hZ&O5TPApNn)wfSn#s?A-2)~jgAiKnOY^(FoF z#7FyH5$`;TirfgsPq8g<9RcfJhElKT4pfJozHf%HBk>rlUYFv7MQAadB;9dMDen2k zCC!Gu>wI@OUu97})ytIqGySyTv;Zqetpk$UUve5D>XD2SCea08@75_e8hm|$EtJ95 zeT_FY=-YRexjvljlOr~Ef?i=_Uk=zWz=XEfUmok3@oZ+in1|PpjFQj zI!xW^bz8Y)jXh>HHU4@9{f1)tz_A43id2nPDTw0S5)?%Nl6`Be zyX}BxY1F?_({`Y1_RY!6m%WC~w1m~!fOTsB-!(|yQU21ol|MQQQ(Rxm+PMphMN~w= zCo&30qvZl1A7t5kwNz>jEs>uc*h{+o=vIC7fN=%|bbo=rh?C$0FW6FIk?hI~Fv;By}Rn9u*OlE6Mfbf7hPmfd5>I zBG^GwlpFrE@tJhk!9)kw$>_wftJ#s`Fy^o*Z}y-{h1!id-?}&*=NtvE$1!m^4v|J4 zeJ6BoG6~W&_dx59UpCcBw-)_0w&smC-GjF0hTR@1yHKaK9FLa0cyN^y|`o8~UPe(EQFNg&KbMK#d9R z2nqdR5s@LtVWIhNRQ;g=AuuEaZ$8|W!#rl7ifAk%g80k7O>(sgWUz0#CLoHcqCv#5 ziq3?uG!2Z+BunQ10{rvBLSIOoTJwYa-W6&|SxbaG*?a(%Du$dglfxDx{nEY1_(L;` zDrFqG)jys1b~ILXE628c{Mw?@>`mXafP^Bn+eF>o=7klgz_^n05^{-;TnQDm(XGl6 zm2-$LF4dQ$9CrcWTw#?}fNZ9n(U}Mvg;#c2=jMK2cB`H)ooM^kT5r!jP&M~}2D(t0?*a0B@K zhfZ(wO!yrsYoBm+N*L8hdz|y8#-KHws0R&Oi&VQWXLR$SE`Jh^>y^zA>1-H`Ju#e) zCd-_=qHMIw>>tjn10p82ae44D@CRlo_%n4mBhD`j)`tGf4&AJMzk3L~H-59H@0jr+ zkCwprorL0x!5y`^Un49HtKE31mi&&Gx7+kdf>9riWq8rku@^!<9p2}CcMzSn&QEU2 zYxqA&wQzmGpW(fNo-r9=K7+|p;^#k@kNPoU>w~tWY=n%?9ALYfpG^dmqbu&+}BYQ{<=Q{+?BK_pc@RC z-ui0-!fso!`0yQaw2^c|(FN-)DLxyBp4o4PVh?Cu5+6$J9c9h^%;9!D0I>dAJBcoU zlkl#U?tAxrC~02deSlPmW$V=yASpc?gtDWu-70)<^RGX=>`|iIrRZOV~E6_wd zm^kb;4>U<){>7y|%4JXTDS?^mF(H|&{&m&(koEi^dHO4^k59hS#FE}`{uv$DnUuHk zYOV{v=#@HFko~~>jY3&zvi-dcno^posoJE^PPDYcF#ENo&K%hrJfY?99Bd!MEqLX> z_Hp^Fo1N`Ce{AhJA7EiA&|HDMFXQwZ?K47xGX`#rGDw!}wvByk zBk`I&^IbJ^{KCp#;-jM3{59P#CiG-X02cO9TEatrz`X9eDr^p^GwXW9b0j9_d?UrU z&Ep3XqTgID{fo3x1reI!a6aY7TccdE?2;Y z$3gcg!GHK`KkWJS4-+jQjTe{LG6myxnu+&=^z#XZMYzPrA-7 zVWbN2hmY7sw9ww99-(997q9Zj3s;DqfLG+m|BP;YM&bNe(_!7;XXeW&Wj{Tw;SiBk z)E`WAGCEzKy6gC|pq_yLy+OVy1I}@@bkrKq>$Vkt{k~!*z37e5FO-mKx_g8% zqBEkgFeONgw$v6k5t+UCR^`Tc%x(tlFtd~rdsY<9Fi*{UyS3Co^ag{X_rfjT;L!B^ z2QYPx-9@=xoYpAtW6e`fAS=V;A{EyPV-Z%Psm`5B4O z(vv7|Cu8Xt-%HmE%f2P=*f%#AQ`~$u=GyQ=k9PR^lx~xq_(pzni6R43d5quZq;Bmk z55|j{_G3*Hfx)4K9vHbxo(9;J@xRedxQTTduDol7++oIV0VVS^W%Kbk(|%&xo^SB0r;`V!+{eC8^{M#Sc!N`=lDfo*{% z;sIK_^!Ss2x45`>^v@qJ?D}M_dFmw9#ykGX&`C(MtlQ&Bg;anz4k)Zfb{Q@U!8XyE zFhiw($OnPC=@)4@BtoXQL;by3BGUH5;Cmx9V@$DJGwpg8Oe4A252O}dG2uj=(Ux_W zuu8h*a>EpGhGIEwLOAf?b2ihjj?-;AUCC~*Dk@1|J2SlA&Ytv>rV{EJc}w7+3TVyb zc4p*;`$GYq_@8b&R)p&$?@sUF85UhFKdI%U&tF-qQRH7o@mUpyc_;O`BjQs03f1y! zn99sKhFxIW*_ilOb$gfyP= z)!uSJ4RUnPLzl$Lwiy`*+X$be94&vF(-%v-jD;$K*Il=ZXQ*ytpDL?RXZ{8uI~=}M zDCSw4e>@Rq(kMS#7~6VGb+4mdn9F&WvD!({1o`7i9B^NslMkB#_$<44O8|8dr{IFLmnw(Nl0L zkSV0{H%A}E;g_1uKh=)^-qB&g*$V1VEQ+@P^EM&cKzMzUyk@7r_z4N8$G)Ep0mKSthO;$2LN$IEXrN6(-U5Z>eYmQtL5f~wtXdFw zz6X6~QTR7~$DKtn$}=Ur_FcUA%V}Ll3lP0JBaa}N*dBypau|9SpQlE}-7w-r=^iUC zZ+WbPCUJg)&j5+Bj^CpPc$;oGl8^t5_ot z(0TG@Q7atXH*U!@eheW_{bH?9xyS|r}-5u1>7NN5_c+LiL z4(ah@$531CQnwFB3hJB6vlJf*er}cUW_j%rWa!LN+zM-RT|bF5dCvGGy*ws-B4@|q(I@+qPv(6gh*rHm`;h&45f=%BvOS-NgNWp- z$8RAl*jd-DPsF7F{1GR&S*nzk8^$HDDT{C+hokfmjpmb8?Rnfu;hs zb1MJrW)J>~W9sKJ1iMI|^{SmM9Q)RPW-mtSqm9003{s}I&K$>yUMy`8ZB!@A_|0#* z_A}cDH<4nq=sbch+!_e0wCgm9*%LjSw6beCJW(}`+0Qzc?^eYfU6p-vw#rUJ;!8mw z@+3cS0)1=pbUof@U3L3acjmCje@(Y`ftOhMfO?$)@69gH%b3-hc*lcTkQcd=`{?#} zCP~S~f|zr@l=R|^;&Y4R;=DvB!STgoZTUoTHsWV7N73`-d)h&KTO2s05=$-Jg#EI! zan|6NSwlagV}}(eQrFOsN`Ce1*u+SsGbqh5l)0Ak<&WK|tTQQHr>jY=3VSAFdAph0+(v_;$CR8#*!)ekKveDsD*%(@mzaIVnGU?Am zAngUsb%+&Mq`sQAkpmU-e3L4{8AY�{1}gZ2Yo=*H(4LFXd^AO-MJyxc6L@Vq*Np zxSagaZy@O1ZzIb7qFW4w-rq#}$JsMLBw#PqA-aUh_UBKb80*FI>o(06i>q=k;|05H zG5!jTccdpX*g~bI*xAc9&(=&(1ef+R^Y?AYbEfO1lsTRB0%X-6EKR>>MqL?`SR8L{ zPf%z%nHR>I;U|fXNL;D$ado}pPT`D7xtT?oE5&TdG*||SgRT@T7CQ8ql<9HzcqzJb z2;R=D;BR?)0_GwKxFBWj@!43KZ4$dYSh$T+F-BRLqpYPYk=B<6xCg%{0uzG6gy9B4 z;!zO}iPmrIZJ R-xCr*Lq$iqOwlahzW|Zy6<`1W literal 0 HcmV?d00001 diff --git a/assets/jquery-ui/jquery-ui.css b/assets/jquery-ui/jquery-ui.css new file mode 100644 index 00000000..8c64a07a --- /dev/null +++ b/assets/jquery-ui/jquery-ui.css @@ -0,0 +1,1285 @@ +/*! jQuery UI - v1.14.1 - 2024-11-14 +* https://jqueryui.com +* Includes: draggable.css, core.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit https://jqueryui.com/themeroller/?ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&fwDefault=normal&cornerRadius=3px&bgColorHeader=e9e9e9&bgTextureHeader=flat&borderColorHeader=dddddd&fcHeader=333333&iconColorHeader=444444&bgColorContent=ffffff&bgTextureContent=flat&borderColorContent=dddddd&fcContent=333333&iconColorContent=444444&bgColorDefault=f6f6f6&bgTextureDefault=flat&borderColorDefault=c5c5c5&fcDefault=454545&iconColorDefault=777777&bgColorHover=ededed&bgTextureHover=flat&borderColorHover=cccccc&fcHover=2b2b2b&iconColorHover=555555&bgColorActive=007fff&bgTextureActive=flat&borderColorActive=003eff&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=fffa90&bgTextureHighlight=flat&borderColorHighlight=dad55e&fcHighlight=777620&iconColorHighlight=777620&bgColorError=fddfdf&bgTextureError=flat&borderColorError=f1a899&fcError=5f3f3f&iconColorError=cc0000&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=666666&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=5px&offsetTopShadow=0px&offsetLeftShadow=0px&cornerRadiusShadow=8px +* Copyright OpenJS Foundation and other contributors; Licensed MIT */ + +.ui-draggable-handle { + touch-action: none; +} +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { + display: none; +} +.ui-helper-hidden-accessible { + border: 0; + clip: rect(0 0 0 0); + height: 1px; + margin: -1px; + overflow: hidden; + padding: 0; + position: absolute; + width: 1px; +} +.ui-helper-reset { + margin: 0; + padding: 0; + border: 0; + outline: 0; + line-height: 1.3; + text-decoration: none; + font-size: 100%; + list-style: none; +} +.ui-helper-clearfix:before, +.ui-helper-clearfix:after { + content: ""; + display: table; + border-collapse: collapse; +} +.ui-helper-clearfix:after { + clear: both; +} +.ui-helper-zfix { + width: 100%; + height: 100%; + top: 0; + left: 0; + position: absolute; + opacity: 0; +} + +.ui-front { + z-index: 100; +} + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { + cursor: default !important; + pointer-events: none; +} + + +/* Icons +----------------------------------*/ +.ui-icon { + display: inline-block; + vertical-align: middle; + margin-top: -.25em; + position: relative; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; +} + +.ui-widget-icon-block { + left: 50%; + margin-left: -8px; + display: block; +} + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; +} +.ui-resizable { + position: relative; +} +.ui-resizable-handle { + position: absolute; + font-size: 0.1px; + display: block; + touch-action: none; +} +.ui-resizable-disabled .ui-resizable-handle, +.ui-resizable-autohide .ui-resizable-handle { + display: none; +} +.ui-resizable-n { + cursor: n-resize; + height: 7px; + width: 100%; + top: -5px; + left: 0; +} +.ui-resizable-s { + cursor: s-resize; + height: 7px; + width: 100%; + bottom: -5px; + left: 0; +} +.ui-resizable-e { + cursor: e-resize; + width: 7px; + right: -5px; + top: 0; + height: 100%; +} +.ui-resizable-w { + cursor: w-resize; + width: 7px; + left: -5px; + top: 0; + height: 100%; +} +.ui-resizable-se { + cursor: se-resize; + width: 12px; + height: 12px; + right: 1px; + bottom: 1px; +} +.ui-resizable-sw { + cursor: sw-resize; + width: 9px; + height: 9px; + left: -5px; + bottom: -5px; +} +.ui-resizable-nw { + cursor: nw-resize; + width: 9px; + height: 9px; + left: -5px; + top: -5px; +} +.ui-resizable-ne { + cursor: ne-resize; + width: 9px; + height: 9px; + right: -5px; + top: -5px; +} +.ui-selectable { + touch-action: none; +} +.ui-selectable-helper { + position: absolute; + z-index: 100; + border: 1px dotted black; +} +.ui-sortable-handle { + touch-action: none; +} +.ui-accordion .ui-accordion-header { + display: block; + cursor: pointer; + position: relative; + margin: 2px 0 0 0; + padding: .5em .5em .5em .7em; + font-size: 100%; +} +.ui-accordion .ui-accordion-content { + padding: 1em 2.2em; + border-top: 0; + overflow: auto; +} +.ui-autocomplete { + position: absolute; + top: 0; + left: 0; + cursor: default; +} +.ui-menu { + list-style: none; + padding: 0; + margin: 0; + display: block; + outline: 0; +} +.ui-menu .ui-menu { + position: absolute; +} +.ui-menu .ui-menu-item { + margin: 0; + cursor: pointer; +} +.ui-menu .ui-menu-item-wrapper { + position: relative; + padding: 3px 1em 3px .4em; +} +.ui-menu .ui-menu-divider { + margin: 5px 0; + height: 0; + font-size: 0; + line-height: 0; + border-width: 1px 0 0 0; +} +.ui-menu .ui-state-focus, +.ui-menu .ui-state-active { + margin: -1px; +} + +/* icon support */ +.ui-menu-icons { + position: relative; +} +.ui-menu-icons .ui-menu-item-wrapper { + padding-left: 2em; +} + +/* left-aligned */ +.ui-menu .ui-icon { + position: absolute; + top: 0; + bottom: 0; + left: .2em; + margin: auto 0; +} + +/* right-aligned */ +.ui-menu .ui-menu-icon { + left: auto; + right: 0; +} +.ui-button { + padding: .4em 1em; + display: inline-block; + position: relative; + line-height: normal; + margin-right: .1em; + cursor: pointer; + vertical-align: middle; + text-align: center; + -webkit-user-select: none; + user-select: none; +} + +.ui-button, +.ui-button:link, +.ui-button:visited, +.ui-button:hover, +.ui-button:active { + text-decoration: none; +} + +/* to make room for the icon, a width needs to be set here */ +.ui-button-icon-only { + width: 2em; + box-sizing: border-box; + text-indent: -9999px; + white-space: nowrap; +} + +/* no icon support for input elements */ +input.ui-button.ui-button-icon-only { + text-indent: 0; +} + +/* button icon element(s) */ +.ui-button-icon-only .ui-icon { + position: absolute; + top: 50%; + left: 50%; + margin-top: -8px; + margin-left: -8px; +} + +.ui-button.ui-icon-notext .ui-icon { + padding: 0; + width: 2.1em; + height: 2.1em; + text-indent: -9999px; + white-space: nowrap; + +} + +input.ui-button.ui-icon-notext .ui-icon { + width: auto; + height: auto; + text-indent: 0; + white-space: normal; + padding: .4em 1em; +} + +/* workarounds */ +/* Support: Firefox 5 - 125+ */ +input.ui-button::-moz-focus-inner, +button.ui-button::-moz-focus-inner { + border: 0; + padding: 0; +} +.ui-controlgroup { + vertical-align: middle; + display: inline-block; +} +.ui-controlgroup > .ui-controlgroup-item { + float: left; + margin-left: 0; + margin-right: 0; +} +.ui-controlgroup > .ui-controlgroup-item:focus, +.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus { + z-index: 9999; +} +.ui-controlgroup-vertical > .ui-controlgroup-item { + display: block; + float: none; + width: 100%; + margin-top: 0; + margin-bottom: 0; + text-align: left; +} +.ui-controlgroup-vertical .ui-controlgroup-item { + box-sizing: border-box; +} +.ui-controlgroup .ui-controlgroup-label { + padding: .4em 1em; +} +.ui-controlgroup .ui-controlgroup-label span { + font-size: 80%; +} +.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item { + border-left: none; +} +.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item { + border-top: none; +} +.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content { + border-right: none; +} +.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content { + border-bottom: none; +} + +/* Spinner specific style fixes */ +.ui-controlgroup-vertical .ui-spinner-input { + width: calc( 100% - 2.4em ); +} +.ui-controlgroup-vertical .ui-spinner .ui-spinner-up { + border-top-style: solid; +} + +.ui-checkboxradio-label .ui-icon-background { + box-shadow: inset 1px 1px 1px #ccc; + border-radius: .12em; + border: none; +} +.ui-checkboxradio-radio-label .ui-icon-background { + width: 16px; + height: 16px; + border-radius: 1em; + overflow: visible; + border: none; +} +.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon, +.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon { + background-image: none; + width: 8px; + height: 8px; + border-width: 4px; + border-style: solid; +} +.ui-checkboxradio-disabled { + pointer-events: none; +} +.ui-datepicker { + width: 17em; + padding: .2em .2em 0; + display: none; +} +.ui-datepicker .ui-datepicker-header { + position: relative; + padding: .2em 0; +} +.ui-datepicker .ui-datepicker-prev, +.ui-datepicker .ui-datepicker-next { + position: absolute; + top: 2px; + width: 1.8em; + height: 1.8em; +} +.ui-datepicker .ui-datepicker-prev-hover, +.ui-datepicker .ui-datepicker-next-hover { + top: 1px; +} +.ui-datepicker .ui-datepicker-prev { + left: 2px; +} +.ui-datepicker .ui-datepicker-next { + right: 2px; +} +.ui-datepicker .ui-datepicker-prev-hover { + left: 1px; +} +.ui-datepicker .ui-datepicker-next-hover { + right: 1px; +} +.ui-datepicker .ui-datepicker-prev span, +.ui-datepicker .ui-datepicker-next span { + display: block; + position: absolute; + left: 50%; + margin-left: -8px; + top: 50%; + margin-top: -8px; +} +.ui-datepicker .ui-datepicker-title { + margin: 0 2.3em; + line-height: 1.8em; + text-align: center; +} +.ui-datepicker .ui-datepicker-title select { + font-size: 1em; + margin: 1px 0; +} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { + width: 45%; +} +.ui-datepicker table { + width: 100%; + font-size: .9em; + border-collapse: collapse; + margin: 0 0 .4em; +} +.ui-datepicker th { + padding: .7em .3em; + text-align: center; + font-weight: bold; + border: 0; +} +.ui-datepicker td { + border: 0; + padding: 1px; +} +.ui-datepicker td span, +.ui-datepicker td a { + display: block; + padding: .2em; + text-align: right; + text-decoration: none; +} +.ui-datepicker .ui-datepicker-buttonpane { + background-image: none; + margin: .7em 0 0 0; + padding: 0 .2em; + border-left: 0; + border-right: 0; + border-bottom: 0; +} +.ui-datepicker .ui-datepicker-buttonpane button { + float: right; + margin: .5em .2em .4em; + cursor: pointer; + padding: .2em .6em .3em .6em; + width: auto; + overflow: visible; +} +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { + float: left; +} + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { + width: auto; +} +.ui-datepicker-multi .ui-datepicker-group { + float: left; +} +.ui-datepicker-multi .ui-datepicker-group table { + width: 95%; + margin: 0 auto .4em; +} +.ui-datepicker-multi-2 .ui-datepicker-group { + width: 50%; +} +.ui-datepicker-multi-3 .ui-datepicker-group { + width: 33.3%; +} +.ui-datepicker-multi-4 .ui-datepicker-group { + width: 25%; +} +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { + border-left-width: 0; +} +.ui-datepicker-multi .ui-datepicker-buttonpane { + clear: left; +} +.ui-datepicker-row-break { + clear: both; + width: 100%; + font-size: 0; +} + +/* RTL support */ +.ui-datepicker-rtl { + direction: rtl; +} +.ui-datepicker-rtl .ui-datepicker-prev { + right: 2px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next { + left: 2px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-prev:hover { + right: 1px; + left: auto; +} +.ui-datepicker-rtl .ui-datepicker-next:hover { + left: 1px; + right: auto; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane { + clear: right; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button { + float: left; +} +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current, +.ui-datepicker-rtl .ui-datepicker-group { + float: right; +} +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header, +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { + border-right-width: 0; + border-left-width: 1px; +} + +/* Icons */ +.ui-datepicker .ui-icon { + display: block; + text-indent: -99999px; + overflow: hidden; + background-repeat: no-repeat; + left: .5em; + top: .3em; +} +.ui-dialog { + position: absolute; + top: 0; + left: 0; + padding: .2em; + outline: 0; +} +.ui-dialog .ui-dialog-titlebar { + padding: .4em 1em; + position: relative; +} +.ui-dialog .ui-dialog-title { + float: left; + margin: .1em 0; + white-space: nowrap; + width: 90%; + overflow: hidden; + text-overflow: ellipsis; +} +.ui-dialog .ui-dialog-titlebar-close { + position: absolute; + right: .3em; + top: 50%; + width: 20px; + margin: -10px 0 0 0; + padding: 1px; + height: 20px; +} +.ui-dialog .ui-dialog-content { + position: relative; + border: 0; + padding: .5em 1em; + background: none; + overflow: auto; +} +.ui-dialog .ui-dialog-buttonpane { + text-align: left; + border-width: 1px 0 0 0; + background-image: none; + margin-top: .5em; + padding: .3em 1em .5em .4em; +} +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { + float: right; +} +.ui-dialog .ui-dialog-buttonpane button { + margin: .5em .4em .5em 0; + cursor: pointer; +} +.ui-dialog .ui-resizable-n { + height: 2px; + top: 0; +} +.ui-dialog .ui-resizable-e { + width: 2px; + right: 0; +} +.ui-dialog .ui-resizable-s { + height: 2px; + bottom: 0; +} +.ui-dialog .ui-resizable-w { + width: 2px; + left: 0; +} +.ui-dialog .ui-resizable-se, +.ui-dialog .ui-resizable-sw, +.ui-dialog .ui-resizable-ne, +.ui-dialog .ui-resizable-nw { + width: 7px; + height: 7px; +} +.ui-dialog .ui-resizable-se { + right: 0; + bottom: 0; +} +.ui-dialog .ui-resizable-sw { + left: 0; + bottom: 0; +} +.ui-dialog .ui-resizable-ne { + right: 0; + top: 0; +} +.ui-dialog .ui-resizable-nw { + left: 0; + top: 0; +} +.ui-draggable .ui-dialog-titlebar { + cursor: move; +} +.ui-progressbar { + height: 2em; + text-align: left; + overflow: hidden; +} +.ui-progressbar .ui-progressbar-value { + margin: -1px; + height: 100%; +} +.ui-progressbar .ui-progressbar-overlay { + background: url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw=="); + height: 100%; + opacity: 0.25; +} +.ui-progressbar-indeterminate .ui-progressbar-value { + background-image: none; +} +.ui-selectmenu-menu { + padding: 0; + margin: 0; + position: absolute; + top: 0; + left: 0; + display: none; +} +.ui-selectmenu-menu .ui-menu { + overflow: auto; + overflow-x: hidden; + padding-bottom: 1px; +} +.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup { + font-size: 1em; + font-weight: bold; + line-height: 1.5; + padding: 2px 0.4em; + margin: 0.5em 0 0 0; + height: auto; + border: 0; +} +.ui-selectmenu-open { + display: block; +} +.ui-selectmenu-text { + display: block; + margin-right: 20px; + overflow: hidden; + text-overflow: ellipsis; +} +.ui-selectmenu-button.ui-button { + text-align: left; + white-space: nowrap; + width: 14em; +} +.ui-selectmenu-icon.ui-icon { + float: right; + margin-top: 0; +} +.ui-slider { + position: relative; + text-align: left; +} +.ui-slider .ui-slider-handle { + position: absolute; + z-index: 2; + width: 1.2em; + height: 1.2em; + cursor: pointer; + touch-action: none; +} +.ui-slider .ui-slider-range { + position: absolute; + z-index: 1; + font-size: .7em; + display: block; + border: 0; + background-position: 0 0; +} + +.ui-slider-horizontal { + height: .8em; +} +.ui-slider-horizontal .ui-slider-handle { + top: -.3em; + margin-left: -.6em; +} +.ui-slider-horizontal .ui-slider-range { + top: 0; + height: 100%; +} +.ui-slider-horizontal .ui-slider-range-min { + left: 0; +} +.ui-slider-horizontal .ui-slider-range-max { + right: 0; +} + +.ui-slider-vertical { + width: .8em; + height: 100px; +} +.ui-slider-vertical .ui-slider-handle { + left: -.3em; + margin-left: 0; + margin-bottom: -.6em; +} +.ui-slider-vertical .ui-slider-range { + left: 0; + width: 100%; +} +.ui-slider-vertical .ui-slider-range-min { + bottom: 0; +} +.ui-slider-vertical .ui-slider-range-max { + top: 0; +} +.ui-spinner { + position: relative; + display: inline-block; + overflow: hidden; + padding: 0; + vertical-align: middle; +} +.ui-spinner-input { + border: none; + background: none; + color: inherit; + padding: .222em 0; + margin: .2em 0; + vertical-align: middle; + margin-left: .4em; + margin-right: 2em; +} +.ui-spinner-button { + width: 1.6em; + height: 50%; + font-size: .5em; + padding: 0; + margin: 0; + text-align: center; + position: absolute; + cursor: default; + display: block; + overflow: hidden; + right: 0; +} +/* more specificity required here to override default borders */ +.ui-spinner a.ui-spinner-button { + border-top-style: none; + border-bottom-style: none; + border-right-style: none; +} +.ui-spinner-up { + top: 0; +} +.ui-spinner-down { + bottom: 0; +} +.ui-tabs { + position: relative;/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ + padding: .2em; +} +.ui-tabs .ui-tabs-nav { + margin: 0; + padding: .2em .2em 0; +} +.ui-tabs .ui-tabs-nav li { + list-style: none; + float: left; + position: relative; + top: 0; + margin: 1px .2em 0 0; + border-bottom-width: 0; + padding: 0; + white-space: nowrap; +} +.ui-tabs .ui-tabs-nav .ui-tabs-anchor { + float: left; + padding: .5em 1em; + text-decoration: none; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active { + margin-bottom: -1px; + padding-bottom: 1px; +} +.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor, +.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor, +.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor { + cursor: text; +} +.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor { + cursor: pointer; +} +.ui-tabs .ui-tabs-panel { + display: block; + border-width: 0; + padding: 1em 1.4em; + background: none; +} +.ui-tooltip { + padding: 8px; + position: absolute; + z-index: 9999; + max-width: 300px; +} +body .ui-tooltip { + border-width: 2px; +} + +/* Component containers +----------------------------------*/ +.ui-widget { + font-family: Arial,Helvetica,sans-serif; + font-size: 1em; +} +.ui-widget .ui-widget { + font-size: 1em; +} +.ui-widget input, +.ui-widget select, +.ui-widget textarea, +.ui-widget button { + font-family: Arial,Helvetica,sans-serif; + font-size: 1em; +} +.ui-widget.ui-widget-content { + border: 1px solid #c5c5c5; +} +.ui-widget-content { + border: 1px solid #dddddd; + background: #ffffff; + color: #333333; +} +.ui-widget-content a { + color: #333333; +} +.ui-widget-header { + border: 1px solid #dddddd; + background: #e9e9e9; + color: #333333; + font-weight: bold; +} +.ui-widget-header a { + color: #333333; +} + +/* Interaction states +----------------------------------*/ +.ui-state-default, +.ui-widget-content .ui-state-default, +.ui-widget-header .ui-state-default, +.ui-button, + +/* We use html here because we need a greater specificity to make sure disabled +works properly when clicked or hovered */ +html .ui-button.ui-state-disabled:hover, +html .ui-button.ui-state-disabled:active { + border: 1px solid #c5c5c5; + background: #f6f6f6; + font-weight: normal; + color: #454545; +} +.ui-state-default a, +.ui-state-default a:link, +.ui-state-default a:visited, +a.ui-button, +a:link.ui-button, +a:visited.ui-button, +.ui-button { + color: #454545; + text-decoration: none; +} +.ui-state-hover, +.ui-widget-content .ui-state-hover, +.ui-widget-header .ui-state-hover, +.ui-state-focus, +.ui-widget-content .ui-state-focus, +.ui-widget-header .ui-state-focus, +.ui-button:hover, +.ui-button:focus { + border: 1px solid #cccccc; + background: #ededed; + font-weight: normal; + color: #2b2b2b; +} +.ui-state-hover a, +.ui-state-hover a:hover, +.ui-state-hover a:link, +.ui-state-hover a:visited, +.ui-state-focus a, +.ui-state-focus a:hover, +.ui-state-focus a:link, +.ui-state-focus a:visited, +a.ui-button:hover, +a.ui-button:focus { + color: #2b2b2b; + text-decoration: none; +} + +.ui-visual-focus { + box-shadow: 0 0 3px 1px rgb(94, 158, 214); +} +.ui-state-active, +.ui-widget-content .ui-state-active, +.ui-widget-header .ui-state-active, +a.ui-button:active, +.ui-button:active, +.ui-button.ui-state-active:hover { + border: 1px solid #003eff; + background: #007fff; + font-weight: normal; + color: #ffffff; +} +.ui-icon-background, +.ui-state-active .ui-icon-background { + border: #003eff; + background-color: #ffffff; +} +.ui-state-active a, +.ui-state-active a:link, +.ui-state-active a:visited { + color: #ffffff; + text-decoration: none; +} + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, +.ui-widget-content .ui-state-highlight, +.ui-widget-header .ui-state-highlight { + border: 1px solid #dad55e; + background: #fffa90; + color: #777620; +} +.ui-state-checked { + border: 1px solid #dad55e; + background: #fffa90; +} +.ui-state-highlight a, +.ui-widget-content .ui-state-highlight a, +.ui-widget-header .ui-state-highlight a { + color: #777620; +} +.ui-state-error, +.ui-widget-content .ui-state-error, +.ui-widget-header .ui-state-error { + border: 1px solid #f1a899; + background: #fddfdf; + color: #5f3f3f; +} +.ui-state-error a, +.ui-widget-content .ui-state-error a, +.ui-widget-header .ui-state-error a { + color: #5f3f3f; +} +.ui-state-error-text, +.ui-widget-content .ui-state-error-text, +.ui-widget-header .ui-state-error-text { + color: #5f3f3f; +} +.ui-priority-primary, +.ui-widget-content .ui-priority-primary, +.ui-widget-header .ui-priority-primary { + font-weight: bold; +} +.ui-priority-secondary, +.ui-widget-content .ui-priority-secondary, +.ui-widget-header .ui-priority-secondary { + opacity: .7; + font-weight: normal; +} +.ui-state-disabled, +.ui-widget-content .ui-state-disabled, +.ui-widget-header .ui-state-disabled { + opacity: .35; + background-image: none; +} + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { + width: 16px; + height: 16px; +} +.ui-icon, +.ui-widget-content .ui-icon { + background-image: url("images/ui-icons_444444_256x240.png"); +} +.ui-widget-header .ui-icon { + background-image: url("images/ui-icons_444444_256x240.png"); +} +.ui-state-hover .ui-icon, +.ui-state-focus .ui-icon, +.ui-button:hover .ui-icon, +.ui-button:focus .ui-icon { + background-image: url("images/ui-icons_555555_256x240.png"); +} +.ui-state-active .ui-icon, +.ui-button:active .ui-icon { + background-image: url("images/ui-icons_ffffff_256x240.png"); +} +.ui-state-highlight .ui-icon, +.ui-button .ui-state-highlight.ui-icon { + background-image: url("images/ui-icons_777620_256x240.png"); +} +.ui-state-error .ui-icon, +.ui-state-error-text .ui-icon { + background-image: url("images/ui-icons_cc0000_256x240.png"); +} +.ui-button .ui-icon { + background-image: url("images/ui-icons_777777_256x240.png"); +} + +/* positioning */ +/* Three classes needed to override `.ui-button:hover .ui-icon` */ +.ui-icon-blank.ui-icon-blank.ui-icon-blank { + background-image: none; +} +.ui-icon-caret-1-n { background-position: 0 0; } +.ui-icon-caret-1-ne { background-position: -16px 0; } +.ui-icon-caret-1-e { background-position: -32px 0; } +.ui-icon-caret-1-se { background-position: -48px 0; } +.ui-icon-caret-1-s { background-position: -65px 0; } +.ui-icon-caret-1-sw { background-position: -80px 0; } +.ui-icon-caret-1-w { background-position: -96px 0; } +.ui-icon-caret-1-nw { background-position: -112px 0; } +.ui-icon-caret-2-n-s { background-position: -128px 0; } +.ui-icon-caret-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -65px -16px; } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -65px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 1px -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-on { background-position: -96px -144px; } +.ui-icon-radio-off { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-all, +.ui-corner-top, +.ui-corner-left, +.ui-corner-tl { + border-top-left-radius: 3px; +} +.ui-corner-all, +.ui-corner-top, +.ui-corner-right, +.ui-corner-tr { + border-top-right-radius: 3px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-left, +.ui-corner-bl { + border-bottom-left-radius: 3px; +} +.ui-corner-all, +.ui-corner-bottom, +.ui-corner-right, +.ui-corner-br { + border-bottom-right-radius: 3px; +} + +/* Overlays */ +.ui-widget-overlay { + background: #aaaaaa; + opacity: .3; +} +.ui-widget-shadow { + box-shadow: 0px 0px 5px #666666; +} diff --git a/assets/jquery-ui/jquery-ui.js b/assets/jquery-ui/jquery-ui.js new file mode 100644 index 00000000..258e16d6 --- /dev/null +++ b/assets/jquery-ui/jquery-ui.js @@ -0,0 +1,18812 @@ +// Import jQuery so it can be found. +import jQuery from 'jquery'; + +/*! jQuery UI - v1.14.1 - 2024-11-14 +* https://jqueryui.com +* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js +* Copyright OpenJS Foundation and other contributors; Licensed MIT */ + +( function( factory ) { + "use strict"; + + if ( typeof define === "function" && define.amd ) { + + // AMD. Register as an anonymous module. + define( [ "jquery" ], factory ); + } else { + + // Browser globals + factory( jQuery ); + } +} )( function( $ ) { +"use strict"; + +$.ui = $.ui || {}; + +var version = $.ui.version = "1.14.1"; + + +/*! + * jQuery UI Widget 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Widget +//>>group: Core +//>>description: Provides a factory for creating stateful widgets with a common API. +//>>docs: https://api.jqueryui.com/jQuery.widget/ +//>>demos: https://jqueryui.com/widget/ + + +var widgetUuid = 0; +var widgetHasOwnProperty = Array.prototype.hasOwnProperty; +var widgetSlice = Array.prototype.slice; + +$.cleanData = ( function( orig ) { + return function( elems ) { + var events, elem, i; + for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) { + + // Only trigger remove when necessary to save time + events = $._data( elem, "events" ); + if ( events && events.remove ) { + $( elem ).triggerHandler( "remove" ); + } + } + orig( elems ); + }; +} )( $.cleanData ); + +$.widget = function( name, base, prototype ) { + var existingConstructor, constructor, basePrototype; + + // ProxiedPrototype allows the provided prototype to remain unmodified + // so that it can be used as a mixin for multiple widgets (#8876) + var proxiedPrototype = {}; + + var namespace = name.split( "." )[ 0 ]; + name = name.split( "." )[ 1 ]; + if ( name === "__proto__" || name === "constructor" ) { + return $.error( "Invalid widget name: " + name ); + } + var fullName = namespace + "-" + name; + + if ( !prototype ) { + prototype = base; + base = $.Widget; + } + + if ( Array.isArray( prototype ) ) { + prototype = $.extend.apply( null, [ {} ].concat( prototype ) ); + } + + // Create selector for plugin + $.expr.pseudos[ fullName.toLowerCase() ] = function( elem ) { + return !!$.data( elem, fullName ); + }; + + $[ namespace ] = $[ namespace ] || {}; + existingConstructor = $[ namespace ][ name ]; + constructor = $[ namespace ][ name ] = function( options, element ) { + + // Allow instantiation without "new" keyword + if ( !this || !this._createWidget ) { + return new constructor( options, element ); + } + + // Allow instantiation without initializing for simple inheritance + // must use "new" keyword (the code above always passes args) + if ( arguments.length ) { + this._createWidget( options, element ); + } + }; + + // Extend with the existing constructor to carry over any static properties + $.extend( constructor, existingConstructor, { + version: prototype.version, + + // Copy the object used to create the prototype in case we need to + // redefine the widget later + _proto: $.extend( {}, prototype ), + + // Track widgets that inherit from this widget in case this widget is + // redefined after a widget inherits from it + _childConstructors: [] + } ); + + basePrototype = new base(); + + // We need to make the options hash a property directly on the new instance + // otherwise we'll modify the options hash on the prototype that we're + // inheriting from + basePrototype.options = $.widget.extend( {}, basePrototype.options ); + $.each( prototype, function( prop, value ) { + if ( typeof value !== "function" ) { + proxiedPrototype[ prop ] = value; + return; + } + proxiedPrototype[ prop ] = ( function() { + function _super() { + return base.prototype[ prop ].apply( this, arguments ); + } + + function _superApply( args ) { + return base.prototype[ prop ].apply( this, args ); + } + + return function() { + var __super = this._super; + var __superApply = this._superApply; + var returnValue; + + this._super = _super; + this._superApply = _superApply; + + returnValue = value.apply( this, arguments ); + + this._super = __super; + this._superApply = __superApply; + + return returnValue; + }; + } )(); + } ); + constructor.prototype = $.widget.extend( basePrototype, { + + // TODO: remove support for widgetEventPrefix + // always use the name + a colon as the prefix, e.g., draggable:start + // don't prefix for widgets that aren't DOM-based + widgetEventPrefix: existingConstructor ? ( basePrototype.widgetEventPrefix || name ) : name + }, proxiedPrototype, { + constructor: constructor, + namespace: namespace, + widgetName: name, + widgetFullName: fullName + } ); + + // If this widget is being redefined then we need to find all widgets that + // are inheriting from it and redefine all of them so that they inherit from + // the new version of this widget. We're essentially trying to replace one + // level in the prototype chain. + if ( existingConstructor ) { + $.each( existingConstructor._childConstructors, function( i, child ) { + var childPrototype = child.prototype; + + // Redefine the child widget using the same prototype that was + // originally used, but inherit from the new version of the base + $.widget( childPrototype.namespace + "." + childPrototype.widgetName, constructor, + child._proto ); + } ); + + // Remove the list of existing child constructors from the old constructor + // so the old child constructors can be garbage collected + delete existingConstructor._childConstructors; + } else { + base._childConstructors.push( constructor ); + } + + $.widget.bridge( name, constructor ); + + return constructor; +}; + +$.widget.extend = function( target ) { + var input = widgetSlice.call( arguments, 1 ); + var inputIndex = 0; + var inputLength = input.length; + var key; + var value; + + for ( ; inputIndex < inputLength; inputIndex++ ) { + for ( key in input[ inputIndex ] ) { + value = input[ inputIndex ][ key ]; + if ( widgetHasOwnProperty.call( input[ inputIndex ], key ) && value !== undefined ) { + + // Clone objects + if ( $.isPlainObject( value ) ) { + target[ key ] = $.isPlainObject( target[ key ] ) ? + $.widget.extend( {}, target[ key ], value ) : + + // Don't extend strings, arrays, etc. with objects + $.widget.extend( {}, value ); + + // Copy everything else by reference + } else { + target[ key ] = value; + } + } + } + } + return target; +}; + +$.widget.bridge = function( name, object ) { + var fullName = object.prototype.widgetFullName || name; + $.fn[ name ] = function( options ) { + var isMethodCall = typeof options === "string"; + var args = widgetSlice.call( arguments, 1 ); + var returnValue = this; + + if ( isMethodCall ) { + + // If this is an empty collection, we need to have the instance method + // return undefined instead of the jQuery instance + if ( !this.length && options === "instance" ) { + returnValue = undefined; + } else { + this.each( function() { + var methodValue; + var instance = $.data( this, fullName ); + + if ( options === "instance" ) { + returnValue = instance; + return false; + } + + if ( !instance ) { + return $.error( "cannot call methods on " + name + + " prior to initialization; " + + "attempted to call method '" + options + "'" ); + } + + if ( typeof instance[ options ] !== "function" || + options.charAt( 0 ) === "_" ) { + return $.error( "no such method '" + options + "' for " + name + + " widget instance" ); + } + + methodValue = instance[ options ].apply( instance, args ); + + if ( methodValue !== instance && methodValue !== undefined ) { + returnValue = methodValue && methodValue.jquery ? + returnValue.pushStack( methodValue.get() ) : + methodValue; + return false; + } + } ); + } + } else { + + // Allow multiple hashes to be passed on init + if ( args.length ) { + options = $.widget.extend.apply( null, [ options ].concat( args ) ); + } + + this.each( function() { + var instance = $.data( this, fullName ); + if ( instance ) { + instance.option( options || {} ); + if ( instance._init ) { + instance._init(); + } + } else { + $.data( this, fullName, new object( options, this ) ); + } + } ); + } + + return returnValue; + }; +}; + +$.Widget = function( /* options, element */ ) {}; +$.Widget._childConstructors = []; + +$.Widget.prototype = { + widgetName: "widget", + widgetEventPrefix: "", + defaultElement: "
        ", + + options: { + classes: {}, + disabled: false, + + // Callbacks + create: null + }, + + _createWidget: function( options, element ) { + element = $( element || this.defaultElement || this )[ 0 ]; + this.element = $( element ); + this.uuid = widgetUuid++; + this.eventNamespace = "." + this.widgetName + this.uuid; + + this.bindings = $(); + this.hoverable = $(); + this.focusable = $(); + this.classesElementLookup = {}; + + if ( element !== this ) { + $.data( element, this.widgetFullName, this ); + this._on( true, this.element, { + remove: function( event ) { + if ( event.target === element ) { + this.destroy(); + } + } + } ); + this.document = $( element.style ? + + // Element within the document + element.ownerDocument : + + // Element is window or document + element.document || element ); + this.window = $( this.document[ 0 ].defaultView || this.document[ 0 ].parentWindow ); + } + + this.options = $.widget.extend( {}, + this.options, + this._getCreateOptions(), + options ); + + this._create(); + + if ( this.options.disabled ) { + this._setOptionDisabled( this.options.disabled ); + } + + this._trigger( "create", null, this._getCreateEventData() ); + this._init(); + }, + + _getCreateOptions: function() { + return {}; + }, + + _getCreateEventData: $.noop, + + _create: $.noop, + + _init: $.noop, + + destroy: function() { + var that = this; + + this._destroy(); + $.each( this.classesElementLookup, function( key, value ) { + that._removeClass( value, key ); + } ); + + // We can probably remove the unbind calls in 2.0 + // all event bindings should go through this._on() + this.element + .off( this.eventNamespace ) + .removeData( this.widgetFullName ); + this.widget() + .off( this.eventNamespace ) + .removeAttr( "aria-disabled" ); + + // Clean up events and states + this.bindings.off( this.eventNamespace ); + }, + + _destroy: $.noop, + + widget: function() { + return this.element; + }, + + option: function( key, value ) { + var options = key; + var parts; + var curOption; + var i; + + if ( arguments.length === 0 ) { + + // Don't return a reference to the internal hash + return $.widget.extend( {}, this.options ); + } + + if ( typeof key === "string" ) { + + // Handle nested keys, e.g., "foo.bar" => { foo: { bar: ___ } } + options = {}; + parts = key.split( "." ); + key = parts.shift(); + if ( parts.length ) { + curOption = options[ key ] = $.widget.extend( {}, this.options[ key ] ); + for ( i = 0; i < parts.length - 1; i++ ) { + curOption[ parts[ i ] ] = curOption[ parts[ i ] ] || {}; + curOption = curOption[ parts[ i ] ]; + } + key = parts.pop(); + if ( arguments.length === 1 ) { + return curOption[ key ] === undefined ? null : curOption[ key ]; + } + curOption[ key ] = value; + } else { + if ( arguments.length === 1 ) { + return this.options[ key ] === undefined ? null : this.options[ key ]; + } + options[ key ] = value; + } + } + + this._setOptions( options ); + + return this; + }, + + _setOptions: function( options ) { + var key; + + for ( key in options ) { + this._setOption( key, options[ key ] ); + } + + return this; + }, + + _setOption: function( key, value ) { + if ( key === "classes" ) { + this._setOptionClasses( value ); + } + + this.options[ key ] = value; + + if ( key === "disabled" ) { + this._setOptionDisabled( value ); + } + + return this; + }, + + _setOptionClasses: function( value ) { + var classKey, elements, currentElements; + + for ( classKey in value ) { + currentElements = this.classesElementLookup[ classKey ]; + if ( value[ classKey ] === this.options.classes[ classKey ] || + !currentElements || + !currentElements.length ) { + continue; + } + + // We are doing this to create a new jQuery object because the _removeClass() call + // on the next line is going to destroy the reference to the current elements being + // tracked. We need to save a copy of this collection so that we can add the new classes + // below. + elements = $( currentElements.get() ); + this._removeClass( currentElements, classKey ); + + // We don't use _addClass() here, because that uses this.options.classes + // for generating the string of classes. We want to use the value passed in from + // _setOption(), this is the new value of the classes option which was passed to + // _setOption(). We pass this value directly to _classes(). + elements.addClass( this._classes( { + element: elements, + keys: classKey, + classes: value, + add: true + } ) ); + } + }, + + _setOptionDisabled: function( value ) { + this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, !!value ); + + // If the widget is becoming disabled, then nothing is interactive + if ( value ) { + this._removeClass( this.hoverable, null, "ui-state-hover" ); + this._removeClass( this.focusable, null, "ui-state-focus" ); + } + }, + + enable: function() { + return this._setOptions( { disabled: false } ); + }, + + disable: function() { + return this._setOptions( { disabled: true } ); + }, + + _classes: function( options ) { + var full = []; + var that = this; + + options = $.extend( { + element: this.element, + classes: this.options.classes || {} + }, options ); + + function bindRemoveEvent() { + var nodesToBind = []; + + options.element.each( function( _, element ) { + var isTracked = $.map( that.classesElementLookup, function( elements ) { + return elements; + } ) + .some( function( elements ) { + return elements.is( element ); + } ); + + if ( !isTracked ) { + nodesToBind.push( element ); + } + } ); + + that._on( $( nodesToBind ), { + remove: "_untrackClassesElement" + } ); + } + + function processClassString( classes, checkOption ) { + var current, i; + for ( i = 0; i < classes.length; i++ ) { + current = that.classesElementLookup[ classes[ i ] ] || $(); + if ( options.add ) { + bindRemoveEvent(); + current = $( $.uniqueSort( current.get().concat( options.element.get() ) ) ); + } else { + current = $( current.not( options.element ).get() ); + } + that.classesElementLookup[ classes[ i ] ] = current; + full.push( classes[ i ] ); + if ( checkOption && options.classes[ classes[ i ] ] ) { + full.push( options.classes[ classes[ i ] ] ); + } + } + } + + if ( options.keys ) { + processClassString( options.keys.match( /\S+/g ) || [], true ); + } + if ( options.extra ) { + processClassString( options.extra.match( /\S+/g ) || [] ); + } + + return full.join( " " ); + }, + + _untrackClassesElement: function( event ) { + var that = this; + $.each( that.classesElementLookup, function( key, value ) { + if ( $.inArray( event.target, value ) !== -1 ) { + that.classesElementLookup[ key ] = $( value.not( event.target ).get() ); + } + } ); + + this._off( $( event.target ) ); + }, + + _removeClass: function( element, keys, extra ) { + return this._toggleClass( element, keys, extra, false ); + }, + + _addClass: function( element, keys, extra ) { + return this._toggleClass( element, keys, extra, true ); + }, + + _toggleClass: function( element, keys, extra, add ) { + add = ( typeof add === "boolean" ) ? add : extra; + var shift = ( typeof element === "string" || element === null ), + options = { + extra: shift ? keys : extra, + keys: shift ? element : keys, + element: shift ? this.element : element, + add: add + }; + options.element.toggleClass( this._classes( options ), add ); + return this; + }, + + _on: function( suppressDisabledCheck, element, handlers ) { + var delegateElement; + var instance = this; + + // No suppressDisabledCheck flag, shuffle arguments + if ( typeof suppressDisabledCheck !== "boolean" ) { + handlers = element; + element = suppressDisabledCheck; + suppressDisabledCheck = false; + } + + // No element argument, shuffle and use this.element + if ( !handlers ) { + handlers = element; + element = this.element; + delegateElement = this.widget(); + } else { + element = delegateElement = $( element ); + this.bindings = this.bindings.add( element ); + } + + $.each( handlers, function( event, handler ) { + function handlerProxy() { + + // Allow widgets to customize the disabled handling + // - disabled as an array instead of boolean + // - disabled class as method for disabling individual parts + if ( !suppressDisabledCheck && + ( instance.options.disabled === true || + $( this ).hasClass( "ui-state-disabled" ) ) ) { + return; + } + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + + // Copy the guid so direct unbinding works + if ( typeof handler !== "string" ) { + handlerProxy.guid = handler.guid = + handler.guid || handlerProxy.guid || $.guid++; + } + + var match = event.match( /^([\w:-]*)\s*(.*)$/ ); + var eventName = match[ 1 ] + instance.eventNamespace; + var selector = match[ 2 ]; + + if ( selector ) { + delegateElement.on( eventName, selector, handlerProxy ); + } else { + element.on( eventName, handlerProxy ); + } + } ); + }, + + _off: function( element, eventName ) { + eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) + + this.eventNamespace; + element.off( eventName ); + + // Clear the stack to avoid memory leaks (#10056) + this.bindings = $( this.bindings.not( element ).get() ); + this.focusable = $( this.focusable.not( element ).get() ); + this.hoverable = $( this.hoverable.not( element ).get() ); + }, + + _delay: function( handler, delay ) { + function handlerProxy() { + return ( typeof handler === "string" ? instance[ handler ] : handler ) + .apply( instance, arguments ); + } + var instance = this; + return setTimeout( handlerProxy, delay || 0 ); + }, + + _hoverable: function( element ) { + this.hoverable = this.hoverable.add( element ); + this._on( element, { + mouseenter: function( event ) { + this._addClass( $( event.currentTarget ), null, "ui-state-hover" ); + }, + mouseleave: function( event ) { + this._removeClass( $( event.currentTarget ), null, "ui-state-hover" ); + } + } ); + }, + + _focusable: function( element ) { + this.focusable = this.focusable.add( element ); + this._on( element, { + focusin: function( event ) { + this._addClass( $( event.currentTarget ), null, "ui-state-focus" ); + }, + focusout: function( event ) { + this._removeClass( $( event.currentTarget ), null, "ui-state-focus" ); + } + } ); + }, + + _trigger: function( type, event, data ) { + var prop, orig; + var callback = this.options[ type ]; + + data = data || {}; + event = $.Event( event ); + event.type = ( type === this.widgetEventPrefix ? + type : + this.widgetEventPrefix + type ).toLowerCase(); + + // The original event may come from any element + // so we need to reset the target on the new event + event.target = this.element[ 0 ]; + + // Copy original event properties over to the new event + orig = event.originalEvent; + if ( orig ) { + for ( prop in orig ) { + if ( !( prop in event ) ) { + event[ prop ] = orig[ prop ]; + } + } + } + + this.element.trigger( event, data ); + return !( typeof callback === "function" && + callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false || + event.isDefaultPrevented() ); + } +}; + +$.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) { + $.Widget.prototype[ "_" + method ] = function( element, options, callback ) { + if ( typeof options === "string" ) { + options = { effect: options }; + } + + var hasOptions; + var effectName = !options ? + method : + options === true || typeof options === "number" ? + defaultEffect : + options.effect || defaultEffect; + + options = options || {}; + if ( typeof options === "number" ) { + options = { duration: options }; + } else if ( options === true ) { + options = {}; + } + + hasOptions = !$.isEmptyObject( options ); + options.complete = callback; + + if ( options.delay ) { + element.delay( options.delay ); + } + + if ( hasOptions && $.effects && $.effects.effect[ effectName ] ) { + element[ method ]( options ); + } else if ( effectName !== method && element[ effectName ] ) { + element[ effectName ]( options.duration, options.easing, callback ); + } else { + element.queue( function( next ) { + $( this )[ method ](); + if ( callback ) { + callback.call( element[ 0 ] ); + } + next(); + } ); + } + }; +} ); + +var widget = $.widget; + + +/*! + * jQuery UI Position 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + * + * https://api.jqueryui.com/position/ + */ + +//>>label: Position +//>>group: Core +//>>description: Positions elements relative to other elements. +//>>docs: https://api.jqueryui.com/position/ +//>>demos: https://jqueryui.com/position/ + + +( function() { +var cachedScrollbarWidth, + max = Math.max, + abs = Math.abs, + rhorizontal = /left|center|right/, + rvertical = /top|center|bottom/, + roffset = /[\+\-]\d+(\.[\d]+)?%?/, + rposition = /^\w+/, + rpercent = /%$/, + _position = $.fn.position; + +function getOffsets( offsets, width, height ) { + return [ + parseFloat( offsets[ 0 ] ) * ( rpercent.test( offsets[ 0 ] ) ? width / 100 : 1 ), + parseFloat( offsets[ 1 ] ) * ( rpercent.test( offsets[ 1 ] ) ? height / 100 : 1 ) + ]; +} + +function parseCss( element, property ) { + return parseInt( $.css( element, property ), 10 ) || 0; +} + +function isWindow( obj ) { + return obj != null && obj === obj.window; +} + +function getDimensions( elem ) { + var raw = elem[ 0 ]; + if ( raw.nodeType === 9 ) { + return { + width: elem.width(), + height: elem.height(), + offset: { top: 0, left: 0 } + }; + } + if ( isWindow( raw ) ) { + return { + width: elem.width(), + height: elem.height(), + offset: { top: elem.scrollTop(), left: elem.scrollLeft() } + }; + } + if ( raw.preventDefault ) { + return { + width: 0, + height: 0, + offset: { top: raw.pageY, left: raw.pageX } + }; + } + return { + width: elem.outerWidth(), + height: elem.outerHeight(), + offset: elem.offset() + }; +} + +$.position = { + scrollbarWidth: function() { + if ( cachedScrollbarWidth !== undefined ) { + return cachedScrollbarWidth; + } + var w1, w2, + div = $( "
        " + + "
        " ), + innerDiv = div.children()[ 0 ]; + + $( "body" ).append( div ); + w1 = innerDiv.offsetWidth; + div.css( "overflow", "scroll" ); + + w2 = innerDiv.offsetWidth; + + if ( w1 === w2 ) { + w2 = div[ 0 ].clientWidth; + } + + div.remove(); + + return ( cachedScrollbarWidth = w1 - w2 ); + }, + getScrollInfo: function( within ) { + var overflowX = within.isWindow || within.isDocument ? "" : + within.element.css( "overflow-x" ), + overflowY = within.isWindow || within.isDocument ? "" : + within.element.css( "overflow-y" ), + hasOverflowX = overflowX === "scroll" || + ( overflowX === "auto" && within.width < within.element[ 0 ].scrollWidth ), + hasOverflowY = overflowY === "scroll" || + ( overflowY === "auto" && within.height < within.element[ 0 ].scrollHeight ); + return { + width: hasOverflowY ? $.position.scrollbarWidth() : 0, + height: hasOverflowX ? $.position.scrollbarWidth() : 0 + }; + }, + getWithinInfo: function( element ) { + var withinElement = $( element || window ), + isElemWindow = isWindow( withinElement[ 0 ] ), + isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9, + hasOffset = !isElemWindow && !isDocument; + return { + element: withinElement, + isWindow: isElemWindow, + isDocument: isDocument, + offset: hasOffset ? $( element ).offset() : { left: 0, top: 0 }, + scrollLeft: withinElement.scrollLeft(), + scrollTop: withinElement.scrollTop(), + width: withinElement.outerWidth(), + height: withinElement.outerHeight() + }; + } +}; + +$.fn.position = function( options ) { + if ( !options || !options.of ) { + return _position.apply( this, arguments ); + } + + // Make a copy, we don't want to modify arguments + options = $.extend( {}, options ); + + var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions, + + // Make sure string options are treated as CSS selectors + target = typeof options.of === "string" ? + $( document ).find( options.of ) : + $( options.of ), + + within = $.position.getWithinInfo( options.within ), + scrollInfo = $.position.getScrollInfo( within ), + collision = ( options.collision || "flip" ).split( " " ), + offsets = {}; + + dimensions = getDimensions( target ); + if ( target[ 0 ].preventDefault ) { + + // Force left top to allow flipping + options.at = "left top"; + } + targetWidth = dimensions.width; + targetHeight = dimensions.height; + targetOffset = dimensions.offset; + + // Clone to reuse original targetOffset later + basePosition = $.extend( {}, targetOffset ); + + // Force my and at to have valid horizontal and vertical positions + // if a value is missing or invalid, it will be converted to center + $.each( [ "my", "at" ], function() { + var pos = ( options[ this ] || "" ).split( " " ), + horizontalOffset, + verticalOffset; + + if ( pos.length === 1 ) { + pos = rhorizontal.test( pos[ 0 ] ) ? + pos.concat( [ "center" ] ) : + rvertical.test( pos[ 0 ] ) ? + [ "center" ].concat( pos ) : + [ "center", "center" ]; + } + pos[ 0 ] = rhorizontal.test( pos[ 0 ] ) ? pos[ 0 ] : "center"; + pos[ 1 ] = rvertical.test( pos[ 1 ] ) ? pos[ 1 ] : "center"; + + // Calculate offsets + horizontalOffset = roffset.exec( pos[ 0 ] ); + verticalOffset = roffset.exec( pos[ 1 ] ); + offsets[ this ] = [ + horizontalOffset ? horizontalOffset[ 0 ] : 0, + verticalOffset ? verticalOffset[ 0 ] : 0 + ]; + + // Reduce to just the positions without the offsets + options[ this ] = [ + rposition.exec( pos[ 0 ] )[ 0 ], + rposition.exec( pos[ 1 ] )[ 0 ] + ]; + } ); + + // Normalize collision option + if ( collision.length === 1 ) { + collision[ 1 ] = collision[ 0 ]; + } + + if ( options.at[ 0 ] === "right" ) { + basePosition.left += targetWidth; + } else if ( options.at[ 0 ] === "center" ) { + basePosition.left += targetWidth / 2; + } + + if ( options.at[ 1 ] === "bottom" ) { + basePosition.top += targetHeight; + } else if ( options.at[ 1 ] === "center" ) { + basePosition.top += targetHeight / 2; + } + + atOffset = getOffsets( offsets.at, targetWidth, targetHeight ); + basePosition.left += atOffset[ 0 ]; + basePosition.top += atOffset[ 1 ]; + + return this.each( function() { + var collisionPosition, using, + elem = $( this ), + elemWidth = elem.outerWidth(), + elemHeight = elem.outerHeight(), + marginLeft = parseCss( this, "marginLeft" ), + marginTop = parseCss( this, "marginTop" ), + collisionWidth = elemWidth + marginLeft + parseCss( this, "marginRight" ) + + scrollInfo.width, + collisionHeight = elemHeight + marginTop + parseCss( this, "marginBottom" ) + + scrollInfo.height, + position = $.extend( {}, basePosition ), + myOffset = getOffsets( offsets.my, elem.outerWidth(), elem.outerHeight() ); + + if ( options.my[ 0 ] === "right" ) { + position.left -= elemWidth; + } else if ( options.my[ 0 ] === "center" ) { + position.left -= elemWidth / 2; + } + + if ( options.my[ 1 ] === "bottom" ) { + position.top -= elemHeight; + } else if ( options.my[ 1 ] === "center" ) { + position.top -= elemHeight / 2; + } + + position.left += myOffset[ 0 ]; + position.top += myOffset[ 1 ]; + + collisionPosition = { + marginLeft: marginLeft, + marginTop: marginTop + }; + + $.each( [ "left", "top" ], function( i, dir ) { + if ( $.ui.position[ collision[ i ] ] ) { + $.ui.position[ collision[ i ] ][ dir ]( position, { + targetWidth: targetWidth, + targetHeight: targetHeight, + elemWidth: elemWidth, + elemHeight: elemHeight, + collisionPosition: collisionPosition, + collisionWidth: collisionWidth, + collisionHeight: collisionHeight, + offset: [ atOffset[ 0 ] + myOffset[ 0 ], atOffset [ 1 ] + myOffset[ 1 ] ], + my: options.my, + at: options.at, + within: within, + elem: elem + } ); + } + } ); + + if ( options.using ) { + + // Adds feedback as second argument to using callback, if present + using = function( props ) { + var left = targetOffset.left - position.left, + right = left + targetWidth - elemWidth, + top = targetOffset.top - position.top, + bottom = top + targetHeight - elemHeight, + feedback = { + target: { + element: target, + left: targetOffset.left, + top: targetOffset.top, + width: targetWidth, + height: targetHeight + }, + element: { + element: elem, + left: position.left, + top: position.top, + width: elemWidth, + height: elemHeight + }, + horizontal: right < 0 ? "left" : left > 0 ? "right" : "center", + vertical: bottom < 0 ? "top" : top > 0 ? "bottom" : "middle" + }; + if ( targetWidth < elemWidth && abs( left + right ) < targetWidth ) { + feedback.horizontal = "center"; + } + if ( targetHeight < elemHeight && abs( top + bottom ) < targetHeight ) { + feedback.vertical = "middle"; + } + if ( max( abs( left ), abs( right ) ) > max( abs( top ), abs( bottom ) ) ) { + feedback.important = "horizontal"; + } else { + feedback.important = "vertical"; + } + options.using.call( this, props, feedback ); + }; + } + + elem.offset( $.extend( position, { using: using } ) ); + } ); +}; + +$.ui.position = { + fit: { + left: function( position, data ) { + var within = data.within, + withinOffset = within.isWindow ? within.scrollLeft : within.offset.left, + outerWidth = within.width, + collisionPosLeft = position.left - data.collisionPosition.marginLeft, + overLeft = withinOffset - collisionPosLeft, + overRight = collisionPosLeft + data.collisionWidth - outerWidth - withinOffset, + newOverRight; + + // Element is wider than within + if ( data.collisionWidth > outerWidth ) { + + // Element is initially over the left side of within + if ( overLeft > 0 && overRight <= 0 ) { + newOverRight = position.left + overLeft + data.collisionWidth - outerWidth - + withinOffset; + position.left += overLeft - newOverRight; + + // Element is initially over right side of within + } else if ( overRight > 0 && overLeft <= 0 ) { + position.left = withinOffset; + + // Element is initially over both left and right sides of within + } else { + if ( overLeft > overRight ) { + position.left = withinOffset + outerWidth - data.collisionWidth; + } else { + position.left = withinOffset; + } + } + + // Too far left -> align with left edge + } else if ( overLeft > 0 ) { + position.left += overLeft; + + // Too far right -> align with right edge + } else if ( overRight > 0 ) { + position.left -= overRight; + + // Adjust based on position and margin + } else { + position.left = max( position.left - collisionPosLeft, position.left ); + } + }, + top: function( position, data ) { + var within = data.within, + withinOffset = within.isWindow ? within.scrollTop : within.offset.top, + outerHeight = data.within.height, + collisionPosTop = position.top - data.collisionPosition.marginTop, + overTop = withinOffset - collisionPosTop, + overBottom = collisionPosTop + data.collisionHeight - outerHeight - withinOffset, + newOverBottom; + + // Element is taller than within + if ( data.collisionHeight > outerHeight ) { + + // Element is initially over the top of within + if ( overTop > 0 && overBottom <= 0 ) { + newOverBottom = position.top + overTop + data.collisionHeight - outerHeight - + withinOffset; + position.top += overTop - newOverBottom; + + // Element is initially over bottom of within + } else if ( overBottom > 0 && overTop <= 0 ) { + position.top = withinOffset; + + // Element is initially over both top and bottom of within + } else { + if ( overTop > overBottom ) { + position.top = withinOffset + outerHeight - data.collisionHeight; + } else { + position.top = withinOffset; + } + } + + // Too far up -> align with top + } else if ( overTop > 0 ) { + position.top += overTop; + + // Too far down -> align with bottom edge + } else if ( overBottom > 0 ) { + position.top -= overBottom; + + // Adjust based on position and margin + } else { + position.top = max( position.top - collisionPosTop, position.top ); + } + } + }, + flip: { + left: function( position, data ) { + var within = data.within, + withinOffset = within.offset.left + within.scrollLeft, + outerWidth = within.width, + offsetLeft = within.isWindow ? within.scrollLeft : within.offset.left, + collisionPosLeft = position.left - data.collisionPosition.marginLeft, + overLeft = collisionPosLeft - offsetLeft, + overRight = collisionPosLeft + data.collisionWidth - outerWidth - offsetLeft, + myOffset = data.my[ 0 ] === "left" ? + -data.elemWidth : + data.my[ 0 ] === "right" ? + data.elemWidth : + 0, + atOffset = data.at[ 0 ] === "left" ? + data.targetWidth : + data.at[ 0 ] === "right" ? + -data.targetWidth : + 0, + offset = -2 * data.offset[ 0 ], + newOverRight, + newOverLeft; + + if ( overLeft < 0 ) { + newOverRight = position.left + myOffset + atOffset + offset + data.collisionWidth - + outerWidth - withinOffset; + if ( newOverRight < 0 || newOverRight < abs( overLeft ) ) { + position.left += myOffset + atOffset + offset; + } + } else if ( overRight > 0 ) { + newOverLeft = position.left - data.collisionPosition.marginLeft + myOffset + + atOffset + offset - offsetLeft; + if ( newOverLeft > 0 || abs( newOverLeft ) < overRight ) { + position.left += myOffset + atOffset + offset; + } + } + }, + top: function( position, data ) { + var within = data.within, + withinOffset = within.offset.top + within.scrollTop, + outerHeight = within.height, + offsetTop = within.isWindow ? within.scrollTop : within.offset.top, + collisionPosTop = position.top - data.collisionPosition.marginTop, + overTop = collisionPosTop - offsetTop, + overBottom = collisionPosTop + data.collisionHeight - outerHeight - offsetTop, + top = data.my[ 1 ] === "top", + myOffset = top ? + -data.elemHeight : + data.my[ 1 ] === "bottom" ? + data.elemHeight : + 0, + atOffset = data.at[ 1 ] === "top" ? + data.targetHeight : + data.at[ 1 ] === "bottom" ? + -data.targetHeight : + 0, + offset = -2 * data.offset[ 1 ], + newOverTop, + newOverBottom; + if ( overTop < 0 ) { + newOverBottom = position.top + myOffset + atOffset + offset + data.collisionHeight - + outerHeight - withinOffset; + if ( newOverBottom < 0 || newOverBottom < abs( overTop ) ) { + position.top += myOffset + atOffset + offset; + } + } else if ( overBottom > 0 ) { + newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + + offset - offsetTop; + if ( newOverTop > 0 || abs( newOverTop ) < overBottom ) { + position.top += myOffset + atOffset + offset; + } + } + } + }, + flipfit: { + left: function() { + $.ui.position.flip.left.apply( this, arguments ); + $.ui.position.fit.left.apply( this, arguments ); + }, + top: function() { + $.ui.position.flip.top.apply( this, arguments ); + $.ui.position.fit.top.apply( this, arguments ); + } + } +}; + +} )(); + +var position = $.ui.position; + + +/*! + * jQuery UI :data 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: :data Selector +//>>group: Core +//>>description: Selects elements which have data stored under the specified key. +//>>docs: https://api.jqueryui.com/data-selector/ + + +var data = $.extend( $.expr.pseudos, { + data: $.expr.createPseudo( function( dataName ) { + return function( elem ) { + return !!$.data( elem, dataName ); + }; + } ) +} ); + +/*! + * jQuery UI Disable Selection 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: disableSelection +//>>group: Core +//>>description: Disable selection of text content within the set of matched elements. +//>>docs: https://api.jqueryui.com/disableSelection/ + +// This file is deprecated + +var disableSelection = $.fn.extend( { + disableSelection: ( function() { + var eventType = "onselectstart" in document.createElement( "div" ) ? + "selectstart" : + "mousedown"; + + return function() { + return this.on( eventType + ".ui-disableSelection", function( event ) { + event.preventDefault(); + } ); + }; + } )(), + + enableSelection: function() { + return this.off( ".ui-disableSelection" ); + } +} ); + + +/*! + * jQuery UI Focusable 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: :focusable Selector +//>>group: Core +//>>description: Selects elements which can be focused. +//>>docs: https://api.jqueryui.com/focusable-selector/ + + +// Selectors +$.ui.focusable = function( element, hasTabindex ) { + var map, mapName, img, focusableIfVisible, fieldset, + nodeName = element.nodeName.toLowerCase(); + + if ( "area" === nodeName ) { + map = element.parentNode; + mapName = map.name; + if ( !element.href || !mapName || map.nodeName.toLowerCase() !== "map" ) { + return false; + } + img = $( "img[usemap='#" + mapName + "']" ); + return img.length > 0 && img.is( ":visible" ); + } + + if ( /^(input|select|textarea|button|object)$/.test( nodeName ) ) { + focusableIfVisible = !element.disabled; + + if ( focusableIfVisible ) { + + // Form controls within a disabled fieldset are disabled. + // However, controls within the fieldset's legend do not get disabled. + // Since controls generally aren't placed inside legends, we skip + // this portion of the check. + fieldset = $( element ).closest( "fieldset" )[ 0 ]; + if ( fieldset ) { + focusableIfVisible = !fieldset.disabled; + } + } + } else if ( "a" === nodeName ) { + focusableIfVisible = element.href || hasTabindex; + } else { + focusableIfVisible = hasTabindex; + } + + return focusableIfVisible && $( element ).is( ":visible" ) && + $( element ).css( "visibility" ) === "visible"; +}; + +$.extend( $.expr.pseudos, { + focusable: function( element ) { + return $.ui.focusable( element, $.attr( element, "tabindex" ) != null ); + } +} ); + +var focusable = $.ui.focusable; + + +/*! + * jQuery UI Form Reset Mixin 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Form Reset Mixin +//>>group: Core +//>>description: Refresh input widgets when their form is reset +//>>docs: https://api.jqueryui.com/form-reset-mixin/ + + +var formResetMixin = $.ui.formResetMixin = { + _formResetHandler: function() { + var form = $( this ); + + // Wait for the form reset to actually happen before refreshing + setTimeout( function() { + var instances = form.data( "ui-form-reset-instances" ); + $.each( instances, function() { + this.refresh(); + } ); + } ); + }, + + _bindFormResetHandler: function() { + this.form = $( this.element.prop( "form" ) ); + if ( !this.form.length ) { + return; + } + + var instances = this.form.data( "ui-form-reset-instances" ) || []; + if ( !instances.length ) { + + // We don't use _on() here because we use a single event handler per form + this.form.on( "reset.ui-form-reset", this._formResetHandler ); + } + instances.push( this ); + this.form.data( "ui-form-reset-instances", instances ); + }, + + _unbindFormResetHandler: function() { + if ( !this.form.length ) { + return; + } + + var instances = this.form.data( "ui-form-reset-instances" ); + instances.splice( $.inArray( this, instances ), 1 ); + if ( instances.length ) { + this.form.data( "ui-form-reset-instances", instances ); + } else { + this.form + .removeData( "ui-form-reset-instances" ) + .off( "reset.ui-form-reset" ); + } + } +}; + + +/*! + * jQuery UI Legacy jQuery Core patches 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + * + */ + +//>>label: Legacy jQuery Core patches +//>>group: Core +//>>description: Backport `.even()`, `.odd()` and `$.escapeSelector` to older jQuery Core versions (deprecated) + + +// Support: jQuery 2.2.x or older. +// This method has been defined in jQuery 3.0.0. +// Code from https://github.com/jquery/jquery/blob/e539bac79e666bba95bba86d690b4e609dca2286/src/selector/escapeSelector.js +if ( !$.escapeSelector ) { + $.escapeSelector = function( id ) { + return CSS.escape( id + "" ); + }; +} + +// Support: jQuery 3.4.x or older +// These methods have been defined in jQuery 3.5.0. +if ( !$.fn.even || !$.fn.odd ) { + $.fn.extend( { + even: function() { + return this.filter( function( i ) { + return i % 2 === 0; + } ); + }, + odd: function() { + return this.filter( function( i ) { + return i % 2 === 1; + } ); + } + } ); +} + +; +/*! + * jQuery UI Keycode 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Keycode +//>>group: Core +//>>description: Provide keycodes as keynames +//>>docs: https://api.jqueryui.com/jQuery.ui.keyCode/ + + +var keycode = $.ui.keyCode = { + BACKSPACE: 8, + COMMA: 188, + DELETE: 46, + DOWN: 40, + END: 35, + ENTER: 13, + ESCAPE: 27, + HOME: 36, + LEFT: 37, + PAGE_DOWN: 34, + PAGE_UP: 33, + PERIOD: 190, + RIGHT: 39, + SPACE: 32, + TAB: 9, + UP: 38 +}; + + +/*! + * jQuery UI Labels 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: labels +//>>group: Core +//>>description: Find all the labels associated with a given input +//>>docs: https://api.jqueryui.com/labels/ + + +var labels = $.fn.labels = function() { + var ancestor, selector, id, labels, ancestors; + + if ( !this.length ) { + return this.pushStack( [] ); + } + + // Check control.labels first + if ( this[ 0 ].labels && this[ 0 ].labels.length ) { + return this.pushStack( this[ 0 ].labels ); + } + + // If `control.labels` is empty - e.g. inside of document fragments - find + // the labels manually + labels = this.eq( 0 ).parents( "label" ); + + // Look for the label based on the id + id = this.attr( "id" ); + if ( id ) { + + // We don't search against the document in case the element + // is disconnected from the DOM + ancestor = this.eq( 0 ).parents().last(); + + // Get a full set of top level ancestors + ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() ); + + // Create a selector for the label based on the id + selector = "label[for='" + CSS.escape( id ) + "']"; + + labels = labels.add( ancestors.find( selector ).addBack( selector ) ); + + } + + // Return whatever we have found for labels + return this.pushStack( labels ); +}; + + +/*! + * jQuery UI Scroll Parent 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: scrollParent +//>>group: Core +//>>description: Get the closest ancestor element that is scrollable. +//>>docs: https://api.jqueryui.com/scrollParent/ + + +var scrollParent = $.fn.scrollParent = function( includeHidden ) { + var position = this.css( "position" ), + excludeStaticParent = position === "absolute", + overflowRegex = includeHidden ? /(auto|scroll|hidden)/ : /(auto|scroll)/, + scrollParent = this.parents().filter( function() { + var parent = $( this ); + if ( excludeStaticParent && parent.css( "position" ) === "static" ) { + return false; + } + return overflowRegex.test( parent.css( "overflow" ) + parent.css( "overflow-y" ) + + parent.css( "overflow-x" ) ); + } ).eq( 0 ); + + return position === "fixed" || !scrollParent.length ? + $( this[ 0 ].ownerDocument || document ) : + scrollParent; +}; + + +/*! + * jQuery UI Tabbable 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: :tabbable Selector +//>>group: Core +//>>description: Selects elements which can be tabbed to. +//>>docs: https://api.jqueryui.com/tabbable-selector/ + + +var tabbable = $.extend( $.expr.pseudos, { + tabbable: function( element ) { + var tabIndex = $.attr( element, "tabindex" ), + hasTabindex = tabIndex != null; + return ( !hasTabindex || tabIndex >= 0 ) && $.ui.focusable( element, hasTabindex ); + } +} ); + + +/*! + * jQuery UI Unique ID 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: uniqueId +//>>group: Core +//>>description: Functions to generate and remove uniqueId's +//>>docs: https://api.jqueryui.com/uniqueId/ + + +var uniqueId = $.fn.extend( { + uniqueId: ( function() { + var uuid = 0; + + return function() { + return this.each( function() { + if ( !this.id ) { + this.id = "ui-id-" + ( ++uuid ); + } + } ); + }; + } )(), + + removeUniqueId: function() { + return this.each( function() { + if ( /^ui-id-\d+$/.test( this.id ) ) { + $( this ).removeAttr( "id" ); + } + } ); + } +} ); + + +/*! + * jQuery UI Mouse 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Mouse +//>>group: Widgets +//>>description: Abstracts mouse-based interactions to assist in creating certain widgets. +//>>docs: https://api.jqueryui.com/mouse/ + + +var mouseHandled = false; +$( document ).on( "mouseup", function() { + mouseHandled = false; +} ); + +var widgetsMouse = $.widget( "ui.mouse", { + version: "1.14.1", + options: { + cancel: "input, textarea, button, select, option", + distance: 1, + delay: 0 + }, + _mouseInit: function() { + var that = this; + + this.element + .on( "mousedown." + this.widgetName, function( event ) { + return that._mouseDown( event ); + } ) + .on( "click." + this.widgetName, function( event ) { + if ( true === $.data( event.target, that.widgetName + ".preventClickEvent" ) ) { + $.removeData( event.target, that.widgetName + ".preventClickEvent" ); + event.stopImmediatePropagation(); + return false; + } + } ); + + this.started = false; + }, + + // TODO: make sure destroying one instance of mouse doesn't mess with + // other instances of mouse + _mouseDestroy: function() { + this.element.off( "." + this.widgetName ); + if ( this._mouseMoveDelegate ) { + this.document + .off( "mousemove." + this.widgetName, this._mouseMoveDelegate ) + .off( "mouseup." + this.widgetName, this._mouseUpDelegate ); + } + }, + + _mouseDown: function( event ) { + + // don't let more than one widget handle mouseStart + if ( mouseHandled ) { + return; + } + + this._mouseMoved = false; + + // We may have missed mouseup (out of window) + if ( this._mouseStarted ) { + this._mouseUp( event ); + } + + this._mouseDownEvent = event; + + var that = this, + btnIsLeft = event.which === 1, + elIsCancel = typeof this.options.cancel === "string" ? + $( event.target ).closest( this.options.cancel ).length : + false; + if ( !btnIsLeft || elIsCancel || !this._mouseCapture( event ) ) { + return true; + } + + this.mouseDelayMet = !this.options.delay; + if ( !this.mouseDelayMet ) { + this._mouseDelayTimer = setTimeout( function() { + that.mouseDelayMet = true; + }, this.options.delay ); + } + + if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) { + this._mouseStarted = ( this._mouseStart( event ) !== false ); + if ( !this._mouseStarted ) { + event.preventDefault(); + return true; + } + } + + // Click event may never have fired (Gecko & Opera) + if ( true === $.data( event.target, this.widgetName + ".preventClickEvent" ) ) { + $.removeData( event.target, this.widgetName + ".preventClickEvent" ); + } + + // These delegates are required to keep context + this._mouseMoveDelegate = function( event ) { + return that._mouseMove( event ); + }; + this._mouseUpDelegate = function( event ) { + return that._mouseUp( event ); + }; + + this.document + .on( "mousemove." + this.widgetName, this._mouseMoveDelegate ) + .on( "mouseup." + this.widgetName, this._mouseUpDelegate ); + + event.preventDefault(); + + mouseHandled = true; + return true; + }, + + _mouseMove: function( event ) { + + // Only check for mouseups outside the document if you've moved inside the document + // at least once. + if ( this._mouseMoved && !event.which ) { + + // Support: Safari <=8 - 9 + // Safari sets which to 0 if you press any of the following keys + // during a drag (#14461) + if ( event.originalEvent.altKey || event.originalEvent.ctrlKey || + event.originalEvent.metaKey || event.originalEvent.shiftKey ) { + this.ignoreMissingWhich = true; + } else if ( !this.ignoreMissingWhich ) { + return this._mouseUp( event ); + } + } + + if ( event.which || event.button ) { + this._mouseMoved = true; + } + + if ( this._mouseStarted ) { + this._mouseDrag( event ); + return event.preventDefault(); + } + + if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) { + this._mouseStarted = + ( this._mouseStart( this._mouseDownEvent, event ) !== false ); + if ( this._mouseStarted ) { + this._mouseDrag( event ); + } else { + this._mouseUp( event ); + } + } + + return !this._mouseStarted; + }, + + _mouseUp: function( event ) { + this.document + .off( "mousemove." + this.widgetName, this._mouseMoveDelegate ) + .off( "mouseup." + this.widgetName, this._mouseUpDelegate ); + + if ( this._mouseStarted ) { + this._mouseStarted = false; + + if ( event.target === this._mouseDownEvent.target ) { + $.data( event.target, this.widgetName + ".preventClickEvent", true ); + } + + this._mouseStop( event ); + } + + if ( this._mouseDelayTimer ) { + clearTimeout( this._mouseDelayTimer ); + delete this._mouseDelayTimer; + } + + this.ignoreMissingWhich = false; + mouseHandled = false; + event.preventDefault(); + }, + + _mouseDistanceMet: function( event ) { + return ( Math.max( + Math.abs( this._mouseDownEvent.pageX - event.pageX ), + Math.abs( this._mouseDownEvent.pageY - event.pageY ) + ) >= this.options.distance + ); + }, + + _mouseDelayMet: function( /* event */ ) { + return this.mouseDelayMet; + }, + + // These are placeholder methods, to be overriden by extending plugin + _mouseStart: function( /* event */ ) {}, + _mouseDrag: function( /* event */ ) {}, + _mouseStop: function( /* event */ ) {}, + _mouseCapture: function( /* event */ ) { + return true; + } +} ); + + + +// $.ui.plugin is deprecated. Use $.widget() extensions instead. +var plugin = $.ui.plugin = { + add: function( module, option, set ) { + var i, + proto = $.ui[ module ].prototype; + for ( i in set ) { + proto.plugins[ i ] = proto.plugins[ i ] || []; + proto.plugins[ i ].push( [ option, set[ i ] ] ); + } + }, + call: function( instance, name, args, allowDisconnected ) { + var i, + set = instance.plugins[ name ]; + + if ( !set ) { + return; + } + + if ( !allowDisconnected && ( !instance.element[ 0 ].parentNode || + instance.element[ 0 ].parentNode.nodeType === 11 ) ) { + return; + } + + for ( i = 0; i < set.length; i++ ) { + if ( instance.options[ set[ i ][ 0 ] ] ) { + set[ i ][ 1 ].apply( instance.element, args ); + } + } + } +}; + + +/*! + * jQuery UI Draggable 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Draggable +//>>group: Interactions +//>>description: Enables dragging functionality for any element. +//>>docs: https://api.jqueryui.com/draggable/ +//>>demos: https://jqueryui.com/draggable/ +//>>css.structure: ../../themes/base/draggable.css + + +$.widget( "ui.draggable", $.ui.mouse, { + version: "1.14.1", + widgetEventPrefix: "drag", + options: { + addClasses: true, + appendTo: "parent", + axis: false, + connectToSortable: false, + containment: false, + cursor: "auto", + cursorAt: false, + grid: false, + handle: false, + helper: "original", + iframeFix: false, + opacity: false, + refreshPositions: false, + revert: false, + revertDuration: 500, + scope: "default", + scroll: true, + scrollSensitivity: 20, + scrollSpeed: 20, + snap: false, + snapMode: "both", + snapTolerance: 20, + stack: false, + zIndex: false, + + // Callbacks + drag: null, + start: null, + stop: null + }, + _create: function() { + + if ( this.options.helper === "original" ) { + this._setPositionRelative(); + } + if ( this.options.addClasses ) { + this._addClass( "ui-draggable" ); + } + this._setHandleClassName(); + + this._mouseInit(); + }, + + _setOption: function( key, value ) { + this._super( key, value ); + if ( key === "handle" ) { + this._removeHandleClassName(); + this._setHandleClassName(); + } + }, + + _destroy: function() { + if ( ( this.helper || this.element ).is( ".ui-draggable-dragging" ) ) { + this.destroyOnClear = true; + return; + } + this._removeHandleClassName(); + this._mouseDestroy(); + }, + + _mouseCapture: function( event ) { + var o = this.options; + + // Among others, prevent a drag on a resizable-handle + if ( this.helper || o.disabled || + $( event.target ).closest( ".ui-resizable-handle" ).length > 0 ) { + return false; + } + + //Quit if we're not on a valid handle + this.handle = this._getHandle( event ); + if ( !this.handle ) { + return false; + } + + this._blurActiveElement( event ); + + this._blockFrames( o.iframeFix === true ? "iframe" : o.iframeFix ); + + return true; + + }, + + _blockFrames: function( selector ) { + this.iframeBlocks = this.document.find( selector ).map( function() { + var iframe = $( this ); + + return $( "
        " ) + .css( "position", "absolute" ) + .appendTo( iframe.parent() ) + .outerWidth( iframe.outerWidth() ) + .outerHeight( iframe.outerHeight() ) + .offset( iframe.offset() )[ 0 ]; + } ); + }, + + _unblockFrames: function() { + if ( this.iframeBlocks ) { + this.iframeBlocks.remove(); + delete this.iframeBlocks; + } + }, + + _blurActiveElement: function( event ) { + var activeElement = this.document[ 0 ].activeElement, + target = $( event.target ); + + // Don't blur if the event occurred on an element that is within + // the currently focused element + // See #10527, #12472 + if ( target.closest( activeElement ).length ) { + return; + } + + // Blur any element that currently has focus, see #4261 + $( activeElement ).trigger( "blur" ); + }, + + _mouseStart: function( event ) { + + var o = this.options; + + //Create and append the visible helper + this.helper = this._createHelper( event ); + + this._addClass( this.helper, "ui-draggable-dragging" ); + + //Cache the helper size + this._cacheHelperProportions(); + + //If ddmanager is used for droppables, set the global draggable + if ( $.ui.ddmanager ) { + $.ui.ddmanager.current = this; + } + + /* + * - Position generation - + * This block generates everything position related - it's the core of draggables. + */ + + //Cache the margins of the original element + this._cacheMargins(); + + //Store the helper's css position + this.cssPosition = this.helper.css( "position" ); + this.scrollParent = this.helper.scrollParent( true ); + this.offsetParent = this.helper.offsetParent(); + this.hasFixedAncestor = this.helper.parents().filter( function() { + return $( this ).css( "position" ) === "fixed"; + } ).length > 0; + + //The element's absolute position on the page minus margins + this.positionAbs = this.element.offset(); + this._refreshOffsets( event ); + + //Generate the original position + this.originalPosition = this.position = this._generatePosition( event, false ); + this.originalPageX = event.pageX; + this.originalPageY = event.pageY; + + //Adjust the mouse offset relative to the helper if "cursorAt" is supplied + if ( o.cursorAt ) { + this._adjustOffsetFromHelper( o.cursorAt ); + } + + //Set a containment if given in the options + this._setContainment(); + + //Trigger event + callbacks + if ( this._trigger( "start", event ) === false ) { + this._clear(); + return false; + } + + //Recache the helper size + this._cacheHelperProportions(); + + //Prepare the droppable offsets + if ( $.ui.ddmanager && !o.dropBehaviour ) { + $.ui.ddmanager.prepareOffsets( this, event ); + } + + // Execute the drag once - this causes the helper not to be visible before getting its + // correct position + this._mouseDrag( event, true ); + + // If the ddmanager is used for droppables, inform the manager that dragging has started + // (see #5003) + if ( $.ui.ddmanager ) { + $.ui.ddmanager.dragStart( this, event ); + } + + return true; + }, + + _refreshOffsets: function( event ) { + this.offset = { + top: this.positionAbs.top - this.margins.top, + left: this.positionAbs.left - this.margins.left, + scroll: false, + parent: this._getParentOffset(), + relative: this._getRelativeOffset() + }; + + this.offset.click = { + left: event.pageX - this.offset.left, + top: event.pageY - this.offset.top + }; + }, + + _mouseDrag: function( event, noPropagation ) { + + // reset any necessary cached properties (see #5009) + if ( this.hasFixedAncestor ) { + this.offset.parent = this._getParentOffset(); + } + + //Compute the helpers position + this.position = this._generatePosition( event, true ); + this.positionAbs = this._convertPositionTo( "absolute" ); + + //Call plugins and callbacks and use the resulting position if something is returned + if ( !noPropagation ) { + var ui = this._uiHash(); + if ( this._trigger( "drag", event, ui ) === false ) { + this._mouseUp( new $.Event( "mouseup", event ) ); + return false; + } + this.position = ui.position; + } + + this.helper[ 0 ].style.left = this.position.left + "px"; + this.helper[ 0 ].style.top = this.position.top + "px"; + + if ( $.ui.ddmanager ) { + $.ui.ddmanager.drag( this, event ); + } + + return false; + }, + + _mouseStop: function( event ) { + + //If we are using droppables, inform the manager about the drop + var that = this, + dropped = false; + if ( $.ui.ddmanager && !this.options.dropBehaviour ) { + dropped = $.ui.ddmanager.drop( this, event ); + } + + //if a drop comes from outside (a sortable) + if ( this.dropped ) { + dropped = this.dropped; + this.dropped = false; + } + + if ( ( this.options.revert === "invalid" && !dropped ) || + ( this.options.revert === "valid" && dropped ) || + this.options.revert === true || ( typeof this.options.revert === "function" && + this.options.revert.call( this.element, dropped ) ) + ) { + $( this.helper ).animate( + this.originalPosition, + parseInt( this.options.revertDuration, 10 ), + function() { + if ( that._trigger( "stop", event ) !== false ) { + that._clear(); + } + } + ); + } else { + if ( this._trigger( "stop", event ) !== false ) { + this._clear(); + } + } + + return false; + }, + + _mouseUp: function( event ) { + this._unblockFrames(); + + // If the ddmanager is used for droppables, inform the manager that dragging has stopped + // (see #5003) + if ( $.ui.ddmanager ) { + $.ui.ddmanager.dragStop( this, event ); + } + + // Only need to focus if the event occurred on the draggable itself, see #10527 + if ( this.handleElement.is( event.target ) ) { + + // The interaction is over; whether or not the click resulted in a drag, + // focus the element + this.element.trigger( "focus" ); + } + + return $.ui.mouse.prototype._mouseUp.call( this, event ); + }, + + cancel: function() { + + if ( this.helper.is( ".ui-draggable-dragging" ) ) { + this._mouseUp( new $.Event( "mouseup", { target: this.element[ 0 ] } ) ); + } else { + this._clear(); + } + + return this; + + }, + + _getHandle: function( event ) { + return this.options.handle ? + !!$( event.target ).closest( this.element.find( this.options.handle ) ).length : + true; + }, + + _setHandleClassName: function() { + this.handleElement = this.options.handle ? + this.element.find( this.options.handle ) : this.element; + this._addClass( this.handleElement, "ui-draggable-handle" ); + }, + + _removeHandleClassName: function() { + this._removeClass( this.handleElement, "ui-draggable-handle" ); + }, + + _createHelper: function( event ) { + + var o = this.options, + helperIsFunction = typeof o.helper === "function", + helper = helperIsFunction ? + $( o.helper.apply( this.element[ 0 ], [ event ] ) ) : + ( o.helper === "clone" ? + this.element.clone().removeAttr( "id" ) : + this.element ); + + if ( !helper.parents( "body" ).length ) { + helper.appendTo( ( o.appendTo === "parent" ? + this.element[ 0 ].parentNode : + o.appendTo ) ); + } + + // https://bugs.jqueryui.com/ticket/9446 + // a helper function can return the original element + // which wouldn't have been set to relative in _create + if ( helperIsFunction && helper[ 0 ] === this.element[ 0 ] ) { + this._setPositionRelative(); + } + + if ( helper[ 0 ] !== this.element[ 0 ] && + !( /(fixed|absolute)/ ).test( helper.css( "position" ) ) ) { + helper.css( "position", "absolute" ); + } + + return helper; + + }, + + _setPositionRelative: function() { + if ( !( /^(?:r|a|f)/ ).test( this.element.css( "position" ) ) ) { + this.element[ 0 ].style.position = "relative"; + } + }, + + _adjustOffsetFromHelper: function( obj ) { + if ( typeof obj === "string" ) { + obj = obj.split( " " ); + } + if ( Array.isArray( obj ) ) { + obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 }; + } + if ( "left" in obj ) { + this.offset.click.left = obj.left + this.margins.left; + } + if ( "right" in obj ) { + this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left; + } + if ( "top" in obj ) { + this.offset.click.top = obj.top + this.margins.top; + } + if ( "bottom" in obj ) { + this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top; + } + }, + + _isRootNode: function( element ) { + return ( /(html|body)/i ).test( element.tagName ) || element === this.document[ 0 ]; + }, + + _getParentOffset: function() { + + //Get the offsetParent and cache its position + var po = this.offsetParent.offset(), + document = this.document[ 0 ]; + + // This is a special case where we need to modify a offset calculated on start, since the + // following happened: + // 1. The position of the helper is absolute, so it's position is calculated based on the + // next positioned parent + // 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't + // the document, which means that the scroll is included in the initial calculation of the + // offset of the parent, and never recalculated upon drag + if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== document && + $.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) { + po.left += this.scrollParent.scrollLeft(); + po.top += this.scrollParent.scrollTop(); + } + + if ( this._isRootNode( this.offsetParent[ 0 ] ) ) { + po = { top: 0, left: 0 }; + } + + return { + top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ), + left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 ) + }; + + }, + + _getRelativeOffset: function() { + if ( this.cssPosition !== "relative" ) { + return { top: 0, left: 0 }; + } + + var p = this.element.position(), + scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] ); + + return { + top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) + + ( !scrollIsRootNode ? this.scrollParent.scrollTop() : 0 ), + left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) + + ( !scrollIsRootNode ? this.scrollParent.scrollLeft() : 0 ) + }; + + }, + + _cacheMargins: function() { + this.margins = { + left: ( parseInt( this.element.css( "marginLeft" ), 10 ) || 0 ), + top: ( parseInt( this.element.css( "marginTop" ), 10 ) || 0 ), + right: ( parseInt( this.element.css( "marginRight" ), 10 ) || 0 ), + bottom: ( parseInt( this.element.css( "marginBottom" ), 10 ) || 0 ) + }; + }, + + _cacheHelperProportions: function() { + this.helperProportions = { + width: this.helper.outerWidth(), + height: this.helper.outerHeight() + }; + }, + + _setContainment: function() { + + var isUserScrollable, c, ce, + o = this.options, + document = this.document[ 0 ]; + + this.relativeContainer = null; + + if ( !o.containment ) { + this.containment = null; + return; + } + + if ( o.containment === "window" ) { + this.containment = [ + $( window ).scrollLeft() - this.offset.relative.left - this.offset.parent.left, + $( window ).scrollTop() - this.offset.relative.top - this.offset.parent.top, + $( window ).scrollLeft() + $( window ).width() - + this.helperProportions.width - this.margins.left, + $( window ).scrollTop() + + ( $( window ).height() || document.body.parentNode.scrollHeight ) - + this.helperProportions.height - this.margins.top + ]; + return; + } + + if ( o.containment === "document" ) { + this.containment = [ + 0, + 0, + $( document ).width() - this.helperProportions.width - this.margins.left, + ( $( document ).height() || document.body.parentNode.scrollHeight ) - + this.helperProportions.height - this.margins.top + ]; + return; + } + + if ( o.containment.constructor === Array ) { + this.containment = o.containment; + return; + } + + if ( o.containment === "parent" ) { + o.containment = this.helper[ 0 ].parentNode; + } + + c = $( o.containment ); + ce = c[ 0 ]; + + if ( !ce ) { + return; + } + + isUserScrollable = /(scroll|auto)/.test( c.css( "overflow" ) ); + + this.containment = [ + ( parseInt( c.css( "borderLeftWidth" ), 10 ) || 0 ) + + ( parseInt( c.css( "paddingLeft" ), 10 ) || 0 ), + ( parseInt( c.css( "borderTopWidth" ), 10 ) || 0 ) + + ( parseInt( c.css( "paddingTop" ), 10 ) || 0 ), + ( isUserScrollable ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) - + ( parseInt( c.css( "borderRightWidth" ), 10 ) || 0 ) - + ( parseInt( c.css( "paddingRight" ), 10 ) || 0 ) - + this.helperProportions.width - + this.margins.left - + this.margins.right, + ( isUserScrollable ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) - + ( parseInt( c.css( "borderBottomWidth" ), 10 ) || 0 ) - + ( parseInt( c.css( "paddingBottom" ), 10 ) || 0 ) - + this.helperProportions.height - + this.margins.top - + this.margins.bottom + ]; + this.relativeContainer = c; + }, + + _convertPositionTo: function( d, pos ) { + + if ( !pos ) { + pos = this.position; + } + + var mod = d === "absolute" ? 1 : -1, + scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] ); + + return { + top: ( + + // The absolute mouse position + pos.top + + + // Only for relative positioned nodes: Relative offset from element to offset parent + this.offset.relative.top * mod + + + // The offsetParent's offset without borders (offset + border) + this.offset.parent.top * mod - + ( ( this.cssPosition === "fixed" ? + -this.offset.scroll.top : + ( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) * mod ) + ), + left: ( + + // The absolute mouse position + pos.left + + + // Only for relative positioned nodes: Relative offset from element to offset parent + this.offset.relative.left * mod + + + // The offsetParent's offset without borders (offset + border) + this.offset.parent.left * mod - + ( ( this.cssPosition === "fixed" ? + -this.offset.scroll.left : + ( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) * mod ) + ) + }; + + }, + + _generatePosition: function( event, constrainPosition ) { + + var containment, co, top, left, + o = this.options, + scrollIsRootNode = this._isRootNode( this.scrollParent[ 0 ] ), + pageX = event.pageX, + pageY = event.pageY; + + // Cache the scroll + if ( !scrollIsRootNode || !this.offset.scroll ) { + this.offset.scroll = { + top: this.scrollParent.scrollTop(), + left: this.scrollParent.scrollLeft() + }; + } + + /* + * - Position constraining - + * Constrain the position to a mix of grid, containment. + */ + + // If we are not dragging yet, we won't check for options + if ( constrainPosition ) { + if ( this.containment ) { + if ( this.relativeContainer ) { + co = this.relativeContainer.offset(); + containment = [ + this.containment[ 0 ] + co.left, + this.containment[ 1 ] + co.top, + this.containment[ 2 ] + co.left, + this.containment[ 3 ] + co.top + ]; + } else { + containment = this.containment; + } + + if ( event.pageX - this.offset.click.left < containment[ 0 ] ) { + pageX = containment[ 0 ] + this.offset.click.left; + } + if ( event.pageY - this.offset.click.top < containment[ 1 ] ) { + pageY = containment[ 1 ] + this.offset.click.top; + } + if ( event.pageX - this.offset.click.left > containment[ 2 ] ) { + pageX = containment[ 2 ] + this.offset.click.left; + } + if ( event.pageY - this.offset.click.top > containment[ 3 ] ) { + pageY = containment[ 3 ] + this.offset.click.top; + } + } + + if ( o.grid ) { + + //Check for grid elements set to 0 to prevent divide by 0 error causing invalid + // argument errors in IE (see ticket #6950) + top = o.grid[ 1 ] ? this.originalPageY + Math.round( ( pageY - + this.originalPageY ) / o.grid[ 1 ] ) * o.grid[ 1 ] : this.originalPageY; + pageY = containment ? ( ( top - this.offset.click.top >= containment[ 1 ] || + top - this.offset.click.top > containment[ 3 ] ) ? + top : + ( ( top - this.offset.click.top >= containment[ 1 ] ) ? + top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) : top; + + left = o.grid[ 0 ] ? this.originalPageX + + Math.round( ( pageX - this.originalPageX ) / o.grid[ 0 ] ) * o.grid[ 0 ] : + this.originalPageX; + pageX = containment ? ( ( left - this.offset.click.left >= containment[ 0 ] || + left - this.offset.click.left > containment[ 2 ] ) ? + left : + ( ( left - this.offset.click.left >= containment[ 0 ] ) ? + left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) : left; + } + + if ( o.axis === "y" ) { + pageX = this.originalPageX; + } + + if ( o.axis === "x" ) { + pageY = this.originalPageY; + } + } + + return { + top: ( + + // The absolute mouse position + pageY - + + // Click offset (relative to the element) + this.offset.click.top - + + // Only for relative positioned nodes: Relative offset from element to offset parent + this.offset.relative.top - + + // The offsetParent's offset without borders (offset + border) + this.offset.parent.top + + ( this.cssPosition === "fixed" ? + -this.offset.scroll.top : + ( scrollIsRootNode ? 0 : this.offset.scroll.top ) ) + ), + left: ( + + // The absolute mouse position + pageX - + + // Click offset (relative to the element) + this.offset.click.left - + + // Only for relative positioned nodes: Relative offset from element to offset parent + this.offset.relative.left - + + // The offsetParent's offset without borders (offset + border) + this.offset.parent.left + + ( this.cssPosition === "fixed" ? + -this.offset.scroll.left : + ( scrollIsRootNode ? 0 : this.offset.scroll.left ) ) + ) + }; + + }, + + _clear: function() { + this._removeClass( this.helper, "ui-draggable-dragging" ); + if ( this.helper[ 0 ] !== this.element[ 0 ] && !this.cancelHelperRemoval ) { + this.helper.remove(); + } + this.helper = null; + this.cancelHelperRemoval = false; + if ( this.destroyOnClear ) { + this.destroy(); + } + }, + + // From now on bulk stuff - mainly helpers + + _trigger: function( type, event, ui ) { + ui = ui || this._uiHash(); + $.ui.plugin.call( this, type, [ event, ui, this ], true ); + + // Absolute position and offset (see #6884 ) have to be recalculated after plugins + if ( /^(drag|start|stop)/.test( type ) ) { + this.positionAbs = this._convertPositionTo( "absolute" ); + ui.offset = this.positionAbs; + } + return $.Widget.prototype._trigger.call( this, type, event, ui ); + }, + + plugins: {}, + + _uiHash: function() { + return { + helper: this.helper, + position: this.position, + originalPosition: this.originalPosition, + offset: this.positionAbs + }; + } + +} ); + +$.ui.plugin.add( "draggable", "connectToSortable", { + start: function( event, ui, draggable ) { + var uiSortable = $.extend( {}, ui, { + item: draggable.element + } ); + + draggable.sortables = []; + $( draggable.options.connectToSortable ).each( function() { + var sortable = $( this ).sortable( "instance" ); + + if ( sortable && !sortable.options.disabled ) { + draggable.sortables.push( sortable ); + + // RefreshPositions is called at drag start to refresh the containerCache + // which is used in drag. This ensures it's initialized and synchronized + // with any changes that might have happened on the page since initialization. + sortable.refreshPositions(); + sortable._trigger( "activate", event, uiSortable ); + } + } ); + }, + stop: function( event, ui, draggable ) { + var uiSortable = $.extend( {}, ui, { + item: draggable.element + } ); + + draggable.cancelHelperRemoval = false; + + $.each( draggable.sortables, function() { + var sortable = this; + + if ( sortable.isOver ) { + sortable.isOver = 0; + + // Allow this sortable to handle removing the helper + draggable.cancelHelperRemoval = true; + sortable.cancelHelperRemoval = false; + + // Use _storedCSS To restore properties in the sortable, + // as this also handles revert (#9675) since the draggable + // may have modified them in unexpected ways (#8809) + sortable._storedCSS = { + position: sortable.placeholder.css( "position" ), + top: sortable.placeholder.css( "top" ), + left: sortable.placeholder.css( "left" ) + }; + + sortable._mouseStop( event ); + + // Once drag has ended, the sortable should return to using + // its original helper, not the shared helper from draggable + sortable.options.helper = sortable.options._helper; + } else { + + // Prevent this Sortable from removing the helper. + // However, don't set the draggable to remove the helper + // either as another connected Sortable may yet handle the removal. + sortable.cancelHelperRemoval = true; + + sortable._trigger( "deactivate", event, uiSortable ); + } + } ); + }, + drag: function( event, ui, draggable ) { + $.each( draggable.sortables, function() { + var innermostIntersecting = false, + sortable = this; + + // Copy over variables that sortable's _intersectsWith uses + sortable.positionAbs = draggable.positionAbs; + sortable.helperProportions = draggable.helperProportions; + sortable.offset.click = draggable.offset.click; + + if ( sortable._intersectsWith( sortable.containerCache ) ) { + innermostIntersecting = true; + + $.each( draggable.sortables, function() { + + // Copy over variables that sortable's _intersectsWith uses + this.positionAbs = draggable.positionAbs; + this.helperProportions = draggable.helperProportions; + this.offset.click = draggable.offset.click; + + if ( this !== sortable && + this._intersectsWith( this.containerCache ) && + $.contains( sortable.element[ 0 ], this.element[ 0 ] ) ) { + innermostIntersecting = false; + } + + return innermostIntersecting; + } ); + } + + if ( innermostIntersecting ) { + + // If it intersects, we use a little isOver variable and set it once, + // so that the move-in stuff gets fired only once. + if ( !sortable.isOver ) { + sortable.isOver = 1; + + // Store draggable's parent in case we need to reappend to it later. + draggable._parent = ui.helper.parent(); + + sortable.currentItem = ui.helper + .appendTo( sortable.element ) + .data( "ui-sortable-item", true ); + + // Store helper option to later restore it + sortable.options._helper = sortable.options.helper; + + sortable.options.helper = function() { + return ui.helper[ 0 ]; + }; + + // Fire the start events of the sortable with our passed browser event, + // and our own helper (so it doesn't create a new one) + event.target = sortable.currentItem[ 0 ]; + sortable._mouseCapture( event, true ); + sortable._mouseStart( event, true, true ); + + // Because the browser event is way off the new appended portlet, + // modify necessary variables to reflect the changes + sortable.offset.click.top = draggable.offset.click.top; + sortable.offset.click.left = draggable.offset.click.left; + sortable.offset.parent.left -= draggable.offset.parent.left - + sortable.offset.parent.left; + sortable.offset.parent.top -= draggable.offset.parent.top - + sortable.offset.parent.top; + + draggable._trigger( "toSortable", event ); + + // Inform draggable that the helper is in a valid drop zone, + // used solely in the revert option to handle "valid/invalid". + draggable.dropped = sortable.element; + + // Need to refreshPositions of all sortables in the case that + // adding to one sortable changes the location of the other sortables (#9675) + $.each( draggable.sortables, function() { + this.refreshPositions(); + } ); + + // Hack so receive/update callbacks work (mostly) + draggable.currentItem = draggable.element; + sortable.fromOutside = draggable; + } + + if ( sortable.currentItem ) { + sortable._mouseDrag( event ); + + // Copy the sortable's position because the draggable's can potentially reflect + // a relative position, while sortable is always absolute, which the dragged + // element has now become. (#8809) + ui.position = sortable.position; + } + } else { + + // If it doesn't intersect with the sortable, and it intersected before, + // we fake the drag stop of the sortable, but make sure it doesn't remove + // the helper by using cancelHelperRemoval. + if ( sortable.isOver ) { + + sortable.isOver = 0; + sortable.cancelHelperRemoval = true; + + // Calling sortable's mouseStop would trigger a revert, + // so revert must be temporarily false until after mouseStop is called. + sortable.options._revert = sortable.options.revert; + sortable.options.revert = false; + + sortable._trigger( "out", event, sortable._uiHash( sortable ) ); + sortable._mouseStop( event, true ); + + // Restore sortable behaviors that were modfied + // when the draggable entered the sortable area (#9481) + sortable.options.revert = sortable.options._revert; + sortable.options.helper = sortable.options._helper; + + if ( sortable.placeholder ) { + sortable.placeholder.remove(); + } + + // Restore and recalculate the draggable's offset considering the sortable + // may have modified them in unexpected ways. (#8809, #10669) + ui.helper.appendTo( draggable._parent ); + draggable._refreshOffsets( event ); + ui.position = draggable._generatePosition( event, true ); + + draggable._trigger( "fromSortable", event ); + + // Inform draggable that the helper is no longer in a valid drop zone + draggable.dropped = false; + + // Need to refreshPositions of all sortables just in case removing + // from one sortable changes the location of other sortables (#9675) + $.each( draggable.sortables, function() { + this.refreshPositions(); + } ); + } + } + } ); + } +} ); + +$.ui.plugin.add( "draggable", "cursor", { + start: function( event, ui, instance ) { + var t = $( "body" ), + o = instance.options; + + if ( t.css( "cursor" ) ) { + o._cursor = t.css( "cursor" ); + } + t.css( "cursor", o.cursor ); + }, + stop: function( event, ui, instance ) { + var o = instance.options; + if ( o._cursor ) { + $( "body" ).css( "cursor", o._cursor ); + } + } +} ); + +$.ui.plugin.add( "draggable", "opacity", { + start: function( event, ui, instance ) { + var t = $( ui.helper ), + o = instance.options; + if ( t.css( "opacity" ) ) { + o._opacity = t.css( "opacity" ); + } + t.css( "opacity", o.opacity ); + }, + stop: function( event, ui, instance ) { + var o = instance.options; + if ( o._opacity ) { + $( ui.helper ).css( "opacity", o._opacity ); + } + } +} ); + +$.ui.plugin.add( "draggable", "scroll", { + start: function( event, ui, i ) { + if ( !i.scrollParentNotHidden ) { + i.scrollParentNotHidden = i.helper.scrollParent( false ); + } + + if ( i.scrollParentNotHidden[ 0 ] !== i.document[ 0 ] && + i.scrollParentNotHidden[ 0 ].tagName !== "HTML" ) { + i.overflowOffset = i.scrollParentNotHidden.offset(); + } + }, + drag: function( event, ui, i ) { + + var o = i.options, + scrolled = false, + scrollParent = i.scrollParentNotHidden[ 0 ], + document = i.document[ 0 ]; + + if ( scrollParent !== document && scrollParent.tagName !== "HTML" ) { + if ( !o.axis || o.axis !== "x" ) { + if ( ( i.overflowOffset.top + scrollParent.offsetHeight ) - event.pageY < + o.scrollSensitivity ) { + scrollParent.scrollTop = scrolled = scrollParent.scrollTop + o.scrollSpeed; + } else if ( event.pageY - i.overflowOffset.top < o.scrollSensitivity ) { + scrollParent.scrollTop = scrolled = scrollParent.scrollTop - o.scrollSpeed; + } + } + + if ( !o.axis || o.axis !== "y" ) { + if ( ( i.overflowOffset.left + scrollParent.offsetWidth ) - event.pageX < + o.scrollSensitivity ) { + scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft + o.scrollSpeed; + } else if ( event.pageX - i.overflowOffset.left < o.scrollSensitivity ) { + scrollParent.scrollLeft = scrolled = scrollParent.scrollLeft - o.scrollSpeed; + } + } + + } else { + + if ( !o.axis || o.axis !== "x" ) { + if ( event.pageY - $( document ).scrollTop() < o.scrollSensitivity ) { + scrolled = $( document ).scrollTop( $( document ).scrollTop() - o.scrollSpeed ); + } else if ( $( window ).height() - ( event.pageY - $( document ).scrollTop() ) < + o.scrollSensitivity ) { + scrolled = $( document ).scrollTop( $( document ).scrollTop() + o.scrollSpeed ); + } + } + + if ( !o.axis || o.axis !== "y" ) { + if ( event.pageX - $( document ).scrollLeft() < o.scrollSensitivity ) { + scrolled = $( document ).scrollLeft( + $( document ).scrollLeft() - o.scrollSpeed + ); + } else if ( $( window ).width() - ( event.pageX - $( document ).scrollLeft() ) < + o.scrollSensitivity ) { + scrolled = $( document ).scrollLeft( + $( document ).scrollLeft() + o.scrollSpeed + ); + } + } + + } + + if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) { + $.ui.ddmanager.prepareOffsets( i, event ); + } + + } +} ); + +$.ui.plugin.add( "draggable", "snap", { + start: function( event, ui, i ) { + + var o = i.options; + + i.snapElements = []; + + $( o.snap.constructor !== String ? ( o.snap.items || ":data(ui-draggable)" ) : o.snap ) + .each( function() { + var $t = $( this ), + $o = $t.offset(); + if ( this !== i.element[ 0 ] ) { + i.snapElements.push( { + item: this, + width: $t.outerWidth(), height: $t.outerHeight(), + top: $o.top, left: $o.left + } ); + } + } ); + + }, + drag: function( event, ui, inst ) { + + var ts, bs, ls, rs, l, r, t, b, i, first, + o = inst.options, + d = o.snapTolerance, + x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width, + y1 = ui.offset.top, y2 = y1 + inst.helperProportions.height; + + for ( i = inst.snapElements.length - 1; i >= 0; i-- ) { + + l = inst.snapElements[ i ].left - inst.margins.left; + r = l + inst.snapElements[ i ].width; + t = inst.snapElements[ i ].top - inst.margins.top; + b = t + inst.snapElements[ i ].height; + + if ( x2 < l - d || x1 > r + d || y2 < t - d || y1 > b + d || + !$.contains( inst.snapElements[ i ].item.ownerDocument, + inst.snapElements[ i ].item ) ) { + if ( inst.snapElements[ i ].snapping ) { + if ( inst.options.snap.release ) { + inst.options.snap.release.call( + inst.element, + event, + $.extend( inst._uiHash(), { snapItem: inst.snapElements[ i ].item } ) + ); + } + } + inst.snapElements[ i ].snapping = false; + continue; + } + + if ( o.snapMode !== "inner" ) { + ts = Math.abs( t - y2 ) <= d; + bs = Math.abs( b - y1 ) <= d; + ls = Math.abs( l - x2 ) <= d; + rs = Math.abs( r - x1 ) <= d; + if ( ts ) { + ui.position.top = inst._convertPositionTo( "relative", { + top: t - inst.helperProportions.height, + left: 0 + } ).top; + } + if ( bs ) { + ui.position.top = inst._convertPositionTo( "relative", { + top: b, + left: 0 + } ).top; + } + if ( ls ) { + ui.position.left = inst._convertPositionTo( "relative", { + top: 0, + left: l - inst.helperProportions.width + } ).left; + } + if ( rs ) { + ui.position.left = inst._convertPositionTo( "relative", { + top: 0, + left: r + } ).left; + } + } + + first = ( ts || bs || ls || rs ); + + if ( o.snapMode !== "outer" ) { + ts = Math.abs( t - y1 ) <= d; + bs = Math.abs( b - y2 ) <= d; + ls = Math.abs( l - x1 ) <= d; + rs = Math.abs( r - x2 ) <= d; + if ( ts ) { + ui.position.top = inst._convertPositionTo( "relative", { + top: t, + left: 0 + } ).top; + } + if ( bs ) { + ui.position.top = inst._convertPositionTo( "relative", { + top: b - inst.helperProportions.height, + left: 0 + } ).top; + } + if ( ls ) { + ui.position.left = inst._convertPositionTo( "relative", { + top: 0, + left: l + } ).left; + } + if ( rs ) { + ui.position.left = inst._convertPositionTo( "relative", { + top: 0, + left: r - inst.helperProportions.width + } ).left; + } + } + + if ( !inst.snapElements[ i ].snapping && ( ts || bs || ls || rs || first ) ) { + if ( inst.options.snap.snap ) { + inst.options.snap.snap.call( + inst.element, + event, + $.extend( inst._uiHash(), { + snapItem: inst.snapElements[ i ].item + } ) ); + } + } + inst.snapElements[ i ].snapping = ( ts || bs || ls || rs || first ); + + } + + } +} ); + +$.ui.plugin.add( "draggable", "stack", { + start: function( event, ui, instance ) { + var min, + o = instance.options, + group = $.makeArray( $( o.stack ) ).sort( function( a, b ) { + return ( parseInt( $( a ).css( "zIndex" ), 10 ) || 0 ) - + ( parseInt( $( b ).css( "zIndex" ), 10 ) || 0 ); + } ); + + if ( !group.length ) { + return; + } + + min = parseInt( $( group[ 0 ] ).css( "zIndex" ), 10 ) || 0; + $( group ).each( function( i ) { + $( this ).css( "zIndex", min + i ); + } ); + this.css( "zIndex", ( min + group.length ) ); + } +} ); + +$.ui.plugin.add( "draggable", "zIndex", { + start: function( event, ui, instance ) { + var t = $( ui.helper ), + o = instance.options; + + if ( t.css( "zIndex" ) ) { + o._zIndex = t.css( "zIndex" ); + } + t.css( "zIndex", o.zIndex ); + }, + stop: function( event, ui, instance ) { + var o = instance.options; + + if ( o._zIndex ) { + $( ui.helper ).css( "zIndex", o._zIndex ); + } + } +} ); + +var widgetsDraggable = $.ui.draggable; + + +/*! + * jQuery UI Droppable 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Droppable +//>>group: Interactions +//>>description: Enables drop targets for draggable elements. +//>>docs: https://api.jqueryui.com/droppable/ +//>>demos: https://jqueryui.com/droppable/ + + +$.widget( "ui.droppable", { + version: "1.14.1", + widgetEventPrefix: "drop", + options: { + accept: "*", + addClasses: true, + greedy: false, + scope: "default", + tolerance: "intersect", + + // Callbacks + activate: null, + deactivate: null, + drop: null, + out: null, + over: null + }, + _create: function() { + + var proportions, + o = this.options, + accept = o.accept; + + this.isover = false; + this.isout = true; + + this.accept = typeof accept === "function" ? accept : function( d ) { + return d.is( accept ); + }; + + this.proportions = function( /* valueToWrite */ ) { + if ( arguments.length ) { + + // Store the droppable's proportions + proportions = arguments[ 0 ]; + } else { + + // Retrieve or derive the droppable's proportions + return proportions ? + proportions : + proportions = { + width: this.element[ 0 ].offsetWidth, + height: this.element[ 0 ].offsetHeight + }; + } + }; + + this._addToManager( o.scope ); + + if ( o.addClasses ) { + this._addClass( "ui-droppable" ); + } + + }, + + _addToManager: function( scope ) { + + // Add the reference and positions to the manager + $.ui.ddmanager.droppables[ scope ] = $.ui.ddmanager.droppables[ scope ] || []; + $.ui.ddmanager.droppables[ scope ].push( this ); + }, + + _splice: function( drop ) { + var i = 0; + for ( ; i < drop.length; i++ ) { + if ( drop[ i ] === this ) { + drop.splice( i, 1 ); + } + } + }, + + _destroy: function() { + var drop = $.ui.ddmanager.droppables[ this.options.scope ]; + + this._splice( drop ); + }, + + _setOption: function( key, value ) { + + if ( key === "accept" ) { + this.accept = typeof value === "function" ? value : function( d ) { + return d.is( value ); + }; + } else if ( key === "scope" ) { + var drop = $.ui.ddmanager.droppables[ this.options.scope ]; + + this._splice( drop ); + this._addToManager( value ); + } + + this._super( key, value ); + }, + + _activate: function( event ) { + var draggable = $.ui.ddmanager.current; + + this._addActiveClass(); + if ( draggable ) { + this._trigger( "activate", event, this.ui( draggable ) ); + } + }, + + _deactivate: function( event ) { + var draggable = $.ui.ddmanager.current; + + this._removeActiveClass(); + if ( draggable ) { + this._trigger( "deactivate", event, this.ui( draggable ) ); + } + }, + + _over: function( event ) { + + var draggable = $.ui.ddmanager.current; + + // Bail if draggable and droppable are same element + if ( !draggable || ( draggable.currentItem || + draggable.element )[ 0 ] === this.element[ 0 ] ) { + return; + } + + if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || + draggable.element ) ) ) { + this._addHoverClass(); + this._trigger( "over", event, this.ui( draggable ) ); + } + + }, + + _out: function( event ) { + + var draggable = $.ui.ddmanager.current; + + // Bail if draggable and droppable are same element + if ( !draggable || ( draggable.currentItem || + draggable.element )[ 0 ] === this.element[ 0 ] ) { + return; + } + + if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem || + draggable.element ) ) ) { + this._removeHoverClass(); + this._trigger( "out", event, this.ui( draggable ) ); + } + + }, + + _drop: function( event, custom ) { + + var draggable = custom || $.ui.ddmanager.current, + childrenIntersection = false; + + // Bail if draggable and droppable are same element + if ( !draggable || ( draggable.currentItem || + draggable.element )[ 0 ] === this.element[ 0 ] ) { + return false; + } + + this.element + .find( ":data(ui-droppable)" ) + .not( ".ui-draggable-dragging" ) + .each( function() { + var inst = $( this ).droppable( "instance" ); + if ( + inst.options.greedy && + !inst.options.disabled && + inst.options.scope === draggable.options.scope && + inst.accept.call( + inst.element[ 0 ], ( draggable.currentItem || draggable.element ) + ) && + $.ui.intersect( + draggable, + $.extend( inst, { offset: inst.element.offset() } ), + inst.options.tolerance, event + ) + ) { + childrenIntersection = true; + return false; + } + } ); + if ( childrenIntersection ) { + return false; + } + + if ( this.accept.call( this.element[ 0 ], + ( draggable.currentItem || draggable.element ) ) ) { + this._removeActiveClass(); + this._removeHoverClass(); + + this._trigger( "drop", event, this.ui( draggable ) ); + return this.element; + } + + return false; + + }, + + ui: function( c ) { + return { + draggable: ( c.currentItem || c.element ), + helper: c.helper, + position: c.position, + offset: c.positionAbs + }; + }, + + // Extension points just to make backcompat sane and avoid duplicating logic + // TODO: Remove in 1.14 along with call to it below + _addHoverClass: function() { + this._addClass( "ui-droppable-hover" ); + }, + + _removeHoverClass: function() { + this._removeClass( "ui-droppable-hover" ); + }, + + _addActiveClass: function() { + this._addClass( "ui-droppable-active" ); + }, + + _removeActiveClass: function() { + this._removeClass( "ui-droppable-active" ); + } +} ); + +$.ui.intersect = ( function() { + function isOverAxis( x, reference, size ) { + return ( x >= reference ) && ( x < ( reference + size ) ); + } + + return function( draggable, droppable, toleranceMode, event ) { + + if ( !droppable.offset ) { + return false; + } + + var x1 = ( draggable.positionAbs || + draggable.position.absolute ).left + draggable.margins.left, + y1 = ( draggable.positionAbs || + draggable.position.absolute ).top + draggable.margins.top, + x2 = x1 + draggable.helperProportions.width, + y2 = y1 + draggable.helperProportions.height, + l = droppable.offset.left, + t = droppable.offset.top, + r = l + droppable.proportions().width, + b = t + droppable.proportions().height; + + switch ( toleranceMode ) { + case "fit": + return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b ); + case "intersect": + return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half + x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half + t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half + y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half + case "pointer": + return isOverAxis( event.pageY, t, droppable.proportions().height ) && + isOverAxis( event.pageX, l, droppable.proportions().width ); + case "touch": + return ( + ( y1 >= t && y1 <= b ) || // Top edge touching + ( y2 >= t && y2 <= b ) || // Bottom edge touching + ( y1 < t && y2 > b ) // Surrounded vertically + ) && ( + ( x1 >= l && x1 <= r ) || // Left edge touching + ( x2 >= l && x2 <= r ) || // Right edge touching + ( x1 < l && x2 > r ) // Surrounded horizontally + ); + default: + return false; + } + }; +} )(); + +/* + This manager tracks offsets of draggables and droppables +*/ +$.ui.ddmanager = { + current: null, + droppables: { "default": [] }, + prepareOffsets: function( t, event ) { + + var i, j, + m = $.ui.ddmanager.droppables[ t.options.scope ] || [], + type = event ? event.type : null, // workaround for #2317 + list = ( t.currentItem || t.element ).find( ":data(ui-droppable)" ).addBack(); + + droppablesLoop: for ( i = 0; i < m.length; i++ ) { + + // No disabled and non-accepted + if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ], + ( t.currentItem || t.element ) ) ) ) { + continue; + } + + // Filter out elements in the current dragged item + for ( j = 0; j < list.length; j++ ) { + if ( list[ j ] === m[ i ].element[ 0 ] ) { + m[ i ].proportions().height = 0; + continue droppablesLoop; + } + } + + m[ i ].visible = m[ i ].element.css( "display" ) !== "none"; + if ( !m[ i ].visible ) { + continue; + } + + // Activate the droppable if used directly from draggables + if ( type === "mousedown" ) { + m[ i ]._activate.call( m[ i ], event ); + } + + m[ i ].offset = m[ i ].element.offset(); + m[ i ].proportions( { + width: m[ i ].element[ 0 ].offsetWidth, + height: m[ i ].element[ 0 ].offsetHeight + } ); + + } + + }, + drop: function( draggable, event ) { + + var dropped = false; + + // Create a copy of the droppables in case the list changes during the drop (#9116) + $.each( ( $.ui.ddmanager.droppables[ draggable.options.scope ] || [] ).slice(), function() { + + if ( !this.options ) { + return; + } + if ( !this.options.disabled && this.visible && + $.ui.intersect( draggable, this, this.options.tolerance, event ) ) { + dropped = this._drop.call( this, event ) || dropped; + } + + if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ], + ( draggable.currentItem || draggable.element ) ) ) { + this.isout = true; + this.isover = false; + this._deactivate.call( this, event ); + } + + } ); + return dropped; + + }, + dragStart: function( draggable, event ) { + + // Listen for scrolling so that if the dragging causes scrolling the position of the + // droppables can be recalculated (see #5003) + draggable.element.parentsUntil( "body" ).on( "scroll.droppable", function() { + if ( !draggable.options.refreshPositions ) { + $.ui.ddmanager.prepareOffsets( draggable, event ); + } + } ); + }, + drag: function( draggable, event ) { + + // If you have a highly dynamic page, you might try this option. It renders positions + // every time you move the mouse. + if ( draggable.options.refreshPositions ) { + $.ui.ddmanager.prepareOffsets( draggable, event ); + } + + // Run through all droppables and check their positions based on specific tolerance options + $.each( $.ui.ddmanager.droppables[ draggable.options.scope ] || [], function() { + + if ( this.options.disabled || this.greedyChild || !this.visible ) { + return; + } + + var parentInstance, scope, parent, + intersects = $.ui.intersect( draggable, this, this.options.tolerance, event ), + c = !intersects && this.isover ? + "isout" : + ( intersects && !this.isover ? "isover" : null ); + if ( !c ) { + return; + } + + if ( this.options.greedy ) { + + // find droppable parents with same scope + scope = this.options.scope; + parent = this.element.parents( ":data(ui-droppable)" ).filter( function() { + return $( this ).droppable( "instance" ).options.scope === scope; + } ); + + if ( parent.length ) { + parentInstance = $( parent[ 0 ] ).droppable( "instance" ); + parentInstance.greedyChild = ( c === "isover" ); + } + } + + // We just moved into a greedy child + if ( parentInstance && c === "isover" ) { + parentInstance.isover = false; + parentInstance.isout = true; + parentInstance._out.call( parentInstance, event ); + } + + this[ c ] = true; + this[ c === "isout" ? "isover" : "isout" ] = false; + this[ c === "isover" ? "_over" : "_out" ].call( this, event ); + + // We just moved out of a greedy child + if ( parentInstance && c === "isout" ) { + parentInstance.isout = false; + parentInstance.isover = true; + parentInstance._over.call( parentInstance, event ); + } + } ); + + }, + dragStop: function( draggable, event ) { + draggable.element.parentsUntil( "body" ).off( "scroll.droppable" ); + + // Call prepareOffsets one final time since IE does not fire return scroll events when + // overflow was caused by drag (see #5003) + if ( !draggable.options.refreshPositions ) { + $.ui.ddmanager.prepareOffsets( draggable, event ); + } + } +}; + +// DEPRECATED +// TODO: switch return back to widget declaration at top of file when this is removed +if ( $.uiBackCompat === true ) { + + // Backcompat for activeClass and hoverClass options + $.widget( "ui.droppable", $.ui.droppable, { + options: { + hoverClass: false, + activeClass: false + }, + _addActiveClass: function() { + this._super(); + if ( this.options.activeClass ) { + this.element.addClass( this.options.activeClass ); + } + }, + _removeActiveClass: function() { + this._super(); + if ( this.options.activeClass ) { + this.element.removeClass( this.options.activeClass ); + } + }, + _addHoverClass: function() { + this._super(); + if ( this.options.hoverClass ) { + this.element.addClass( this.options.hoverClass ); + } + }, + _removeHoverClass: function() { + this._super(); + if ( this.options.hoverClass ) { + this.element.removeClass( this.options.hoverClass ); + } + } + } ); +} + +var widgetsDroppable = $.ui.droppable; + + +/*! + * jQuery UI Resizable 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Resizable +//>>group: Interactions +//>>description: Enables resize functionality for any element. +//>>docs: https://api.jqueryui.com/resizable/ +//>>demos: https://jqueryui.com/resizable/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/resizable.css +//>>css.theme: ../../themes/base/theme.css + + +$.widget( "ui.resizable", $.ui.mouse, { + version: "1.14.1", + widgetEventPrefix: "resize", + options: { + alsoResize: false, + animate: false, + animateDuration: "slow", + animateEasing: "swing", + aspectRatio: false, + autoHide: false, + classes: { + "ui-resizable-se": "ui-icon ui-icon-gripsmall-diagonal-se" + }, + containment: false, + ghost: false, + grid: false, + handles: "e,s,se", + helper: false, + maxHeight: null, + maxWidth: null, + minHeight: 10, + minWidth: 10, + + // See #7960 + zIndex: 90, + + // Callbacks + resize: null, + start: null, + stop: null + }, + + _num: function( value ) { + return parseFloat( value ) || 0; + }, + + _isNumber: function( value ) { + return !isNaN( parseFloat( value ) ); + }, + + _hasScroll: function( el, a ) { + + var scroll, + has = false, + overflow = $( el ).css( "overflow" ); + + if ( overflow === "hidden" ) { + return false; + } + if ( overflow === "scroll" ) { + return true; + } + + scroll = ( a && a === "left" ) ? "scrollLeft" : "scrollTop"; + + if ( el[ scroll ] > 0 ) { + return true; + } + + // TODO: determine which cases actually cause this to happen + // if the element doesn't have the scroll set, see if it's possible to + // set the scroll + try { + el[ scroll ] = 1; + has = ( el[ scroll ] > 0 ); + el[ scroll ] = 0; + } catch ( e ) { + + // `el` might be a string, then setting `scroll` will throw + // an error in strict mode; ignore it. + } + return has; + }, + + _create: function() { + + var margins, + o = this.options, + that = this; + this._addClass( "ui-resizable" ); + + $.extend( this, { + _aspectRatio: !!( o.aspectRatio ), + aspectRatio: o.aspectRatio, + originalElement: this.element, + _proportionallyResizeElements: [], + _helper: o.helper || o.ghost || o.animate ? o.helper || "ui-resizable-helper" : null + } ); + + // Wrap the element if it cannot hold child nodes + if ( this.element[ 0 ].nodeName.match( /^(canvas|textarea|input|select|button|img)$/i ) ) { + + this.element.wrap( + $( "
        " ).css( { + overflow: "hidden", + position: this.element.css( "position" ), + width: this.element.outerWidth(), + height: this.element.outerHeight(), + top: this.element.css( "top" ), + left: this.element.css( "left" ) + } ) + ); + + this.element = this.element.parent().data( + "ui-resizable", this.element.resizable( "instance" ) + ); + + this.elementIsWrapper = true; + + margins = { + marginTop: this.originalElement.css( "marginTop" ), + marginRight: this.originalElement.css( "marginRight" ), + marginBottom: this.originalElement.css( "marginBottom" ), + marginLeft: this.originalElement.css( "marginLeft" ) + }; + + this.element.css( margins ); + + // Support: Safari + // Prevent Safari textarea resize + this.originalResizeStyle = this.originalElement.css( "resize" ); + this.originalElement.css( "resize", "none" ); + + this._proportionallyResizeElements.push( this.originalElement.css( { + position: "static", + zoom: 1, + display: "block" + } ) ); + + this._proportionallyResize(); + } + + this._setupHandles(); + + if ( o.autoHide ) { + $( this.element ) + .on( "mouseenter", function() { + if ( o.disabled ) { + return; + } + that._removeClass( "ui-resizable-autohide" ); + that._handles.show(); + } ) + .on( "mouseleave", function() { + if ( o.disabled ) { + return; + } + if ( !that.resizing ) { + that._addClass( "ui-resizable-autohide" ); + that._handles.hide(); + } + } ); + } + + this._mouseInit(); + }, + + _destroy: function() { + + this._mouseDestroy(); + this._addedHandles.remove(); + + var wrapper, + _destroy = function( exp ) { + $( exp ) + .removeData( "resizable" ) + .removeData( "ui-resizable" ) + .off( ".resizable" ); + }; + + // TODO: Unwrap at same DOM position + if ( this.elementIsWrapper ) { + _destroy( this.element ); + wrapper = this.element; + this.originalElement.css( { + position: wrapper.css( "position" ), + width: wrapper.outerWidth(), + height: wrapper.outerHeight(), + top: wrapper.css( "top" ), + left: wrapper.css( "left" ) + } ).insertAfter( wrapper ); + wrapper.remove(); + } + + this.originalElement.css( "resize", this.originalResizeStyle ); + _destroy( this.originalElement ); + + return this; + }, + + _setOption: function( key, value ) { + this._super( key, value ); + + switch ( key ) { + case "handles": + this._removeHandles(); + this._setupHandles(); + break; + case "aspectRatio": + this._aspectRatio = !!value; + break; + default: + break; + } + }, + + _setupHandles: function() { + var o = this.options, handle, i, n, hname, axis, that = this; + this.handles = o.handles || + ( !$( ".ui-resizable-handle", this.element ).length ? + "e,s,se" : { + n: ".ui-resizable-n", + e: ".ui-resizable-e", + s: ".ui-resizable-s", + w: ".ui-resizable-w", + se: ".ui-resizable-se", + sw: ".ui-resizable-sw", + ne: ".ui-resizable-ne", + nw: ".ui-resizable-nw" + } ); + + this._handles = $(); + this._addedHandles = $(); + if ( this.handles.constructor === String ) { + + if ( this.handles === "all" ) { + this.handles = "n,e,s,w,se,sw,ne,nw"; + } + + n = this.handles.split( "," ); + this.handles = {}; + + for ( i = 0; i < n.length; i++ ) { + + handle = String.prototype.trim.call( n[ i ] ); + hname = "ui-resizable-" + handle; + axis = $( "
        " ); + this._addClass( axis, "ui-resizable-handle " + hname ); + + axis.css( { zIndex: o.zIndex } ); + + this.handles[ handle ] = ".ui-resizable-" + handle; + if ( !this.element.children( this.handles[ handle ] ).length ) { + this.element.append( axis ); + this._addedHandles = this._addedHandles.add( axis ); + } + } + + } + + this._renderAxis = function( target ) { + + var i, axis, padPos, padWrapper; + + target = target || this.element; + + for ( i in this.handles ) { + + if ( this.handles[ i ].constructor === String ) { + this.handles[ i ] = this.element.children( this.handles[ i ] ).first().show(); + } else if ( this.handles[ i ].jquery || this.handles[ i ].nodeType ) { + this.handles[ i ] = $( this.handles[ i ] ); + this._on( this.handles[ i ], { "mousedown": that._mouseDown } ); + } + + if ( this.elementIsWrapper && + this.originalElement[ 0 ] + .nodeName + .match( /^(textarea|input|select|button)$/i ) ) { + axis = $( this.handles[ i ], this.element ); + + padWrapper = /sw|ne|nw|se|n|s/.test( i ) ? + axis.outerHeight() : + axis.outerWidth(); + + padPos = [ "padding", + /ne|nw|n/.test( i ) ? "Top" : + /se|sw|s/.test( i ) ? "Bottom" : + /^e$/.test( i ) ? "Right" : "Left" ].join( "" ); + + target.css( padPos, padWrapper ); + + this._proportionallyResize(); + } + + this._handles = this._handles.add( this.handles[ i ] ); + } + }; + + // TODO: make renderAxis a prototype function + this._renderAxis( this.element ); + + this._handles = this._handles.add( this.element.find( ".ui-resizable-handle" ) ); + this._handles.disableSelection(); + + this._handles.on( "mouseover", function() { + if ( !that.resizing ) { + if ( this.className ) { + axis = this.className.match( /ui-resizable-(se|sw|ne|nw|n|e|s|w)/i ); + } + that.axis = axis && axis[ 1 ] ? axis[ 1 ] : "se"; + } + } ); + + if ( o.autoHide ) { + this._handles.hide(); + this._addClass( "ui-resizable-autohide" ); + } + }, + + _removeHandles: function() { + this._addedHandles.remove(); + }, + + _mouseCapture: function( event ) { + var i, handle, + capture = false; + + for ( i in this.handles ) { + handle = $( this.handles[ i ] )[ 0 ]; + if ( handle === event.target || $.contains( handle, event.target ) ) { + capture = true; + } + } + + return !this.options.disabled && capture; + }, + + _mouseStart: function( event ) { + + var curleft, curtop, cursor, calculatedSize, + o = this.options, + el = this.element; + + this.resizing = true; + + this._renderProxy(); + + curleft = this._num( this.helper.css( "left" ) ); + curtop = this._num( this.helper.css( "top" ) ); + + if ( o.containment ) { + curleft += $( o.containment ).scrollLeft() || 0; + curtop += $( o.containment ).scrollTop() || 0; + } + + this.offset = this.helper.offset(); + this.position = { left: curleft, top: curtop }; + + if ( !this._helper ) { + calculatedSize = this._calculateAdjustedElementDimensions( el ); + } + + this.size = this._helper ? { + width: this.helper.width(), + height: this.helper.height() + } : { + width: calculatedSize.width, + height: calculatedSize.height + }; + + this.originalSize = this._helper ? { + width: el.outerWidth(), + height: el.outerHeight() + } : { + width: calculatedSize.width, + height: calculatedSize.height + }; + + this.sizeDiff = { + width: el.outerWidth() - el.width(), + height: el.outerHeight() - el.height() + }; + + this.originalPosition = { left: curleft, top: curtop }; + this.originalMousePosition = { left: event.pageX, top: event.pageY }; + + this.aspectRatio = ( typeof o.aspectRatio === "number" ) ? + o.aspectRatio : + ( ( this.originalSize.width / this.originalSize.height ) || 1 ); + + cursor = $( ".ui-resizable-" + this.axis ).css( "cursor" ); + $( "body" ).css( "cursor", cursor === "auto" ? this.axis + "-resize" : cursor ); + + this._addClass( "ui-resizable-resizing" ); + this._propagate( "start", event ); + return true; + }, + + _mouseDrag: function( event ) { + + var data, props, + smp = this.originalMousePosition, + a = this.axis, + dx = ( event.pageX - smp.left ) || 0, + dy = ( event.pageY - smp.top ) || 0, + trigger = this._change[ a ]; + + this._updatePrevProperties(); + + if ( !trigger ) { + return false; + } + + data = trigger.apply( this, [ event, dx, dy ] ); + + this._updateVirtualBoundaries( event.shiftKey ); + if ( this._aspectRatio || event.shiftKey ) { + data = this._updateRatio( data, event ); + } + + data = this._respectSize( data, event ); + + this._updateCache( data ); + + this._propagate( "resize", event ); + + props = this._applyChanges(); + + if ( !this._helper && this._proportionallyResizeElements.length ) { + this._proportionallyResize(); + } + + if ( !$.isEmptyObject( props ) ) { + this._updatePrevProperties(); + this._trigger( "resize", event, this.ui() ); + this._applyChanges(); + } + + return false; + }, + + _mouseStop: function( event ) { + + this.resizing = false; + var pr, ista, soffseth, soffsetw, s, left, top, + o = this.options, that = this; + + if ( this._helper ) { + + pr = this._proportionallyResizeElements; + ista = pr.length && ( /textarea/i ).test( pr[ 0 ].nodeName ); + soffseth = ista && this._hasScroll( pr[ 0 ], "left" ) ? 0 : that.sizeDiff.height; + soffsetw = ista ? 0 : that.sizeDiff.width; + + s = { + width: ( that.helper.width() - soffsetw ), + height: ( that.helper.height() - soffseth ) + }; + left = ( parseFloat( that.element.css( "left" ) ) + + ( that.position.left - that.originalPosition.left ) ) || null; + top = ( parseFloat( that.element.css( "top" ) ) + + ( that.position.top - that.originalPosition.top ) ) || null; + + if ( !o.animate ) { + this.element.css( $.extend( s, { top: top, left: left } ) ); + } + + that.helper.height( that.size.height ); + that.helper.width( that.size.width ); + + if ( this._helper && !o.animate ) { + this._proportionallyResize(); + } + } + + $( "body" ).css( "cursor", "auto" ); + + this._removeClass( "ui-resizable-resizing" ); + + this._propagate( "stop", event ); + + if ( this._helper ) { + this.helper.remove(); + } + + return false; + + }, + + _updatePrevProperties: function() { + this.prevPosition = { + top: this.position.top, + left: this.position.left + }; + this.prevSize = { + width: this.size.width, + height: this.size.height + }; + }, + + _applyChanges: function() { + var props = {}; + + if ( this.position.top !== this.prevPosition.top ) { + props.top = this.position.top + "px"; + } + if ( this.position.left !== this.prevPosition.left ) { + props.left = this.position.left + "px"; + } + + this.helper.css( props ); + + if ( this.size.width !== this.prevSize.width ) { + props.width = this.size.width + "px"; + this.helper.width( props.width ); + } + if ( this.size.height !== this.prevSize.height ) { + props.height = this.size.height + "px"; + this.helper.height( props.height ); + } + + return props; + }, + + _updateVirtualBoundaries: function( forceAspectRatio ) { + var pMinWidth, pMaxWidth, pMinHeight, pMaxHeight, b, + o = this.options; + + b = { + minWidth: this._isNumber( o.minWidth ) ? o.minWidth : 0, + maxWidth: this._isNumber( o.maxWidth ) ? o.maxWidth : Infinity, + minHeight: this._isNumber( o.minHeight ) ? o.minHeight : 0, + maxHeight: this._isNumber( o.maxHeight ) ? o.maxHeight : Infinity + }; + + if ( this._aspectRatio || forceAspectRatio ) { + pMinWidth = b.minHeight * this.aspectRatio; + pMinHeight = b.minWidth / this.aspectRatio; + pMaxWidth = b.maxHeight * this.aspectRatio; + pMaxHeight = b.maxWidth / this.aspectRatio; + + if ( pMinWidth > b.minWidth ) { + b.minWidth = pMinWidth; + } + if ( pMinHeight > b.minHeight ) { + b.minHeight = pMinHeight; + } + if ( pMaxWidth < b.maxWidth ) { + b.maxWidth = pMaxWidth; + } + if ( pMaxHeight < b.maxHeight ) { + b.maxHeight = pMaxHeight; + } + } + this._vBoundaries = b; + }, + + _updateCache: function( data ) { + this.offset = this.helper.offset(); + if ( this._isNumber( data.left ) ) { + this.position.left = data.left; + } + if ( this._isNumber( data.top ) ) { + this.position.top = data.top; + } + if ( this._isNumber( data.height ) ) { + this.size.height = data.height; + } + if ( this._isNumber( data.width ) ) { + this.size.width = data.width; + } + }, + + _updateRatio: function( data ) { + + var cpos = this.position, + csize = this.size, + a = this.axis; + + if ( this._isNumber( data.height ) ) { + data.width = ( data.height * this.aspectRatio ); + } else if ( this._isNumber( data.width ) ) { + data.height = ( data.width / this.aspectRatio ); + } + + if ( a === "sw" ) { + data.left = cpos.left + ( csize.width - data.width ); + data.top = null; + } + if ( a === "nw" ) { + data.top = cpos.top + ( csize.height - data.height ); + data.left = cpos.left + ( csize.width - data.width ); + } + + return data; + }, + + _respectSize: function( data ) { + + var o = this._vBoundaries, + a = this.axis, + ismaxw = this._isNumber( data.width ) && o.maxWidth && ( o.maxWidth < data.width ), + ismaxh = this._isNumber( data.height ) && o.maxHeight && ( o.maxHeight < data.height ), + isminw = this._isNumber( data.width ) && o.minWidth && ( o.minWidth > data.width ), + isminh = this._isNumber( data.height ) && o.minHeight && ( o.minHeight > data.height ), + dw = this.originalPosition.left + this.originalSize.width, + dh = this.originalPosition.top + this.originalSize.height, + cw = /sw|nw|w/.test( a ), ch = /nw|ne|n/.test( a ); + if ( isminw ) { + data.width = o.minWidth; + } + if ( isminh ) { + data.height = o.minHeight; + } + if ( ismaxw ) { + data.width = o.maxWidth; + } + if ( ismaxh ) { + data.height = o.maxHeight; + } + + if ( isminw && cw ) { + data.left = dw - o.minWidth; + } + if ( ismaxw && cw ) { + data.left = dw - o.maxWidth; + } + if ( isminh && ch ) { + data.top = dh - o.minHeight; + } + if ( ismaxh && ch ) { + data.top = dh - o.maxHeight; + } + + // Fixing jump error on top/left - bug #2330 + if ( !data.width && !data.height && !data.left && data.top ) { + data.top = null; + } else if ( !data.width && !data.height && !data.top && data.left ) { + data.left = null; + } + + return data; + }, + + _getPaddingPlusBorderDimensions: function( element ) { + var i = 0, + widths = [], + borders = [ + element.css( "borderTopWidth" ), + element.css( "borderRightWidth" ), + element.css( "borderBottomWidth" ), + element.css( "borderLeftWidth" ) + ], + paddings = [ + element.css( "paddingTop" ), + element.css( "paddingRight" ), + element.css( "paddingBottom" ), + element.css( "paddingLeft" ) + ]; + + for ( ; i < 4; i++ ) { + widths[ i ] = ( parseFloat( borders[ i ] ) || 0 ); + widths[ i ] += ( parseFloat( paddings[ i ] ) || 0 ); + } + + return { + height: widths[ 0 ] + widths[ 2 ], + width: widths[ 1 ] + widths[ 3 ] + }; + }, + + _calculateAdjustedElementDimensions: function( element ) { + var elWidth, elHeight, paddingBorder, + ce = element.get( 0 ); + + if ( element.css( "box-sizing" ) !== "content-box" || + ( !this._hasScroll( ce ) && !this._hasScroll( ce, "left" ) ) ) { + return { + height: parseFloat( element.css( "height" ) ), + width: parseFloat( element.css( "width" ) ) + }; + } + + // Check if CSS inline styles are set and use those (usually from previous resizes) + elWidth = parseFloat( ce.style.width ); + elHeight = parseFloat( ce.style.height ); + + paddingBorder = this._getPaddingPlusBorderDimensions( element ); + elWidth = isNaN( elWidth ) ? + this._getElementTheoreticalSize( element, paddingBorder, "width" ) : + elWidth; + elHeight = isNaN( elHeight ) ? + this._getElementTheoreticalSize( element, paddingBorder, "height" ) : + elHeight; + + return { + height: elHeight, + width: elWidth + }; + }, + + _getElementTheoreticalSize: function( element, extraSize, dimension ) { + + // offsetWidth/offsetHeight is a rounded sum of content, padding, scroll gutter, and border + var size = Math.max( 0, Math.ceil( + element.get( 0 )[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] - + extraSize[ dimension ] - + 0.5 + + // If offsetWidth/offsetHeight is unknown, then we can't determine theoretical size. + // Use an explicit zero to avoid NaN. + // See https://github.com/jquery/jquery/issues/3964 + ) ) || 0; + + return size; + }, + + _proportionallyResize: function() { + + if ( !this._proportionallyResizeElements.length ) { + return; + } + + var prel, + i = 0, + element = this.helper || this.element; + + for ( ; i < this._proportionallyResizeElements.length; i++ ) { + + prel = this._proportionallyResizeElements[ i ]; + + // TODO: Seems like a bug to cache this.outerDimensions + // considering that we are in a loop. + if ( !this.outerDimensions ) { + this.outerDimensions = this._getPaddingPlusBorderDimensions( prel ); + } + + prel.css( { + height: ( element.height() - this.outerDimensions.height ) || 0, + width: ( element.width() - this.outerDimensions.width ) || 0 + } ); + + } + + }, + + _renderProxy: function() { + + var el = this.element, o = this.options; + this.elementOffset = el.offset(); + + if ( this._helper ) { + + this.helper = this.helper || $( "
        " ).css( { overflow: "hidden" } ); + + this._addClass( this.helper, this._helper ); + this.helper.css( { + width: this.element.outerWidth(), + height: this.element.outerHeight(), + position: "absolute", + left: this.elementOffset.left + "px", + top: this.elementOffset.top + "px", + zIndex: ++o.zIndex //TODO: Don't modify option + } ); + + this.helper + .appendTo( "body" ) + .disableSelection(); + + } else { + this.helper = this.element; + } + + }, + + _change: { + e: function( event, dx ) { + return { width: this.originalSize.width + dx }; + }, + w: function( event, dx ) { + var cs = this.originalSize, sp = this.originalPosition; + return { left: sp.left + dx, width: cs.width - dx }; + }, + n: function( event, dx, dy ) { + var cs = this.originalSize, sp = this.originalPosition; + return { top: sp.top + dy, height: cs.height - dy }; + }, + s: function( event, dx, dy ) { + return { height: this.originalSize.height + dy }; + }, + se: function( event, dx, dy ) { + return $.extend( this._change.s.apply( this, arguments ), + this._change.e.apply( this, [ event, dx, dy ] ) ); + }, + sw: function( event, dx, dy ) { + return $.extend( this._change.s.apply( this, arguments ), + this._change.w.apply( this, [ event, dx, dy ] ) ); + }, + ne: function( event, dx, dy ) { + return $.extend( this._change.n.apply( this, arguments ), + this._change.e.apply( this, [ event, dx, dy ] ) ); + }, + nw: function( event, dx, dy ) { + return $.extend( this._change.n.apply( this, arguments ), + this._change.w.apply( this, [ event, dx, dy ] ) ); + } + }, + + _propagate: function( n, event ) { + $.ui.plugin.call( this, n, [ event, this.ui() ] ); + if ( n !== "resize" ) { + this._trigger( n, event, this.ui() ); + } + }, + + plugins: {}, + + ui: function() { + return { + originalElement: this.originalElement, + element: this.element, + helper: this.helper, + position: this.position, + size: this.size, + originalSize: this.originalSize, + originalPosition: this.originalPosition + }; + } + +} ); + +/* + * Resizable Extensions + */ + +$.ui.plugin.add( "resizable", "animate", { + + stop: function( event ) { + var that = $( this ).resizable( "instance" ), + o = that.options, + pr = that._proportionallyResizeElements, + ista = pr.length && ( /textarea/i ).test( pr[ 0 ].nodeName ), + soffseth = ista && that._hasScroll( pr[ 0 ], "left" ) ? 0 : that.sizeDiff.height, + soffsetw = ista ? 0 : that.sizeDiff.width, + style = { + width: ( that.size.width - soffsetw ), + height: ( that.size.height - soffseth ) + }, + left = ( parseFloat( that.element.css( "left" ) ) + + ( that.position.left - that.originalPosition.left ) ) || null, + top = ( parseFloat( that.element.css( "top" ) ) + + ( that.position.top - that.originalPosition.top ) ) || null; + + that.element.animate( + $.extend( style, top && left ? { top: top, left: left } : {} ), { + duration: o.animateDuration, + easing: o.animateEasing, + step: function() { + + var data = { + width: parseFloat( that.element.css( "width" ) ), + height: parseFloat( that.element.css( "height" ) ), + top: parseFloat( that.element.css( "top" ) ), + left: parseFloat( that.element.css( "left" ) ) + }; + + if ( pr && pr.length ) { + $( pr[ 0 ] ).css( { width: data.width, height: data.height } ); + } + + // Propagating resize, and updating values for each animation step + that._updateCache( data ); + that._propagate( "resize", event ); + + } + } + ); + } + +} ); + +$.ui.plugin.add( "resizable", "containment", { + + start: function() { + var element, p, co, ch, cw, width, height, + that = $( this ).resizable( "instance" ), + o = that.options, + el = that.element, + oc = o.containment, + ce = ( oc instanceof $ ) ? + oc.get( 0 ) : + ( /parent/.test( oc ) ) ? el.parent().get( 0 ) : oc; + + if ( !ce ) { + return; + } + + that.containerElement = $( ce ); + + if ( /document/.test( oc ) || oc === document ) { + that.containerOffset = { + left: 0, + top: 0 + }; + that.containerPosition = { + left: 0, + top: 0 + }; + + that.parentData = { + element: $( document ), + left: 0, + top: 0, + width: $( document ).width(), + height: $( document ).height() || document.body.parentNode.scrollHeight + }; + } else { + element = $( ce ); + p = []; + $( [ "Top", "Right", "Left", "Bottom" ] ).each( function( i, name ) { + p[ i ] = that._num( element.css( "padding" + name ) ); + } ); + + that.containerOffset = element.offset(); + that.containerPosition = element.position(); + that.containerSize = { + height: ( element.innerHeight() - p[ 3 ] ), + width: ( element.innerWidth() - p[ 1 ] ) + }; + + co = that.containerOffset; + ch = that.containerSize.height; + cw = that.containerSize.width; + width = ( that._hasScroll( ce, "left" ) ? ce.scrollWidth : cw ); + height = ( that._hasScroll( ce ) ? ce.scrollHeight : ch ); + + that.parentData = { + element: ce, + left: co.left, + top: co.top, + width: width, + height: height + }; + } + }, + + resize: function( event ) { + var woset, hoset, isParent, isOffsetRelative, + that = $( this ).resizable( "instance" ), + o = that.options, + co = that.containerOffset, + cp = that.position, + pRatio = that._aspectRatio || event.shiftKey, + cop = { + top: 0, + left: 0 + }, + ce = that.containerElement, + continueResize = true; + + if ( ce[ 0 ] !== document && ( /static/ ).test( ce.css( "position" ) ) ) { + cop = co; + } + + if ( cp.left < ( that._helper ? co.left : 0 ) ) { + that.size.width = that.size.width + + ( that._helper ? + ( that.position.left - co.left ) : + ( that.position.left - cop.left ) ); + + if ( pRatio ) { + that.size.height = that.size.width / that.aspectRatio; + continueResize = false; + } + that.position.left = o.helper ? co.left : 0; + } + + if ( cp.top < ( that._helper ? co.top : 0 ) ) { + that.size.height = that.size.height + + ( that._helper ? + ( that.position.top - co.top ) : + that.position.top ); + + if ( pRatio ) { + that.size.width = that.size.height * that.aspectRatio; + continueResize = false; + } + that.position.top = that._helper ? co.top : 0; + } + + isParent = that.containerElement.get( 0 ) === that.element.parent().get( 0 ); + isOffsetRelative = /relative|absolute/.test( that.containerElement.css( "position" ) ); + + if ( isParent && isOffsetRelative ) { + that.offset.left = that.parentData.left + that.position.left; + that.offset.top = that.parentData.top + that.position.top; + } else { + that.offset.left = that.element.offset().left; + that.offset.top = that.element.offset().top; + } + + woset = Math.abs( that.sizeDiff.width + + ( that._helper ? + that.offset.left - cop.left : + ( that.offset.left - co.left ) ) ); + + hoset = Math.abs( that.sizeDiff.height + + ( that._helper ? + that.offset.top - cop.top : + ( that.offset.top - co.top ) ) ); + + if ( woset + that.size.width >= that.parentData.width ) { + that.size.width = that.parentData.width - woset; + if ( pRatio ) { + that.size.height = that.size.width / that.aspectRatio; + continueResize = false; + } + } + + if ( hoset + that.size.height >= that.parentData.height ) { + that.size.height = that.parentData.height - hoset; + if ( pRatio ) { + that.size.width = that.size.height * that.aspectRatio; + continueResize = false; + } + } + + if ( !continueResize ) { + that.position.left = that.prevPosition.left; + that.position.top = that.prevPosition.top; + that.size.width = that.prevSize.width; + that.size.height = that.prevSize.height; + } + }, + + stop: function() { + var that = $( this ).resizable( "instance" ), + o = that.options, + co = that.containerOffset, + cop = that.containerPosition, + ce = that.containerElement, + helper = $( that.helper ), + ho = helper.offset(), + w = helper.outerWidth() - that.sizeDiff.width, + h = helper.outerHeight() - that.sizeDiff.height; + + if ( that._helper && !o.animate && ( /relative/ ).test( ce.css( "position" ) ) ) { + $( this ).css( { + left: ho.left - cop.left - co.left, + width: w, + height: h + } ); + } + + if ( that._helper && !o.animate && ( /static/ ).test( ce.css( "position" ) ) ) { + $( this ).css( { + left: ho.left - cop.left - co.left, + width: w, + height: h + } ); + } + } +} ); + +$.ui.plugin.add( "resizable", "alsoResize", { + + start: function() { + var that = $( this ).resizable( "instance" ), + o = that.options; + + $( o.alsoResize ).each( function() { + var el = $( this ), + elSize = that._calculateAdjustedElementDimensions( el ); + + el.data( "ui-resizable-alsoresize", { + width: elSize.width, height: elSize.height, + left: parseFloat( el.css( "left" ) ), top: parseFloat( el.css( "top" ) ) + } ); + } ); + }, + + resize: function( event, ui ) { + var that = $( this ).resizable( "instance" ), + o = that.options, + os = that.originalSize, + op = that.originalPosition, + delta = { + height: ( that.size.height - os.height ) || 0, + width: ( that.size.width - os.width ) || 0, + top: ( that.position.top - op.top ) || 0, + left: ( that.position.left - op.left ) || 0 + }; + + $( o.alsoResize ).each( function() { + var el = $( this ), start = $( this ).data( "ui-resizable-alsoresize" ), style = {}, + css = el.parents( ui.originalElement[ 0 ] ).length ? + [ "width", "height" ] : + [ "width", "height", "top", "left" ]; + + $.each( css, function( i, prop ) { + var sum = ( start[ prop ] || 0 ) + ( delta[ prop ] || 0 ); + if ( sum && sum >= 0 ) { + style[ prop ] = sum || null; + } + } ); + + el.css( style ); + } ); + }, + + stop: function() { + $( this ).removeData( "ui-resizable-alsoresize" ); + } +} ); + +$.ui.plugin.add( "resizable", "ghost", { + + start: function() { + + var that = $( this ).resizable( "instance" ), cs = that.size; + + that.ghost = that.originalElement.clone(); + that.ghost.css( { + opacity: 0.25, + display: "block", + position: "relative", + height: cs.height, + width: cs.width, + margin: 0, + left: 0, + top: 0 + } ); + + that._addClass( that.ghost, "ui-resizable-ghost" ); + + // DEPRECATED + // TODO: remove after 1.12 + if ( $.uiBackCompat === true && typeof that.options.ghost === "string" ) { + + // Ghost option + that.ghost.addClass( this.options.ghost ); + } + + that.ghost.appendTo( that.helper ); + + }, + + resize: function() { + var that = $( this ).resizable( "instance" ); + if ( that.ghost ) { + that.ghost.css( { + position: "relative", + height: that.size.height, + width: that.size.width + } ); + } + }, + + stop: function() { + var that = $( this ).resizable( "instance" ); + if ( that.ghost && that.helper ) { + that.helper.get( 0 ).removeChild( that.ghost.get( 0 ) ); + } + } + +} ); + +$.ui.plugin.add( "resizable", "grid", { + + resize: function() { + var outerDimensions, + that = $( this ).resizable( "instance" ), + o = that.options, + cs = that.size, + os = that.originalSize, + op = that.originalPosition, + a = that.axis, + grid = typeof o.grid === "number" ? [ o.grid, o.grid ] : o.grid, + gridX = ( grid[ 0 ] || 1 ), + gridY = ( grid[ 1 ] || 1 ), + ox = Math.round( ( cs.width - os.width ) / gridX ) * gridX, + oy = Math.round( ( cs.height - os.height ) / gridY ) * gridY, + newWidth = os.width + ox, + newHeight = os.height + oy, + isMaxWidth = o.maxWidth && ( o.maxWidth < newWidth ), + isMaxHeight = o.maxHeight && ( o.maxHeight < newHeight ), + isMinWidth = o.minWidth && ( o.minWidth > newWidth ), + isMinHeight = o.minHeight && ( o.minHeight > newHeight ); + + o.grid = grid; + + if ( isMinWidth ) { + newWidth += gridX; + } + if ( isMinHeight ) { + newHeight += gridY; + } + if ( isMaxWidth ) { + newWidth -= gridX; + } + if ( isMaxHeight ) { + newHeight -= gridY; + } + + if ( /^(se|s|e)$/.test( a ) ) { + that.size.width = newWidth; + that.size.height = newHeight; + } else if ( /^(ne)$/.test( a ) ) { + that.size.width = newWidth; + that.size.height = newHeight; + that.position.top = op.top - oy; + } else if ( /^(sw)$/.test( a ) ) { + that.size.width = newWidth; + that.size.height = newHeight; + that.position.left = op.left - ox; + } else { + if ( newHeight - gridY <= 0 || newWidth - gridX <= 0 ) { + outerDimensions = that._getPaddingPlusBorderDimensions( this ); + } + + if ( newHeight - gridY > 0 ) { + that.size.height = newHeight; + that.position.top = op.top - oy; + } else { + newHeight = gridY - outerDimensions.height; + that.size.height = newHeight; + that.position.top = op.top + os.height - newHeight; + } + if ( newWidth - gridX > 0 ) { + that.size.width = newWidth; + that.position.left = op.left - ox; + } else { + newWidth = gridX - outerDimensions.width; + that.size.width = newWidth; + that.position.left = op.left + os.width - newWidth; + } + } + } + +} ); + +var widgetsResizable = $.ui.resizable; + + +/*! + * jQuery UI Selectable 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Selectable +//>>group: Interactions +//>>description: Allows groups of elements to be selected with the mouse. +//>>docs: https://api.jqueryui.com/selectable/ +//>>demos: https://jqueryui.com/selectable/ +//>>css.structure: ../../themes/base/selectable.css + + +var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, { + version: "1.14.1", + options: { + appendTo: "body", + autoRefresh: true, + distance: 0, + filter: "*", + tolerance: "touch", + + // Callbacks + selected: null, + selecting: null, + start: null, + stop: null, + unselected: null, + unselecting: null + }, + _create: function() { + var that = this; + + this._addClass( "ui-selectable" ); + + this.dragged = false; + + // Cache selectee children based on filter + this.refresh = function() { + that.elementPos = $( that.element[ 0 ] ).offset(); + that.selectees = $( that.options.filter, that.element[ 0 ] ); + that._addClass( that.selectees, "ui-selectee" ); + that.selectees.each( function() { + var $this = $( this ), + selecteeOffset = $this.offset(), + pos = { + left: selecteeOffset.left - that.elementPos.left, + top: selecteeOffset.top - that.elementPos.top + }; + $.data( this, "selectable-item", { + element: this, + $element: $this, + left: pos.left, + top: pos.top, + right: pos.left + $this.outerWidth(), + bottom: pos.top + $this.outerHeight(), + startselected: false, + selected: $this.hasClass( "ui-selected" ), + selecting: $this.hasClass( "ui-selecting" ), + unselecting: $this.hasClass( "ui-unselecting" ) + } ); + } ); + }; + this.refresh(); + + this._mouseInit(); + + this.helper = $( "
        " ); + this._addClass( this.helper, "ui-selectable-helper" ); + }, + + _destroy: function() { + this.selectees.removeData( "selectable-item" ); + this._mouseDestroy(); + }, + + _mouseStart: function( event ) { + var that = this, + options = this.options; + + this.opos = [ event.pageX, event.pageY ]; + this.elementPos = $( this.element[ 0 ] ).offset(); + + if ( this.options.disabled ) { + return; + } + + this.selectees = $( options.filter, this.element[ 0 ] ); + + this._trigger( "start", event ); + + $( options.appendTo ).append( this.helper ); + + // position helper (lasso) + this.helper.css( { + "left": event.pageX, + "top": event.pageY, + "width": 0, + "height": 0 + } ); + + if ( options.autoRefresh ) { + this.refresh(); + } + + this.selectees.filter( ".ui-selected" ).each( function() { + var selectee = $.data( this, "selectable-item" ); + selectee.startselected = true; + if ( !event.metaKey && !event.ctrlKey ) { + that._removeClass( selectee.$element, "ui-selected" ); + selectee.selected = false; + that._addClass( selectee.$element, "ui-unselecting" ); + selectee.unselecting = true; + + // selectable UNSELECTING callback + that._trigger( "unselecting", event, { + unselecting: selectee.element + } ); + } + } ); + + $( event.target ).parents().addBack().each( function() { + var doSelect, + selectee = $.data( this, "selectable-item" ); + if ( selectee ) { + doSelect = ( !event.metaKey && !event.ctrlKey ) || + !selectee.$element.hasClass( "ui-selected" ); + that._removeClass( selectee.$element, doSelect ? "ui-unselecting" : "ui-selected" ) + ._addClass( selectee.$element, doSelect ? "ui-selecting" : "ui-unselecting" ); + selectee.unselecting = !doSelect; + selectee.selecting = doSelect; + selectee.selected = doSelect; + + // selectable (UN)SELECTING callback + if ( doSelect ) { + that._trigger( "selecting", event, { + selecting: selectee.element + } ); + } else { + that._trigger( "unselecting", event, { + unselecting: selectee.element + } ); + } + return false; + } + } ); + + }, + + _mouseDrag: function( event ) { + + this.dragged = true; + + if ( this.options.disabled ) { + return; + } + + var tmp, + that = this, + options = this.options, + x1 = this.opos[ 0 ], + y1 = this.opos[ 1 ], + x2 = event.pageX, + y2 = event.pageY; + + if ( x1 > x2 ) { + tmp = x2; x2 = x1; x1 = tmp; + } + if ( y1 > y2 ) { + tmp = y2; y2 = y1; y1 = tmp; + } + this.helper.css( { left: x1, top: y1, width: x2 - x1, height: y2 - y1 } ); + + this.selectees.each( function() { + var selectee = $.data( this, "selectable-item" ), + hit = false, + offset = {}; + + //prevent helper from being selected if appendTo: selectable + if ( !selectee || selectee.element === that.element[ 0 ] ) { + return; + } + + offset.left = selectee.left + that.elementPos.left; + offset.right = selectee.right + that.elementPos.left; + offset.top = selectee.top + that.elementPos.top; + offset.bottom = selectee.bottom + that.elementPos.top; + + if ( options.tolerance === "touch" ) { + hit = ( !( offset.left > x2 || offset.right < x1 || offset.top > y2 || + offset.bottom < y1 ) ); + } else if ( options.tolerance === "fit" ) { + hit = ( offset.left > x1 && offset.right < x2 && offset.top > y1 && + offset.bottom < y2 ); + } + + if ( hit ) { + + // SELECT + if ( selectee.selected ) { + that._removeClass( selectee.$element, "ui-selected" ); + selectee.selected = false; + } + if ( selectee.unselecting ) { + that._removeClass( selectee.$element, "ui-unselecting" ); + selectee.unselecting = false; + } + if ( !selectee.selecting ) { + that._addClass( selectee.$element, "ui-selecting" ); + selectee.selecting = true; + + // selectable SELECTING callback + that._trigger( "selecting", event, { + selecting: selectee.element + } ); + } + } else { + + // UNSELECT + if ( selectee.selecting ) { + if ( ( event.metaKey || event.ctrlKey ) && selectee.startselected ) { + that._removeClass( selectee.$element, "ui-selecting" ); + selectee.selecting = false; + that._addClass( selectee.$element, "ui-selected" ); + selectee.selected = true; + } else { + that._removeClass( selectee.$element, "ui-selecting" ); + selectee.selecting = false; + if ( selectee.startselected ) { + that._addClass( selectee.$element, "ui-unselecting" ); + selectee.unselecting = true; + } + + // selectable UNSELECTING callback + that._trigger( "unselecting", event, { + unselecting: selectee.element + } ); + } + } + if ( selectee.selected ) { + if ( !event.metaKey && !event.ctrlKey && !selectee.startselected ) { + that._removeClass( selectee.$element, "ui-selected" ); + selectee.selected = false; + + that._addClass( selectee.$element, "ui-unselecting" ); + selectee.unselecting = true; + + // selectable UNSELECTING callback + that._trigger( "unselecting", event, { + unselecting: selectee.element + } ); + } + } + } + } ); + + return false; + }, + + _mouseStop: function( event ) { + var that = this; + + this.dragged = false; + + $( ".ui-unselecting", this.element[ 0 ] ).each( function() { + var selectee = $.data( this, "selectable-item" ); + that._removeClass( selectee.$element, "ui-unselecting" ); + selectee.unselecting = false; + selectee.startselected = false; + that._trigger( "unselected", event, { + unselected: selectee.element + } ); + } ); + $( ".ui-selecting", this.element[ 0 ] ).each( function() { + var selectee = $.data( this, "selectable-item" ); + that._removeClass( selectee.$element, "ui-selecting" ) + ._addClass( selectee.$element, "ui-selected" ); + selectee.selecting = false; + selectee.selected = true; + selectee.startselected = true; + that._trigger( "selected", event, { + selected: selectee.element + } ); + } ); + this._trigger( "stop", event ); + + this.helper.remove(); + + return false; + } + +} ); + + +/*! + * jQuery UI Sortable 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Sortable +//>>group: Interactions +//>>description: Enables items in a list to be sorted using the mouse. +//>>docs: https://api.jqueryui.com/sortable/ +//>>demos: https://jqueryui.com/sortable/ +//>>css.structure: ../../themes/base/sortable.css + + +var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, { + version: "1.14.1", + widgetEventPrefix: "sort", + ready: false, + options: { + appendTo: "parent", + axis: false, + connectWith: false, + containment: false, + cursor: "auto", + cursorAt: false, + dropOnEmpty: true, + forcePlaceholderSize: false, + forceHelperSize: false, + grid: false, + handle: false, + helper: "original", + items: "> *", + opacity: false, + placeholder: false, + revert: false, + scroll: true, + scrollSensitivity: 20, + scrollSpeed: 20, + scope: "default", + tolerance: "intersect", + zIndex: 1000, + + // Callbacks + activate: null, + beforeStop: null, + change: null, + deactivate: null, + out: null, + over: null, + receive: null, + remove: null, + sort: null, + start: null, + stop: null, + update: null + }, + + _isOverAxis: function( x, reference, size ) { + return ( x >= reference ) && ( x < ( reference + size ) ); + }, + + _isFloating: function( item ) { + return ( /left|right/ ).test( item.css( "float" ) ) || + ( /inline|table-cell/ ).test( item.css( "display" ) ); + }, + + _create: function() { + this.containerCache = {}; + this._addClass( "ui-sortable" ); + + //Get the items + this.refresh(); + + //Let's determine the parent's offset + this.offset = this.element.offset(); + + //Initialize mouse events for interaction + this._mouseInit(); + + this._setHandleClassName(); + + //We're ready to go + this.ready = true; + + }, + + _setOption: function( key, value ) { + this._super( key, value ); + + if ( key === "handle" ) { + this._setHandleClassName(); + } + }, + + _setHandleClassName: function() { + var that = this; + this._removeClass( this.element.find( ".ui-sortable-handle" ), "ui-sortable-handle" ); + $.each( this.items, function() { + that._addClass( + this.instance.options.handle ? + this.item.find( this.instance.options.handle ) : + this.item, + "ui-sortable-handle" + ); + } ); + }, + + _destroy: function() { + this._mouseDestroy(); + + for ( var i = this.items.length - 1; i >= 0; i-- ) { + this.items[ i ].item.removeData( this.widgetName + "-item" ); + } + + return this; + }, + + _mouseCapture: function( event, overrideHandle ) { + var currentItem = null, + validHandle = false, + that = this; + + if ( this.reverting ) { + return false; + } + + if ( this.options.disabled || this.options.type === "static" ) { + return false; + } + + //We have to refresh the items data once first + this._refreshItems( event ); + + //Find out if the clicked node (or one of its parents) is a actual item in this.items + $( event.target ).parents().each( function() { + if ( $.data( this, that.widgetName + "-item" ) === that ) { + currentItem = $( this ); + return false; + } + } ); + if ( $.data( event.target, that.widgetName + "-item" ) === that ) { + currentItem = $( event.target ); + } + + if ( !currentItem ) { + return false; + } + if ( this.options.handle && !overrideHandle ) { + $( this.options.handle, currentItem ).find( "*" ).addBack().each( function() { + if ( this === event.target ) { + validHandle = true; + } + } ); + if ( !validHandle ) { + return false; + } + } + + this.currentItem = currentItem; + this._removeCurrentsFromItems(); + return true; + + }, + + _mouseStart: function( event, overrideHandle, noActivation ) { + + var i, body, + o = this.options; + + this.currentContainer = this; + + //We only need to call refreshPositions, because the refreshItems call has been moved to + // mouseCapture + this.refreshPositions(); + + //Prepare the dragged items parent + this.appendTo = $( o.appendTo !== "parent" ? + o.appendTo : + this.currentItem.parent() ); + + //Create and append the visible helper + this.helper = this._createHelper( event ); + + //Cache the helper size + this._cacheHelperProportions(); + + /* + * - Position generation - + * This block generates everything position related - it's the core of draggables. + */ + + //Cache the margins of the original element + this._cacheMargins(); + + //The element's absolute position on the page minus margins + this.offset = this.currentItem.offset(); + this.offset = { + top: this.offset.top - this.margins.top, + left: this.offset.left - this.margins.left + }; + + $.extend( this.offset, { + click: { //Where the click happened, relative to the element + left: event.pageX - this.offset.left, + top: event.pageY - this.offset.top + }, + + // This is a relative to absolute position minus the actual position calculation - + // only used for relative positioned helper + relative: this._getRelativeOffset() + } ); + + // After we get the helper offset, but before we get the parent offset we can + // change the helper's position to absolute + // TODO: Still need to figure out a way to make relative sorting possible + this.helper.css( "position", "absolute" ); + this.cssPosition = this.helper.css( "position" ); + + //Adjust the mouse offset relative to the helper if "cursorAt" is supplied + if ( o.cursorAt ) { + this._adjustOffsetFromHelper( o.cursorAt ); + } + + //Cache the former DOM position + this.domPosition = { + prev: this.currentItem.prev()[ 0 ], + parent: this.currentItem.parent()[ 0 ] + }; + + // If the helper is not the original, hide the original so it's not playing any role during + // the drag, won't cause anything bad this way + if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) { + this.currentItem.hide(); + } + + //Create the placeholder + this._createPlaceholder(); + + //Get the next scrolling parent + this.scrollParent = this.placeholder.scrollParent(); + + $.extend( this.offset, { + parent: this._getParentOffset() + } ); + + //Set a containment if given in the options + if ( o.containment ) { + this._setContainment(); + } + + if ( o.cursor && o.cursor !== "auto" ) { // cursor option + body = this.document.find( "body" ); + + this._storedStylesheet = + $( "" ).appendTo( body ); + } + + // We need to make sure to grab the zIndex before setting the + // opacity, because setting the opacity to anything lower than 1 + // causes the zIndex to change from "auto" to 0. + if ( o.zIndex ) { // zIndex option + if ( this.helper.css( "zIndex" ) ) { + this._storedZIndex = this.helper.css( "zIndex" ); + } + this.helper.css( "zIndex", o.zIndex ); + } + + if ( o.opacity ) { // opacity option + if ( this.helper.css( "opacity" ) ) { + this._storedOpacity = this.helper.css( "opacity" ); + } + this.helper.css( "opacity", o.opacity ); + } + + //Prepare scrolling + if ( this.scrollParent[ 0 ] !== this.document[ 0 ] && + this.scrollParent[ 0 ].tagName !== "HTML" ) { + this.overflowOffset = this.scrollParent.offset(); + } + + //Call callbacks + this._trigger( "start", event, this._uiHash() ); + + //Recache the helper size + if ( !this._preserveHelperProportions ) { + this._cacheHelperProportions(); + } + + //Post "activate" events to possible containers + if ( !noActivation ) { + for ( i = this.containers.length - 1; i >= 0; i-- ) { + this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) ); + } + } + + //Prepare possible droppables + if ( $.ui.ddmanager ) { + $.ui.ddmanager.current = this; + } + + if ( $.ui.ddmanager && !o.dropBehaviour ) { + $.ui.ddmanager.prepareOffsets( this, event ); + } + + this.dragging = true; + + this._addClass( this.helper, "ui-sortable-helper" ); + + //Move the helper, if needed + if ( !this.helper.parent().is( this.appendTo ) ) { + this.helper.detach().appendTo( this.appendTo ); + + //Update position + this.offset.parent = this._getParentOffset(); + } + + //Generate the original position + this.position = this.originalPosition = this._generatePosition( event ); + this.originalPageX = event.pageX; + this.originalPageY = event.pageY; + this.lastPositionAbs = this.positionAbs = this._convertPositionTo( "absolute" ); + + this._mouseDrag( event ); + + return true; + + }, + + _scroll: function( event ) { + var o = this.options, + scrolled = false; + + if ( this.scrollParent[ 0 ] !== this.document[ 0 ] && + this.scrollParent[ 0 ].tagName !== "HTML" ) { + + if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) - + event.pageY < o.scrollSensitivity ) { + this.scrollParent[ 0 ].scrollTop = + scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed; + } else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) { + this.scrollParent[ 0 ].scrollTop = + scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed; + } + + if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) - + event.pageX < o.scrollSensitivity ) { + this.scrollParent[ 0 ].scrollLeft = scrolled = + this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed; + } else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) { + this.scrollParent[ 0 ].scrollLeft = scrolled = + this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed; + } + + } else { + + if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) { + scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed ); + } else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) < + o.scrollSensitivity ) { + scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed ); + } + + if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) { + scrolled = this.document.scrollLeft( + this.document.scrollLeft() - o.scrollSpeed + ); + } else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) < + o.scrollSensitivity ) { + scrolled = this.document.scrollLeft( + this.document.scrollLeft() + o.scrollSpeed + ); + } + + } + + return scrolled; + }, + + _mouseDrag: function( event ) { + var i, item, itemElement, intersection, + o = this.options; + + //Compute the helpers position + this.position = this._generatePosition( event ); + this.positionAbs = this._convertPositionTo( "absolute" ); + + //Set the helper position + if ( !this.options.axis || this.options.axis !== "y" ) { + this.helper[ 0 ].style.left = this.position.left + "px"; + } + if ( !this.options.axis || this.options.axis !== "x" ) { + this.helper[ 0 ].style.top = this.position.top + "px"; + } + + //Do scrolling + if ( o.scroll ) { + if ( this._scroll( event ) !== false ) { + + //Update item positions used in position checks + this._refreshItemPositions( true ); + + if ( $.ui.ddmanager && !o.dropBehaviour ) { + $.ui.ddmanager.prepareOffsets( this, event ); + } + } + } + + this.dragDirection = { + vertical: this._getDragVerticalDirection(), + horizontal: this._getDragHorizontalDirection() + }; + + //Rearrange + for ( i = this.items.length - 1; i >= 0; i-- ) { + + //Cache variables and intersection, continue if no intersection + item = this.items[ i ]; + itemElement = item.item[ 0 ]; + intersection = this._intersectsWithPointer( item ); + if ( !intersection ) { + continue; + } + + // Only put the placeholder inside the current Container, skip all + // items from other containers. This works because when moving + // an item from one container to another the + // currentContainer is switched before the placeholder is moved. + // + // Without this, moving items in "sub-sortables" can cause + // the placeholder to jitter between the outer and inner container. + if ( item.instance !== this.currentContainer ) { + continue; + } + + // Cannot intersect with itself + // no useless actions that have been done before + // no action if the item moved is the parent of the item checked + if ( itemElement !== this.currentItem[ 0 ] && + this.placeholder[ intersection === 1 ? + "next" : "prev" ]()[ 0 ] !== itemElement && + !$.contains( this.placeholder[ 0 ], itemElement ) && + ( this.options.type === "semi-dynamic" ? + !$.contains( this.element[ 0 ], itemElement ) : + true + ) + ) { + + this.direction = intersection === 1 ? "down" : "up"; + + if ( this.options.tolerance === "pointer" || + this._intersectsWithSides( item ) ) { + this._rearrange( event, item ); + } else { + break; + } + + this._trigger( "change", event, this._uiHash() ); + break; + } + } + + //Post events to containers + this._contactContainers( event ); + + //Interconnect with droppables + if ( $.ui.ddmanager ) { + $.ui.ddmanager.drag( this, event ); + } + + //Call callbacks + this._trigger( "sort", event, this._uiHash() ); + + this.lastPositionAbs = this.positionAbs; + return false; + + }, + + _mouseStop: function( event, noPropagation ) { + + if ( !event ) { + return; + } + + //If we are using droppables, inform the manager about the drop + if ( $.ui.ddmanager && !this.options.dropBehaviour ) { + $.ui.ddmanager.drop( this, event ); + } + + if ( this.options.revert ) { + var that = this, + cur = this.placeholder.offset(), + axis = this.options.axis, + animation = {}; + + if ( !axis || axis === "x" ) { + animation.left = cur.left - this.offset.parent.left - this.margins.left + + ( this.offsetParent[ 0 ] === this.document[ 0 ].body ? + 0 : + this.offsetParent[ 0 ].scrollLeft + ); + } + if ( !axis || axis === "y" ) { + animation.top = cur.top - this.offset.parent.top - this.margins.top + + ( this.offsetParent[ 0 ] === this.document[ 0 ].body ? + 0 : + this.offsetParent[ 0 ].scrollTop + ); + } + this.reverting = true; + $( this.helper ).animate( + animation, + parseInt( this.options.revert, 10 ) || 500, + function() { + that._clear( event ); + } + ); + } else { + this._clear( event, noPropagation ); + } + + return false; + + }, + + cancel: function() { + + if ( this.dragging ) { + + this._mouseUp( new $.Event( "mouseup", { target: null } ) ); + + if ( this.options.helper === "original" ) { + this.currentItem.css( this._storedCSS ); + this._removeClass( this.currentItem, "ui-sortable-helper" ); + } else { + this.currentItem.show(); + } + + //Post deactivating events to containers + for ( var i = this.containers.length - 1; i >= 0; i-- ) { + this.containers[ i ]._trigger( "deactivate", null, this._uiHash( this ) ); + if ( this.containers[ i ].containerCache.over ) { + this.containers[ i ]._trigger( "out", null, this._uiHash( this ) ); + this.containers[ i ].containerCache.over = 0; + } + } + + } + + if ( this.placeholder ) { + + //$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately, + // it unbinds ALL events from the original node! + if ( this.placeholder[ 0 ].parentNode ) { + this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] ); + } + if ( this.options.helper !== "original" && this.helper && + this.helper[ 0 ].parentNode ) { + this.helper.remove(); + } + + $.extend( this, { + helper: null, + dragging: false, + reverting: false, + _noFinalSort: null + } ); + + if ( this.domPosition.prev ) { + $( this.domPosition.prev ).after( this.currentItem ); + } else { + $( this.domPosition.parent ).prepend( this.currentItem ); + } + } + + return this; + + }, + + serialize: function( o ) { + + var items = this._getItemsAsjQuery( o && o.connected ), + str = []; + o = o || {}; + + $( items ).each( function() { + var res = ( $( o.item || this ).attr( o.attribute || "id" ) || "" ) + .match( o.expression || ( /(.+)[\-=_](.+)/ ) ); + if ( res ) { + str.push( + ( o.key || res[ 1 ] + "[]" ) + + "=" + ( o.key && o.expression ? res[ 1 ] : res[ 2 ] ) ); + } + } ); + + if ( !str.length && o.key ) { + str.push( o.key + "=" ); + } + + return str.join( "&" ); + + }, + + toArray: function( o ) { + + var items = this._getItemsAsjQuery( o && o.connected ), + ret = []; + + o = o || {}; + + items.each( function() { + ret.push( $( o.item || this ).attr( o.attribute || "id" ) || "" ); + } ); + return ret; + + }, + + /* Be careful with the following core functions */ + _intersectsWith: function( item ) { + + var x1 = this.positionAbs.left, + x2 = x1 + this.helperProportions.width, + y1 = this.positionAbs.top, + y2 = y1 + this.helperProportions.height, + l = item.left, + r = l + item.width, + t = item.top, + b = t + item.height, + dyClick = this.offset.click.top, + dxClick = this.offset.click.left, + isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t && + ( y1 + dyClick ) < b ), + isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l && + ( x1 + dxClick ) < r ), + isOverElement = isOverElementHeight && isOverElementWidth; + + if ( this.options.tolerance === "pointer" || + this.options.forcePointerForContainers || + ( this.options.tolerance !== "pointer" && + this.helperProportions[ this.floating ? "width" : "height" ] > + item[ this.floating ? "width" : "height" ] ) + ) { + return isOverElement; + } else { + + return ( l < x1 + ( this.helperProportions.width / 2 ) && // Right Half + x2 - ( this.helperProportions.width / 2 ) < r && // Left Half + t < y1 + ( this.helperProportions.height / 2 ) && // Bottom Half + y2 - ( this.helperProportions.height / 2 ) < b ); // Top Half + + } + }, + + _intersectsWithPointer: function( item ) { + var verticalDirection, horizontalDirection, + isOverElementHeight = ( this.options.axis === "x" ) || + this._isOverAxis( + this.positionAbs.top + this.offset.click.top, item.top, item.height ), + isOverElementWidth = ( this.options.axis === "y" ) || + this._isOverAxis( + this.positionAbs.left + this.offset.click.left, item.left, item.width ), + isOverElement = isOverElementHeight && isOverElementWidth; + + if ( !isOverElement ) { + return false; + } + + verticalDirection = this.dragDirection.vertical; + horizontalDirection = this.dragDirection.horizontal; + + return this.floating ? + ( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 ) : + ( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) ); + + }, + + _intersectsWithSides: function( item ) { + + var isOverBottomHalf = this._isOverAxis( this.positionAbs.top + + this.offset.click.top, item.top + ( item.height / 2 ), item.height ), + isOverRightHalf = this._isOverAxis( this.positionAbs.left + + this.offset.click.left, item.left + ( item.width / 2 ), item.width ), + verticalDirection = this.dragDirection.vertical, + horizontalDirection = this.dragDirection.horizontal; + + if ( this.floating && horizontalDirection ) { + return ( ( horizontalDirection === "right" && isOverRightHalf ) || + ( horizontalDirection === "left" && !isOverRightHalf ) ); + } else { + return verticalDirection && ( ( verticalDirection === "down" && isOverBottomHalf ) || + ( verticalDirection === "up" && !isOverBottomHalf ) ); + } + + }, + + _getDragVerticalDirection: function() { + var delta = this.positionAbs.top - this.lastPositionAbs.top; + return delta !== 0 && ( delta > 0 ? "down" : "up" ); + }, + + _getDragHorizontalDirection: function() { + var delta = this.positionAbs.left - this.lastPositionAbs.left; + return delta !== 0 && ( delta > 0 ? "right" : "left" ); + }, + + refresh: function( event ) { + this._refreshItems( event ); + this._setHandleClassName(); + this.refreshPositions(); + return this; + }, + + _connectWith: function() { + var options = this.options; + return options.connectWith.constructor === String ? + [ options.connectWith ] : + options.connectWith; + }, + + _getItemsAsjQuery: function( connected ) { + + var i, j, cur, inst, + items = [], + queries = [], + connectWith = this._connectWith(); + + if ( connectWith && connected ) { + for ( i = connectWith.length - 1; i >= 0; i-- ) { + cur = $( connectWith[ i ], this.document[ 0 ] ); + for ( j = cur.length - 1; j >= 0; j-- ) { + inst = $.data( cur[ j ], this.widgetFullName ); + if ( inst && inst !== this && !inst.options.disabled ) { + queries.push( [ typeof inst.options.items === "function" ? + inst.options.items.call( inst.element ) : + $( inst.options.items, inst.element ) + .not( ".ui-sortable-helper" ) + .not( ".ui-sortable-placeholder" ), inst ] ); + } + } + } + } + + queries.push( [ typeof this.options.items === "function" ? + this.options.items + .call( this.element, null, { options: this.options, item: this.currentItem } ) : + $( this.options.items, this.element ) + .not( ".ui-sortable-helper" ) + .not( ".ui-sortable-placeholder" ), this ] ); + + function addItems() { + items.push( this ); + } + for ( i = queries.length - 1; i >= 0; i-- ) { + queries[ i ][ 0 ].each( addItems ); + } + + return $( items ); + + }, + + _removeCurrentsFromItems: function() { + + var list = this.currentItem.find( ":data(" + this.widgetName + "-item)" ); + + this.items = $.grep( this.items, function( item ) { + for ( var j = 0; j < list.length; j++ ) { + if ( list[ j ] === item.item[ 0 ] ) { + return false; + } + } + return true; + } ); + + }, + + _refreshItems: function( event ) { + + this.items = []; + this.containers = [ this ]; + + var i, j, cur, inst, targetData, _queries, item, queriesLength, + items = this.items, + queries = [ [ typeof this.options.items === "function" ? + this.options.items.call( this.element[ 0 ], event, { item: this.currentItem } ) : + $( this.options.items, this.element ), this ] ], + connectWith = this._connectWith(); + + //Shouldn't be run the first time through due to massive slow-down + if ( connectWith && this.ready ) { + for ( i = connectWith.length - 1; i >= 0; i-- ) { + cur = $( connectWith[ i ], this.document[ 0 ] ); + for ( j = cur.length - 1; j >= 0; j-- ) { + inst = $.data( cur[ j ], this.widgetFullName ); + if ( inst && inst !== this && !inst.options.disabled ) { + queries.push( [ typeof inst.options.items === "function" ? + inst.options.items + .call( inst.element[ 0 ], event, { item: this.currentItem } ) : + $( inst.options.items, inst.element ), inst ] ); + this.containers.push( inst ); + } + } + } + } + + for ( i = queries.length - 1; i >= 0; i-- ) { + targetData = queries[ i ][ 1 ]; + _queries = queries[ i ][ 0 ]; + + for ( j = 0, queriesLength = _queries.length; j < queriesLength; j++ ) { + item = $( _queries[ j ] ); + + // Data for target checking (mouse manager) + item.data( this.widgetName + "-item", targetData ); + + items.push( { + item: item, + instance: targetData, + width: 0, height: 0, + left: 0, top: 0 + } ); + } + } + + }, + + _refreshItemPositions: function( fast ) { + var i, item, t, p; + + for ( i = this.items.length - 1; i >= 0; i-- ) { + item = this.items[ i ]; + + //We ignore calculating positions of all connected containers when we're not over them + if ( this.currentContainer && item.instance !== this.currentContainer && + item.item[ 0 ] !== this.currentItem[ 0 ] ) { + continue; + } + + t = this.options.toleranceElement ? + $( this.options.toleranceElement, item.item ) : + item.item; + + if ( !fast ) { + item.width = t.outerWidth(); + item.height = t.outerHeight(); + } + + p = t.offset(); + item.left = p.left; + item.top = p.top; + } + }, + + refreshPositions: function( fast ) { + + // Determine whether items are being displayed horizontally + this.floating = this.items.length ? + this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) : + false; + + // This has to be redone because due to the item being moved out/into the offsetParent, + // the offsetParent's position will change + if ( this.offsetParent && this.helper ) { + this.offset.parent = this._getParentOffset(); + } + + this._refreshItemPositions( fast ); + + var i, p; + + if ( this.options.custom && this.options.custom.refreshContainers ) { + this.options.custom.refreshContainers.call( this ); + } else { + for ( i = this.containers.length - 1; i >= 0; i-- ) { + p = this.containers[ i ].element.offset(); + this.containers[ i ].containerCache.left = p.left; + this.containers[ i ].containerCache.top = p.top; + this.containers[ i ].containerCache.width = + this.containers[ i ].element.outerWidth(); + this.containers[ i ].containerCache.height = + this.containers[ i ].element.outerHeight(); + } + } + + return this; + }, + + _createPlaceholder: function( that ) { + that = that || this; + var className, nodeName, + o = that.options; + + if ( !o.placeholder || o.placeholder.constructor === String ) { + className = o.placeholder; + nodeName = that.currentItem[ 0 ].nodeName.toLowerCase(); + o.placeholder = { + element: function() { + + var element = $( "<" + nodeName + ">", that.document[ 0 ] ); + + that._addClass( element, "ui-sortable-placeholder", + className || that.currentItem[ 0 ].className ) + ._removeClass( element, "ui-sortable-helper" ); + + if ( nodeName === "tbody" ) { + that._createTrPlaceholder( + that.currentItem.find( "tr" ).eq( 0 ), + $( "
        s above, but they're unlikely to + // be the correct height on their own if the row heights are dynamic, so we'll + // always assign the height of the dragged item given forcePlaceholderSize + // is true. + if ( !p.height() || ( o.forcePlaceholderSize && + ( nodeName === "tbody" || nodeName === "tr" ) ) ) { + p.height( + that.currentItem.innerHeight() - + parseInt( that.currentItem.css( "paddingTop" ) || 0, 10 ) - + parseInt( that.currentItem.css( "paddingBottom" ) || 0, 10 ) ); + } + if ( !p.width() ) { + p.width( + that.currentItem.innerWidth() - + parseInt( that.currentItem.css( "paddingLeft" ) || 0, 10 ) - + parseInt( that.currentItem.css( "paddingRight" ) || 0, 10 ) ); + } + } + }; + } + + //Create the placeholder + that.placeholder = $( o.placeholder.element.call( that.element, that.currentItem ) ); + + //Append it after the actual current item + that.currentItem.after( that.placeholder ); + + //Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317) + o.placeholder.update( that, that.placeholder ); + + }, + + _createTrPlaceholder: function( sourceTr, targetTr ) { + var that = this; + + sourceTr.children().each( function() { + $( " 
        " + + ""; + thead = ( showWeek ? "" : "" ); + for ( dow = 0; dow < 7; dow++ ) { // days of the week + day = ( dow + firstDay ) % 7; + thead += ""; + } + calender += thead + ""; + daysInMonth = this._getDaysInMonth( drawYear, drawMonth ); + if ( drawYear === inst.selectedYear && drawMonth === inst.selectedMonth ) { + inst.selectedDay = Math.min( inst.selectedDay, daysInMonth ); + } + leadDays = ( this._getFirstDayOfMonth( drawYear, drawMonth ) - firstDay + 7 ) % 7; + curRows = Math.ceil( ( leadDays + daysInMonth ) / 7 ); // calculate the number of rows to generate + numRows = ( isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows ); //If multiple months, use the higher number of rows (see #7043) + this.maxRows = numRows; + printDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 - leadDays ) ); + for ( dRow = 0; dRow < numRows; dRow++ ) { // create date picker rows + calender += ""; + tbody = ( !showWeek ? "" : "" ); + for ( dow = 0; dow < 7; dow++ ) { // create date picker days + daySettings = ( beforeShowDay ? + beforeShowDay.apply( ( inst.input ? inst.input[ 0 ] : null ), [ printDate ] ) : [ true, "" ] ); + otherMonth = ( printDate.getMonth() !== drawMonth ); + unselectable = ( otherMonth && !selectOtherMonths ) || !daySettings[ 0 ] || + ( minDate && printDate < minDate ) || ( maxDate && printDate > maxDate ); + tbody += ""; // display selectable date + printDate.setDate( printDate.getDate() + 1 ); + printDate = this._daylightSavingAdjust( printDate ); + } + calender += tbody + ""; + } + drawMonth++; + if ( drawMonth > 11 ) { + drawMonth = 0; + drawYear++; + } + calender += "
        " + this._get( inst, "weekHeader" ) + "= 5 ? " class='ui-datepicker-week-end'" : "" ) + ">" + + "" + dayNamesMin[ day ] + "
        " + + this._get( inst, "calculateWeek" )( printDate ) + "" + // actions + ( otherMonth && !showOtherMonths ? " " : // display for other months + ( unselectable ? "" + printDate.getDate() + "" : "" + printDate.getDate() + "" ) ) + "
        " + ( isMultiMonth ? "
        " + + ( ( numMonths[ 0 ] > 0 && col === numMonths[ 1 ] - 1 ) ? "
        " : "" ) : "" ); + group += calender; + } + html += group; + } + html += buttonPanel; + inst._keyEvent = false; + return html; + }, + + /* Generate the month and year header. */ + _generateMonthYearHeader: function( inst, drawMonth, drawYear, minDate, maxDate, + secondary, monthNames, monthNamesShort ) { + + var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear, + changeMonth = this._get( inst, "changeMonth" ), + changeYear = this._get( inst, "changeYear" ), + showMonthAfterYear = this._get( inst, "showMonthAfterYear" ), + selectMonthLabel = this._get( inst, "selectMonthLabel" ), + selectYearLabel = this._get( inst, "selectYearLabel" ), + html = "
        ", + monthHtml = ""; + + // Month selection + if ( secondary || !changeMonth ) { + monthHtml += "" + monthNames[ drawMonth ] + ""; + } else { + inMinYear = ( minDate && minDate.getFullYear() === drawYear ); + inMaxYear = ( maxDate && maxDate.getFullYear() === drawYear ); + monthHtml += ""; + } + + if ( !showMonthAfterYear ) { + html += monthHtml + ( secondary || !( changeMonth && changeYear ) ? " " : "" ); + } + + // Year selection + if ( !inst.yearshtml ) { + inst.yearshtml = ""; + if ( secondary || !changeYear ) { + html += "" + drawYear + ""; + } else { + + // determine range of years to display + years = this._get( inst, "yearRange" ).split( ":" ); + thisYear = new Date().getFullYear(); + determineYear = function( value ) { + var year = ( value.match( /c[+\-].*/ ) ? drawYear + parseInt( value.substring( 1 ), 10 ) : + ( value.match( /[+\-].*/ ) ? thisYear + parseInt( value, 10 ) : + parseInt( value, 10 ) ) ); + return ( isNaN( year ) ? thisYear : year ); + }; + year = determineYear( years[ 0 ] ); + endYear = Math.max( year, determineYear( years[ 1 ] || "" ) ); + year = ( minDate ? Math.max( year, minDate.getFullYear() ) : year ); + endYear = ( maxDate ? Math.min( endYear, maxDate.getFullYear() ) : endYear ); + inst.yearshtml += ""; + + html += inst.yearshtml; + inst.yearshtml = null; + } + } + + html += this._get( inst, "yearSuffix" ); + if ( showMonthAfterYear ) { + html += ( secondary || !( changeMonth && changeYear ) ? " " : "" ) + monthHtml; + } + html += "
        "; // Close datepicker_header + return html; + }, + + /* Adjust one of the date sub-fields. */ + _adjustInstDate: function( inst, offset, period ) { + var year = inst.selectedYear + ( period === "Y" ? offset : 0 ), + month = inst.selectedMonth + ( period === "M" ? offset : 0 ), + day = Math.min( inst.selectedDay, this._getDaysInMonth( year, month ) ) + ( period === "D" ? offset : 0 ), + date = this._restrictMinMax( inst, this._daylightSavingAdjust( new Date( year, month, day ) ) ); + + inst.selectedDay = date.getDate(); + inst.drawMonth = inst.selectedMonth = date.getMonth(); + inst.drawYear = inst.selectedYear = date.getFullYear(); + if ( period === "M" || period === "Y" ) { + this._notifyChange( inst ); + } + }, + + /* Ensure a date is within any min/max bounds. */ + _restrictMinMax: function( inst, date ) { + var minDate = this._getMinMaxDate( inst, "min" ), + maxDate = this._getMinMaxDate( inst, "max" ), + newDate = ( minDate && date < minDate ? minDate : date ); + return ( maxDate && newDate > maxDate ? maxDate : newDate ); + }, + + /* Notify change of month/year. */ + _notifyChange: function( inst ) { + var onChange = this._get( inst, "onChangeMonthYear" ); + if ( onChange ) { + onChange.apply( ( inst.input ? inst.input[ 0 ] : null ), + [ inst.selectedYear, inst.selectedMonth + 1, inst ] ); + } + }, + + /* Determine the number of months to show. */ + _getNumberOfMonths: function( inst ) { + var numMonths = this._get( inst, "numberOfMonths" ); + return ( numMonths == null ? [ 1, 1 ] : ( typeof numMonths === "number" ? [ 1, numMonths ] : numMonths ) ); + }, + + /* Determine the current maximum date - ensure no time components are set. */ + _getMinMaxDate: function( inst, minMax ) { + return this._determineDate( inst, this._get( inst, minMax + "Date" ), null ); + }, + + /* Find the number of days in a given month. */ + _getDaysInMonth: function( year, month ) { + return 32 - this._daylightSavingAdjust( new Date( year, month, 32 ) ).getDate(); + }, + + /* Find the day of the week of the first of a month. */ + _getFirstDayOfMonth: function( year, month ) { + return new Date( year, month, 1 ).getDay(); + }, + + /* Determines if we should allow a "next/prev" month display change. */ + _canAdjustMonth: function( inst, offset, curYear, curMonth ) { + var numMonths = this._getNumberOfMonths( inst ), + date = this._daylightSavingAdjust( new Date( curYear, + curMonth + ( offset < 0 ? offset : numMonths[ 0 ] * numMonths[ 1 ] ), 1 ) ); + + if ( offset < 0 ) { + date.setDate( this._getDaysInMonth( date.getFullYear(), date.getMonth() ) ); + } + return this._isInRange( inst, date ); + }, + + /* Is the given date in the accepted range? */ + _isInRange: function( inst, date ) { + var yearSplit, currentYear, + minDate = this._getMinMaxDate( inst, "min" ), + maxDate = this._getMinMaxDate( inst, "max" ), + minYear = null, + maxYear = null, + years = this._get( inst, "yearRange" ); + if ( years ) { + yearSplit = years.split( ":" ); + currentYear = new Date().getFullYear(); + minYear = parseInt( yearSplit[ 0 ], 10 ); + maxYear = parseInt( yearSplit[ 1 ], 10 ); + if ( yearSplit[ 0 ].match( /[+\-].*/ ) ) { + minYear += currentYear; + } + if ( yearSplit[ 1 ].match( /[+\-].*/ ) ) { + maxYear += currentYear; + } + } + + return ( ( !minDate || date.getTime() >= minDate.getTime() ) && + ( !maxDate || date.getTime() <= maxDate.getTime() ) && + ( !minYear || date.getFullYear() >= minYear ) && + ( !maxYear || date.getFullYear() <= maxYear ) ); + }, + + /* Provide the configuration settings for formatting/parsing. */ + _getFormatConfig: function( inst ) { + var shortYearCutoff = this._get( inst, "shortYearCutoff" ); + shortYearCutoff = ( typeof shortYearCutoff !== "string" ? shortYearCutoff : + new Date().getFullYear() % 100 + parseInt( shortYearCutoff, 10 ) ); + return { shortYearCutoff: shortYearCutoff, + dayNamesShort: this._get( inst, "dayNamesShort" ), dayNames: this._get( inst, "dayNames" ), + monthNamesShort: this._get( inst, "monthNamesShort" ), monthNames: this._get( inst, "monthNames" ) }; + }, + + /* Format the given date for display. */ + _formatDate: function( inst, day, month, year ) { + if ( !day ) { + inst.currentDay = inst.selectedDay; + inst.currentMonth = inst.selectedMonth; + inst.currentYear = inst.selectedYear; + } + var date = ( day ? ( typeof day === "object" ? day : + this._daylightSavingAdjust( new Date( year, month, day ) ) ) : + this._daylightSavingAdjust( new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) ); + return this.formatDate( this._get( inst, "dateFormat" ), date, this._getFormatConfig( inst ) ); + } +} ); + +/* + * Bind hover events for datepicker elements. + * Done via delegate so the binding only occurs once in the lifetime of the parent div. + * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker. + */ +function datepicker_bindHover( dpDiv ) { + var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a"; + return dpDiv.on( "mouseout", selector, function() { + $( this ).removeClass( "ui-state-hover" ); + if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) { + $( this ).removeClass( "ui-datepicker-prev-hover" ); + } + if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) { + $( this ).removeClass( "ui-datepicker-next-hover" ); + } + } ) + .on( "mouseover", selector, datepicker_handleMouseover ); +} + +function datepicker_handleMouseover() { + if ( !$.datepicker._isDisabledDatepicker( datepicker_instActive.inline ? datepicker_instActive.dpDiv.parent()[ 0 ] : datepicker_instActive.input[ 0 ] ) ) { + $( this ).parents( ".ui-datepicker-calendar" ).find( "a" ).removeClass( "ui-state-hover" ); + $( this ).addClass( "ui-state-hover" ); + if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) { + $( this ).addClass( "ui-datepicker-prev-hover" ); + } + if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) { + $( this ).addClass( "ui-datepicker-next-hover" ); + } + } +} + +/* jQuery extend now ignores nulls! */ +function datepicker_extendRemove( target, props ) { + $.extend( target, props ); + for ( var name in props ) { + if ( props[ name ] == null ) { + target[ name ] = props[ name ]; + } + } + return target; +} + +/* Invoke the datepicker functionality. + @param options string - a command, optionally followed by additional parameters or + Object - settings for attaching new datepicker functionality + @return jQuery object */ +$.fn.datepicker = function( options ) { + + /* Verify an empty collection wasn't passed - Fixes #6976 */ + if ( !this.length ) { + return this; + } + + /* Initialise the date picker. */ + if ( !$.datepicker.initialized ) { + $( document ).on( "mousedown", $.datepicker._checkExternalClick ); + $.datepicker.initialized = true; + } + + /* Append datepicker main container to body if not exist. */ + if ( $( "#" + $.datepicker._mainDivId ).length === 0 ) { + $( "body" ).append( $.datepicker.dpDiv ); + } + + var otherArgs = Array.prototype.slice.call( arguments, 1 ); + if ( typeof options === "string" && ( options === "isDisabled" || options === "getDate" || options === "widget" ) ) { + return $.datepicker[ "_" + options + "Datepicker" ]. + apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) ); + } + if ( options === "option" && arguments.length === 2 && typeof arguments[ 1 ] === "string" ) { + return $.datepicker[ "_" + options + "Datepicker" ]. + apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) ); + } + return this.each( function() { + if ( typeof options === "string" ) { + $.datepicker[ "_" + options + "Datepicker" ] + .apply( $.datepicker, [ this ].concat( otherArgs ) ); + } else { + $.datepicker._attachDatepicker( this, options ); + } + } ); +}; + +$.datepicker = new Datepicker(); // singleton instance +$.datepicker.initialized = false; +$.datepicker.uuid = new Date().getTime(); +$.datepicker.version = "1.14.1"; + +var widgetsDatepicker = $.datepicker; + + +/*! + * jQuery UI Dialog 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Dialog +//>>group: Widgets +//>>description: Displays customizable dialog windows. +//>>docs: https://api.jqueryui.com/dialog/ +//>>demos: https://jqueryui.com/dialog/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/dialog.css +//>>css.theme: ../../themes/base/theme.css + + +$.widget( "ui.dialog", { + version: "1.14.1", + options: { + appendTo: "body", + autoOpen: true, + buttons: [], + classes: { + "ui-dialog": "ui-corner-all", + "ui-dialog-titlebar": "ui-corner-all" + }, + closeOnEscape: true, + closeText: "Close", + draggable: true, + hide: null, + height: "auto", + maxHeight: null, + maxWidth: null, + minHeight: 150, + minWidth: 150, + modal: false, + position: { + my: "center", + at: "center", + of: window, + collision: "fit", + + // Ensure the titlebar is always visible + using: function( pos ) { + var topOffset = $( this ).css( pos ).offset().top; + if ( topOffset < 0 ) { + $( this ).css( "top", pos.top - topOffset ); + } + } + }, + resizable: true, + show: null, + title: null, + uiDialogTitleHeadingLevel: 0, + width: 300, + + // Callbacks + beforeClose: null, + close: null, + drag: null, + dragStart: null, + dragStop: null, + focus: null, + open: null, + resize: null, + resizeStart: null, + resizeStop: null + }, + + sizeRelatedOptions: { + buttons: true, + height: true, + maxHeight: true, + maxWidth: true, + minHeight: true, + minWidth: true, + width: true + }, + + resizableRelatedOptions: { + maxHeight: true, + maxWidth: true, + minHeight: true, + minWidth: true + }, + + _create: function() { + this.originalCss = { + display: this.element[ 0 ].style.display, + width: this.element[ 0 ].style.width, + minHeight: this.element[ 0 ].style.minHeight, + maxHeight: this.element[ 0 ].style.maxHeight, + height: this.element[ 0 ].style.height + }; + this.originalPosition = { + parent: this.element.parent(), + index: this.element.parent().children().index( this.element ) + }; + this.originalTitle = this.element.attr( "title" ); + if ( this.options.title == null && this.originalTitle != null ) { + this.options.title = this.originalTitle; + } + + // Dialogs can't be disabled + if ( this.options.disabled ) { + this.options.disabled = false; + } + + this._createWrapper(); + + this.element + .show() + .removeAttr( "title" ) + .appendTo( this.uiDialog ); + + this._addClass( "ui-dialog-content", "ui-widget-content" ); + + this._createTitlebar(); + this._createButtonPane(); + + if ( this.options.draggable && $.fn.draggable ) { + this._makeDraggable(); + } + if ( this.options.resizable && $.fn.resizable ) { + this._makeResizable(); + } + + this._isOpen = false; + + this._trackFocus(); + }, + + _init: function() { + if ( this.options.autoOpen ) { + this.open(); + } + }, + + _appendTo: function() { + var element = this.options.appendTo; + if ( element && ( element.jquery || element.nodeType ) ) { + return $( element ); + } + return this.document.find( element || "body" ).eq( 0 ); + }, + + _destroy: function() { + var next, + originalPosition = this.originalPosition; + + this._untrackInstance(); + this._destroyOverlay(); + + this.element + .removeUniqueId() + .css( this.originalCss ) + + // Without detaching first, the following becomes really slow + .detach(); + + this.uiDialog.remove(); + + if ( this.originalTitle ) { + this.element.attr( "title", this.originalTitle ); + } + + next = originalPosition.parent.children().eq( originalPosition.index ); + + // Don't try to place the dialog next to itself (#8613) + if ( next.length && next[ 0 ] !== this.element[ 0 ] ) { + next.before( this.element ); + } else { + originalPosition.parent.append( this.element ); + } + }, + + widget: function() { + return this.uiDialog; + }, + + disable: $.noop, + enable: $.noop, + + close: function( event ) { + var that = this; + + if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) { + return; + } + + this._isOpen = false; + this._focusedElement = null; + this._destroyOverlay(); + this._untrackInstance(); + + if ( !this.opener.filter( ":focusable" ).trigger( "focus" ).length ) { + + // Hiding a focused element doesn't trigger blur in WebKit + // so in case we have nothing to focus on, explicitly blur the active element + // https://bugs.webkit.org/show_bug.cgi?id=47182 + $( this.document[ 0 ].activeElement ).trigger( "blur" ); + } + + this._hide( this.uiDialog, this.options.hide, function() { + that._trigger( "close", event ); + } ); + }, + + isOpen: function() { + return this._isOpen; + }, + + moveToTop: function() { + this._moveToTop(); + }, + + _moveToTop: function( event, silent ) { + var moved = false, + zIndices = this.uiDialog.siblings( ".ui-front:visible" ).map( function() { + return +$( this ).css( "z-index" ); + } ).get(), + zIndexMax = Math.max.apply( null, zIndices ); + + if ( zIndexMax >= +this.uiDialog.css( "z-index" ) ) { + this.uiDialog.css( "z-index", zIndexMax + 1 ); + moved = true; + } + + if ( moved && !silent ) { + this._trigger( "focus", event ); + } + return moved; + }, + + open: function() { + var that = this; + if ( this._isOpen ) { + if ( this._moveToTop() ) { + this._focusTabbable(); + } + return; + } + + this._isOpen = true; + this.opener = $( this.document[ 0 ].activeElement ); + + this._size(); + this._position(); + this._createOverlay(); + this._moveToTop( null, true ); + + // Ensure the overlay is moved to the top with the dialog, but only when + // opening. The overlay shouldn't move after the dialog is open so that + // modeless dialogs opened after the modal dialog stack properly. + if ( this.overlay ) { + this.overlay.css( "z-index", this.uiDialog.css( "z-index" ) - 1 ); + } + + this._show( this.uiDialog, this.options.show, function() { + that._focusTabbable(); + that._trigger( "focus" ); + } ); + + // Track the dialog immediately upon opening in case a focus event + // somehow occurs outside of the dialog before an element inside the + // dialog is focused (#10152) + this._makeFocusTarget(); + + this._trigger( "open" ); + }, + + _focusTabbable: function() { + + // Set focus to the first match: + // 1. An element that was focused previously + // 2. First element inside the dialog matching [autofocus] + // 3. Tabbable element inside the content element + // 4. Tabbable element inside the buttonpane + // 5. The close button + // 6. The dialog itself + var hasFocus = this._focusedElement; + if ( !hasFocus ) { + hasFocus = this.element.find( "[autofocus]" ); + } + if ( !hasFocus.length ) { + hasFocus = this.element.find( ":tabbable" ); + } + if ( !hasFocus.length ) { + hasFocus = this.uiDialogButtonPane.find( ":tabbable" ); + } + if ( !hasFocus.length ) { + hasFocus = this.uiDialogTitlebarClose.filter( ":tabbable" ); + } + if ( !hasFocus.length ) { + hasFocus = this.uiDialog; + } + hasFocus.eq( 0 ).trigger( "focus" ); + }, + + _restoreTabbableFocus: function() { + var activeElement = this.document[ 0 ].activeElement, + isActive = this.uiDialog[ 0 ] === activeElement || + $.contains( this.uiDialog[ 0 ], activeElement ); + if ( !isActive ) { + this._focusTabbable(); + } + }, + + _keepFocus: function( event ) { + event.preventDefault(); + this._restoreTabbableFocus(); + }, + + _createWrapper: function() { + this.uiDialog = $( "
        " ) + .hide() + .attr( { + + // Setting tabIndex makes the div focusable + tabIndex: -1, + role: "dialog", + "aria-modal": this.options.modal ? "true" : null + } ) + .appendTo( this._appendTo() ); + + this._addClass( this.uiDialog, "ui-dialog", "ui-widget ui-widget-content ui-front" ); + this._on( this.uiDialog, { + keydown: function( event ) { + if ( this.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode && + event.keyCode === $.ui.keyCode.ESCAPE ) { + event.preventDefault(); + this.close( event ); + return; + } + + // Prevent tabbing out of dialogs + if ( event.keyCode !== $.ui.keyCode.TAB || event.isDefaultPrevented() ) { + return; + } + var tabbables = this.uiDialog.find( ":tabbable" ), + first = tabbables.first(), + last = tabbables.last(); + + if ( ( event.target === last[ 0 ] || event.target === this.uiDialog[ 0 ] ) && + !event.shiftKey ) { + this._delay( function() { + first.trigger( "focus" ); + } ); + event.preventDefault(); + } else if ( ( event.target === first[ 0 ] || + event.target === this.uiDialog[ 0 ] ) && event.shiftKey ) { + this._delay( function() { + last.trigger( "focus" ); + } ); + event.preventDefault(); + } + }, + mousedown: function( event ) { + if ( this._moveToTop( event ) ) { + this._focusTabbable(); + } + } + } ); + + // We assume that any existing aria-describedby attribute means + // that the dialog content is marked up properly + // otherwise we brute force the content as the description + if ( !this.element.find( "[aria-describedby]" ).length ) { + this.uiDialog.attr( { + "aria-describedby": this.element.uniqueId().attr( "id" ) + } ); + } + }, + + _createTitlebar: function() { + var uiDialogTitle; + + this.uiDialogTitlebar = $( "
        " ); + this._addClass( this.uiDialogTitlebar, + "ui-dialog-titlebar", "ui-widget-header ui-helper-clearfix" ); + this._on( this.uiDialogTitlebar, { + mousedown: function( event ) { + + // Don't prevent click on close button (#8838) + // Focusing a dialog that is partially scrolled out of view + // causes the browser to scroll it into view, preventing the click event + if ( !$( event.target ).closest( ".ui-dialog-titlebar-close" ) ) { + + // Dialog isn't getting focus when dragging (#8063) + this.uiDialog.trigger( "focus" ); + } + } + } ); + + this.uiDialogTitlebarClose = $( "" ) + .button( { + label: $( "" ).text( this.options.closeText ).html(), + icon: "ui-icon-closethick", + showLabel: false + } ) + .appendTo( this.uiDialogTitlebar ); + + this._addClass( this.uiDialogTitlebarClose, "ui-dialog-titlebar-close" ); + this._on( this.uiDialogTitlebarClose, { + click: function( event ) { + event.preventDefault(); + this.close( event ); + } + } ); + + var uiDialogHeadingLevel = Number.isInteger( this.options.uiDialogTitleHeadingLevel ) && + this.options.uiDialogTitleHeadingLevel > 0 && + this.options.uiDialogTitleHeadingLevel <= 6 ? + "h" + this.options.uiDialogTitleHeadingLevel : "span"; + + uiDialogTitle = $( "<" + uiDialogHeadingLevel + ">" ) + .uniqueId().prependTo( this.uiDialogTitlebar ); + this._addClass( uiDialogTitle, "ui-dialog-title" ); + this._title( uiDialogTitle ); + + this.uiDialogTitlebar.prependTo( this.uiDialog ); + + this.uiDialog.attr( { + "aria-labelledby": uiDialogTitle.attr( "id" ) + } ); + }, + + _title: function( title ) { + if ( this.options.title ) { + title.text( this.options.title ); + } else { + title.html( " " ); + } + }, + + _createButtonPane: function() { + this.uiDialogButtonPane = $( "
        " ); + this._addClass( this.uiDialogButtonPane, "ui-dialog-buttonpane", + "ui-widget-content ui-helper-clearfix" ); + + this.uiButtonSet = $( "
        " ) + .appendTo( this.uiDialogButtonPane ); + this._addClass( this.uiButtonSet, "ui-dialog-buttonset" ); + + this._createButtons(); + }, + + _createButtons: function() { + var that = this, + buttons = this.options.buttons; + + // If we already have a button pane, remove it + this.uiDialogButtonPane.remove(); + this.uiButtonSet.empty(); + + if ( $.isEmptyObject( buttons ) || ( Array.isArray( buttons ) && !buttons.length ) ) { + this._removeClass( this.uiDialog, "ui-dialog-buttons" ); + return; + } + + $.each( buttons, function( name, props ) { + var click, buttonOptions; + props = typeof props === "function" ? + { click: props, text: name } : + props; + + // Default to a non-submitting button + props = $.extend( { type: "button" }, props ); + + // Change the context for the click callback to be the main element + click = props.click; + buttonOptions = { + icon: props.icon, + iconPosition: props.iconPosition, + showLabel: props.showLabel, + + // Deprecated options + icons: props.icons, + text: props.text + }; + + delete props.click; + delete props.icon; + delete props.iconPosition; + delete props.showLabel; + + // Deprecated options + delete props.icons; + if ( typeof props.text === "boolean" ) { + delete props.text; + } + + $( "", props ) + .button( buttonOptions ) + .appendTo( that.uiButtonSet ) + .on( "click", function() { + click.apply( that.element[ 0 ], arguments ); + } ); + } ); + this._addClass( this.uiDialog, "ui-dialog-buttons" ); + this.uiDialogButtonPane.appendTo( this.uiDialog ); + }, + + _makeDraggable: function() { + var that = this, + options = this.options; + + function filteredUi( ui ) { + return { + position: ui.position, + offset: ui.offset + }; + } + + this.uiDialog.draggable( { + cancel: ".ui-dialog-content, .ui-dialog-titlebar-close", + handle: ".ui-dialog-titlebar", + containment: "document", + start: function( event, ui ) { + that._addClass( $( this ), "ui-dialog-dragging" ); + that._blockFrames(); + that._trigger( "dragStart", event, filteredUi( ui ) ); + }, + drag: function( event, ui ) { + that._trigger( "drag", event, filteredUi( ui ) ); + }, + stop: function( event, ui ) { + var left = ui.offset.left - that.document.scrollLeft(), + top = ui.offset.top - that.document.scrollTop(); + + options.position = { + my: "left top", + at: "left" + ( left >= 0 ? "+" : "" ) + left + " " + + "top" + ( top >= 0 ? "+" : "" ) + top, + of: that.window + }; + that._removeClass( $( this ), "ui-dialog-dragging" ); + that._unblockFrames(); + that._trigger( "dragStop", event, filteredUi( ui ) ); + } + } ); + }, + + _makeResizable: function() { + var that = this, + options = this.options, + handles = options.resizable, + + // .ui-resizable has position: relative defined in the stylesheet + // but dialogs have to use absolute or fixed positioning + position = this.uiDialog.css( "position" ), + resizeHandles = typeof handles === "string" ? + handles : + "n,e,s,w,se,sw,ne,nw"; + + function filteredUi( ui ) { + return { + originalPosition: ui.originalPosition, + originalSize: ui.originalSize, + position: ui.position, + size: ui.size + }; + } + + this.uiDialog.resizable( { + cancel: ".ui-dialog-content", + containment: "document", + alsoResize: this.element, + maxWidth: options.maxWidth, + maxHeight: options.maxHeight, + minWidth: options.minWidth, + minHeight: this._minHeight(), + handles: resizeHandles, + start: function( event, ui ) { + that._addClass( $( this ), "ui-dialog-resizing" ); + that._blockFrames(); + that._trigger( "resizeStart", event, filteredUi( ui ) ); + }, + resize: function( event, ui ) { + that._trigger( "resize", event, filteredUi( ui ) ); + }, + stop: function( event, ui ) { + var offset = that.uiDialog.offset(), + left = offset.left - that.document.scrollLeft(), + top = offset.top - that.document.scrollTop(); + + options.height = that.uiDialog.height(); + options.width = that.uiDialog.width(); + options.position = { + my: "left top", + at: "left" + ( left >= 0 ? "+" : "" ) + left + " " + + "top" + ( top >= 0 ? "+" : "" ) + top, + of: that.window + }; + that._removeClass( $( this ), "ui-dialog-resizing" ); + that._unblockFrames(); + that._trigger( "resizeStop", event, filteredUi( ui ) ); + } + } ) + .css( "position", position ); + }, + + _trackFocus: function() { + this._on( this.widget(), { + focusin: function( event ) { + this._makeFocusTarget(); + this._focusedElement = $( event.target ); + } + } ); + }, + + _makeFocusTarget: function() { + this._untrackInstance(); + this._trackingInstances().unshift( this ); + }, + + _untrackInstance: function() { + var instances = this._trackingInstances(), + exists = $.inArray( this, instances ); + if ( exists !== -1 ) { + instances.splice( exists, 1 ); + } + }, + + _trackingInstances: function() { + var instances = this.document.data( "ui-dialog-instances" ); + if ( !instances ) { + instances = []; + this.document.data( "ui-dialog-instances", instances ); + } + return instances; + }, + + _minHeight: function() { + var options = this.options; + + return options.height === "auto" ? + options.minHeight : + Math.min( options.minHeight, options.height ); + }, + + _position: function() { + + // Need to show the dialog to get the actual offset in the position plugin + var isVisible = this.uiDialog.is( ":visible" ); + if ( !isVisible ) { + this.uiDialog.show(); + } + this.uiDialog.position( this.options.position ); + if ( !isVisible ) { + this.uiDialog.hide(); + } + }, + + _setOptions: function( options ) { + var that = this, + resize = false, + resizableOptions = {}; + + $.each( options, function( key, value ) { + that._setOption( key, value ); + + if ( key in that.sizeRelatedOptions ) { + resize = true; + } + if ( key in that.resizableRelatedOptions ) { + resizableOptions[ key ] = value; + } + } ); + + if ( resize ) { + this._size(); + this._position(); + } + if ( this.uiDialog.is( ":data(ui-resizable)" ) ) { + this.uiDialog.resizable( "option", resizableOptions ); + } + }, + + _setOption: function( key, value ) { + var isDraggable, isResizable, + uiDialog = this.uiDialog; + + if ( key === "disabled" ) { + return; + } + + this._super( key, value ); + + if ( key === "appendTo" ) { + this.uiDialog.appendTo( this._appendTo() ); + } + + if ( key === "buttons" ) { + this._createButtons(); + } + + if ( key === "closeText" ) { + this.uiDialogTitlebarClose.button( { + + // Ensure that we always pass a string + label: $( "" ).text( "" + this.options.closeText ).html() + } ); + } + + if ( key === "draggable" ) { + isDraggable = uiDialog.is( ":data(ui-draggable)" ); + if ( isDraggable && !value ) { + uiDialog.draggable( "destroy" ); + } + + if ( !isDraggable && value ) { + this._makeDraggable(); + } + } + + if ( key === "position" ) { + this._position(); + } + + if ( key === "resizable" ) { + + // currently resizable, becoming non-resizable + isResizable = uiDialog.is( ":data(ui-resizable)" ); + if ( isResizable && !value ) { + uiDialog.resizable( "destroy" ); + } + + // Currently resizable, changing handles + if ( isResizable && typeof value === "string" ) { + uiDialog.resizable( "option", "handles", value ); + } + + // Currently non-resizable, becoming resizable + if ( !isResizable && value !== false ) { + this._makeResizable(); + } + } + + if ( key === "title" ) { + this._title( this.uiDialogTitlebar.find( ".ui-dialog-title" ) ); + } + + if ( key === "modal" ) { + uiDialog.attr( "aria-modal", value ? "true" : null ); + } + }, + + _size: function() { + + // If the user has resized the dialog, the .ui-dialog and .ui-dialog-content + // divs will both have width and height set, so we need to reset them + var nonContentHeight, minContentHeight, maxContentHeight, + options = this.options; + + // Reset content sizing + this.element.show().css( { + width: "auto", + minHeight: 0, + maxHeight: "none", + height: 0 + } ); + + if ( options.minWidth > options.width ) { + options.width = options.minWidth; + } + + // Reset wrapper sizing + // determine the height of all the non-content elements + nonContentHeight = this.uiDialog.css( { + height: "auto", + width: options.width + } ) + .outerHeight(); + minContentHeight = Math.max( 0, options.minHeight - nonContentHeight ); + maxContentHeight = typeof options.maxHeight === "number" ? + Math.max( 0, options.maxHeight - nonContentHeight ) : + "none"; + + if ( options.height === "auto" ) { + this.element.css( { + minHeight: minContentHeight, + maxHeight: maxContentHeight, + height: "auto" + } ); + } else { + this.element.height( Math.max( 0, options.height - nonContentHeight ) ); + } + + if ( this.uiDialog.is( ":data(ui-resizable)" ) ) { + this.uiDialog.resizable( "option", "minHeight", this._minHeight() ); + } + }, + + _blockFrames: function() { + this.iframeBlocks = this.document.find( "iframe" ).map( function() { + var iframe = $( this ); + + return $( "
        " ) + .css( { + position: "absolute", + width: iframe.outerWidth(), + height: iframe.outerHeight() + } ) + .appendTo( iframe.parent() ) + .offset( iframe.offset() )[ 0 ]; + } ); + }, + + _unblockFrames: function() { + if ( this.iframeBlocks ) { + this.iframeBlocks.remove(); + delete this.iframeBlocks; + } + }, + + _allowInteraction: function( event ) { + if ( $( event.target ).closest( ".ui-dialog" ).length ) { + return true; + } + + // TODO: Remove hack when datepicker implements + // the .ui-front logic (#8989) + return !!$( event.target ).closest( ".ui-datepicker" ).length; + }, + + _createOverlay: function() { + if ( !this.options.modal ) { + return; + } + + // We use a delay in case the overlay is created from an + // event that we're going to be cancelling (#2804) + var isOpening = true; + this._delay( function() { + isOpening = false; + } ); + + if ( !this.document.data( "ui-dialog-overlays" ) ) { + + // Prevent use of anchors and inputs + // This doesn't use `_on()` because it is a shared event handler + // across all open modal dialogs. + this.document.on( "focusin.ui-dialog", function( event ) { + if ( isOpening ) { + return; + } + + var instance = this._trackingInstances()[ 0 ]; + if ( !instance._allowInteraction( event ) ) { + event.preventDefault(); + instance._focusTabbable(); + } + }.bind( this ) ); + } + + this.overlay = $( "
        " ) + .appendTo( this._appendTo() ); + + this._addClass( this.overlay, null, "ui-widget-overlay ui-front" ); + this._on( this.overlay, { + mousedown: "_keepFocus" + } ); + this.document.data( "ui-dialog-overlays", + ( this.document.data( "ui-dialog-overlays" ) || 0 ) + 1 ); + }, + + _destroyOverlay: function() { + if ( !this.options.modal ) { + return; + } + + if ( this.overlay ) { + var overlays = this.document.data( "ui-dialog-overlays" ) - 1; + + if ( !overlays ) { + this.document.off( "focusin.ui-dialog" ); + this.document.removeData( "ui-dialog-overlays" ); + } else { + this.document.data( "ui-dialog-overlays", overlays ); + } + + this.overlay.remove(); + this.overlay = null; + } + } +} ); + +// DEPRECATED +// TODO: switch return back to widget declaration at top of file when this is removed +if ( $.uiBackCompat === true ) { + + // Backcompat for dialogClass option + $.widget( "ui.dialog", $.ui.dialog, { + options: { + dialogClass: "" + }, + _createWrapper: function() { + this._super(); + this.uiDialog.addClass( this.options.dialogClass ); + }, + _setOption: function( key, value ) { + if ( key === "dialogClass" ) { + this.uiDialog + .removeClass( this.options.dialogClass ) + .addClass( value ); + } + this._superApply( arguments ); + } + } ); +} + +var widgetsDialog = $.ui.dialog; + + +/*! + * jQuery UI Progressbar 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Progressbar +//>>group: Widgets +/* eslint-disable max-len */ +//>>description: Displays a status indicator for loading state, standard percentage, and other progress indicators. +/* eslint-enable max-len */ +//>>docs: https://api.jqueryui.com/progressbar/ +//>>demos: https://jqueryui.com/progressbar/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/progressbar.css +//>>css.theme: ../../themes/base/theme.css + + +var widgetsProgressbar = $.widget( "ui.progressbar", { + version: "1.14.1", + options: { + classes: { + "ui-progressbar": "ui-corner-all", + "ui-progressbar-value": "ui-corner-left", + "ui-progressbar-complete": "ui-corner-right" + }, + max: 100, + value: 0, + + change: null, + complete: null + }, + + min: 0, + + _create: function() { + + // Constrain initial value + this.oldValue = this.options.value = this._constrainedValue(); + + this.element.attr( { + + // Only set static values; aria-valuenow and aria-valuemax are + // set inside _refreshValue() + role: "progressbar", + "aria-valuemin": this.min + } ); + this._addClass( "ui-progressbar", "ui-widget ui-widget-content" ); + + this.valueDiv = $( "
        " ).appendTo( this.element ); + this._addClass( this.valueDiv, "ui-progressbar-value", "ui-widget-header" ); + this._refreshValue(); + }, + + _destroy: function() { + this.element.removeAttr( "role aria-valuemin aria-valuemax aria-valuenow" ); + + this.valueDiv.remove(); + }, + + value: function( newValue ) { + if ( newValue === undefined ) { + return this.options.value; + } + + this.options.value = this._constrainedValue( newValue ); + this._refreshValue(); + }, + + _constrainedValue: function( newValue ) { + if ( newValue === undefined ) { + newValue = this.options.value; + } + + this.indeterminate = newValue === false; + + // Sanitize value + if ( typeof newValue !== "number" ) { + newValue = 0; + } + + return this.indeterminate ? false : + Math.min( this.options.max, Math.max( this.min, newValue ) ); + }, + + _setOptions: function( options ) { + + // Ensure "value" option is set after other values (like max) + var value = options.value; + delete options.value; + + this._super( options ); + + this.options.value = this._constrainedValue( value ); + this._refreshValue(); + }, + + _setOption: function( key, value ) { + if ( key === "max" ) { + + // Don't allow a max less than min + value = Math.max( this.min, value ); + } + this._super( key, value ); + }, + + _setOptionDisabled: function( value ) { + this._super( value ); + + this.element.attr( "aria-disabled", value ); + this._toggleClass( null, "ui-state-disabled", !!value ); + }, + + _percentage: function() { + return this.indeterminate ? + 100 : + 100 * ( this.options.value - this.min ) / ( this.options.max - this.min ); + }, + + _refreshValue: function() { + var value = this.options.value, + percentage = this._percentage(); + + this.valueDiv + .toggle( this.indeterminate || value > this.min ) + .width( percentage.toFixed( 0 ) + "%" ); + + this + ._toggleClass( this.valueDiv, "ui-progressbar-complete", null, + value === this.options.max ) + ._toggleClass( "ui-progressbar-indeterminate", null, this.indeterminate ); + + if ( this.indeterminate ) { + this.element.removeAttr( "aria-valuenow" ); + if ( !this.overlayDiv ) { + this.overlayDiv = $( "
        " ).appendTo( this.valueDiv ); + this._addClass( this.overlayDiv, "ui-progressbar-overlay" ); + } + } else { + this.element.attr( { + "aria-valuemax": this.options.max, + "aria-valuenow": value + } ); + if ( this.overlayDiv ) { + this.overlayDiv.remove(); + this.overlayDiv = null; + } + } + + if ( this.oldValue !== value ) { + this.oldValue = value; + this._trigger( "change" ); + } + if ( value === this.options.max ) { + this._trigger( "complete" ); + } + } +} ); + + +/*! + * jQuery UI Selectmenu 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Selectmenu +//>>group: Widgets +/* eslint-disable max-len */ +//>>description: Duplicates and extends the functionality of a native HTML select element, allowing it to be customizable in behavior and appearance far beyond the limitations of a native select. +/* eslint-enable max-len */ +//>>docs: https://api.jqueryui.com/selectmenu/ +//>>demos: https://jqueryui.com/selectmenu/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/selectmenu.css, ../../themes/base/button.css +//>>css.theme: ../../themes/base/theme.css + + +var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, { + version: "1.14.1", + defaultElement: "", + widgetEventPrefix: "spin", + options: { + classes: { + "ui-spinner": "ui-corner-all", + "ui-spinner-down": "ui-corner-br", + "ui-spinner-up": "ui-corner-tr" + }, + culture: null, + icons: { + down: "ui-icon-triangle-1-s", + up: "ui-icon-triangle-1-n" + }, + incremental: true, + max: null, + min: null, + numberFormat: null, + page: 10, + step: 1, + + change: null, + spin: null, + start: null, + stop: null + }, + + _create: function() { + + // handle string values that need to be parsed + this._setOption( "max", this.options.max ); + this._setOption( "min", this.options.min ); + this._setOption( "step", this.options.step ); + + // Only format if there is a value, prevents the field from being marked + // as invalid in Firefox, see #9573. + if ( this.value() !== "" ) { + + // Format the value, but don't constrain. + this._value( this.element.val(), true ); + } + + this._draw(); + this._on( this._events ); + this._refresh(); + + // Turning off autocomplete prevents the browser from remembering the + // value when navigating through history, so we re-enable autocomplete + // if the page is unloaded before the widget is destroyed. #7790 + this._on( this.window, { + beforeunload: function() { + this.element.removeAttr( "autocomplete" ); + } + } ); + }, + + _getCreateOptions: function() { + var options = this._super(); + var element = this.element; + + $.each( [ "min", "max", "step" ], function( i, option ) { + var value = element.attr( option ); + if ( value != null && value.length ) { + options[ option ] = value; + } + } ); + + return options; + }, + + _events: { + keydown: function( event ) { + if ( this._start( event ) && this._keydown( event ) ) { + event.preventDefault(); + } + }, + keyup: "_stop", + focus: function() { + this.previous = this.element.val(); + }, + blur: function( event ) { + this._stop(); + this._refresh(); + if ( this.previous !== this.element.val() ) { + this._trigger( "change", event ); + } + }, + mousewheel: function( event, delta ) { + var activeElement = this.document[ 0 ].activeElement; + var isActive = this.element[ 0 ] === activeElement; + + if ( !isActive || !delta ) { + return; + } + + if ( !this.spinning && !this._start( event ) ) { + return false; + } + + this._spin( ( delta > 0 ? 1 : -1 ) * this.options.step, event ); + clearTimeout( this.mousewheelTimer ); + this.mousewheelTimer = this._delay( function() { + if ( this.spinning ) { + this._stop( event ); + } + }, 100 ); + event.preventDefault(); + }, + "mousedown .ui-spinner-button": function( event ) { + var previous; + + // We never want the buttons to have focus; whenever the user is + // interacting with the spinner, the focus should be on the input. + // If the input is focused then this.previous is properly set from + // when the input first received focus. If the input is not focused + // then we need to set this.previous based on the value before spinning. + previous = this.element[ 0 ] === this.document[ 0 ].activeElement ? + this.previous : this.element.val(); + function checkFocus() { + var isActive = this.element[ 0 ] === this.document[ 0 ].activeElement; + if ( !isActive ) { + this.element.trigger( "focus" ); + this.previous = previous; + } + } + + // Ensure focus is on (or stays on) the text field + event.preventDefault(); + checkFocus.call( this ); + + if ( this._start( event ) === false ) { + return; + } + + this._repeat( null, $( event.currentTarget ) + .hasClass( "ui-spinner-up" ) ? 1 : -1, event ); + }, + "mouseup .ui-spinner-button": "_stop", + "mouseenter .ui-spinner-button": function( event ) { + + // button will add ui-state-active if mouse was down while mouseleave and kept down + if ( !$( event.currentTarget ).hasClass( "ui-state-active" ) ) { + return; + } + + if ( this._start( event ) === false ) { + return false; + } + this._repeat( null, $( event.currentTarget ) + .hasClass( "ui-spinner-up" ) ? 1 : -1, event ); + }, + + // TODO: do we really want to consider this a stop? + // shouldn't we just stop the repeater and wait until mouseup before + // we trigger the stop event? + "mouseleave .ui-spinner-button": "_stop" + }, + + // Support mobile enhanced option and make backcompat more sane + _enhance: function() { + this.uiSpinner = this.element + .attr( "autocomplete", "off" ) + .wrap( "" ) + .parent() + + // Add buttons + .append( + "" + ); + }, + + _draw: function() { + this._enhance(); + + this._addClass( this.uiSpinner, "ui-spinner", "ui-widget ui-widget-content" ); + this._addClass( "ui-spinner-input" ); + + this.element.attr( "role", "spinbutton" ); + + // Button bindings + this.buttons = this.uiSpinner.children( "a" ) + .attr( "tabIndex", -1 ) + .attr( "aria-hidden", true ) + .button( { + classes: { + "ui-button": "" + } + } ); + + // TODO: Right now button does not support classes this is already updated in button PR + this._removeClass( this.buttons, "ui-corner-all" ); + + this._addClass( this.buttons.first(), "ui-spinner-button ui-spinner-up" ); + this._addClass( this.buttons.last(), "ui-spinner-button ui-spinner-down" ); + this.buttons.first().button( { + "icon": this.options.icons.up, + "showLabel": false + } ); + this.buttons.last().button( { + "icon": this.options.icons.down, + "showLabel": false + } ); + + // IE 6 doesn't understand height: 50% for the buttons + // unless the wrapper has an explicit height + if ( this.buttons.height() > Math.ceil( this.uiSpinner.height() * 0.5 ) && + this.uiSpinner.height() > 0 ) { + this.uiSpinner.height( this.uiSpinner.height() ); + } + }, + + _keydown: function( event ) { + var options = this.options, + keyCode = $.ui.keyCode; + + switch ( event.keyCode ) { + case keyCode.UP: + this._repeat( null, 1, event ); + return true; + case keyCode.DOWN: + this._repeat( null, -1, event ); + return true; + case keyCode.PAGE_UP: + this._repeat( null, options.page, event ); + return true; + case keyCode.PAGE_DOWN: + this._repeat( null, -options.page, event ); + return true; + } + + return false; + }, + + _start: function( event ) { + if ( !this.spinning && this._trigger( "start", event ) === false ) { + return false; + } + + if ( !this.counter ) { + this.counter = 1; + } + this.spinning = true; + return true; + }, + + _repeat: function( i, steps, event ) { + i = i || 500; + + clearTimeout( this.timer ); + this.timer = this._delay( function() { + this._repeat( 40, steps, event ); + }, i ); + + this._spin( steps * this.options.step, event ); + }, + + _spin: function( step, event ) { + var value = this.value() || 0; + + if ( !this.counter ) { + this.counter = 1; + } + + value = this._adjustValue( value + step * this._increment( this.counter ) ); + + if ( !this.spinning || this._trigger( "spin", event, { value: value } ) !== false ) { + this._value( value ); + this.counter++; + } + }, + + _increment: function( i ) { + var incremental = this.options.incremental; + + if ( incremental ) { + return typeof incremental === "function" ? + incremental( i ) : + Math.floor( i * i * i / 50000 - i * i / 500 + 17 * i / 200 + 1 ); + } + + return 1; + }, + + _precision: function() { + var precision = this._precisionOf( this.options.step ); + if ( this.options.min !== null ) { + precision = Math.max( precision, this._precisionOf( this.options.min ) ); + } + return precision; + }, + + _precisionOf: function( num ) { + var str = num.toString(), + decimal = str.indexOf( "." ); + return decimal === -1 ? 0 : str.length - decimal - 1; + }, + + _adjustValue: function( value ) { + var base, aboveMin, + options = this.options; + + // Make sure we're at a valid step + // - find out where we are relative to the base (min or 0) + base = options.min !== null ? options.min : 0; + aboveMin = value - base; + + // - round to the nearest step + aboveMin = Math.round( aboveMin / options.step ) * options.step; + + // - rounding is based on 0, so adjust back to our base + value = base + aboveMin; + + // Fix precision from bad JS floating point math + value = parseFloat( value.toFixed( this._precision() ) ); + + // Clamp the value + if ( options.max !== null && value > options.max ) { + return options.max; + } + if ( options.min !== null && value < options.min ) { + return options.min; + } + + return value; + }, + + _stop: function( event ) { + if ( !this.spinning ) { + return; + } + + clearTimeout( this.timer ); + clearTimeout( this.mousewheelTimer ); + this.counter = 0; + this.spinning = false; + this._trigger( "stop", event ); + }, + + _setOption: function( key, value ) { + var prevValue, first, last; + + if ( key === "culture" || key === "numberFormat" ) { + prevValue = this._parse( this.element.val() ); + this.options[ key ] = value; + this.element.val( this._format( prevValue ) ); + return; + } + + if ( key === "max" || key === "min" || key === "step" ) { + if ( typeof value === "string" ) { + value = this._parse( value ); + } + } + if ( key === "icons" ) { + first = this.buttons.first().find( ".ui-icon" ); + this._removeClass( first, null, this.options.icons.up ); + this._addClass( first, null, value.up ); + last = this.buttons.last().find( ".ui-icon" ); + this._removeClass( last, null, this.options.icons.down ); + this._addClass( last, null, value.down ); + } + + this._super( key, value ); + }, + + _setOptionDisabled: function( value ) { + this._super( value ); + + this._toggleClass( this.uiSpinner, null, "ui-state-disabled", !!value ); + this.element.prop( "disabled", !!value ); + this.buttons.button( value ? "disable" : "enable" ); + }, + + _setOptions: spinnerModifier( function( options ) { + this._super( options ); + } ), + + _parse: function( val ) { + if ( typeof val === "string" && val !== "" ) { + val = window.Globalize && this.options.numberFormat ? + Globalize.parseFloat( val, 10, this.options.culture ) : +val; + } + return val === "" || isNaN( val ) ? null : val; + }, + + _format: function( value ) { + if ( value === "" ) { + return ""; + } + return window.Globalize && this.options.numberFormat ? + Globalize.format( value, this.options.numberFormat, this.options.culture ) : + value; + }, + + _refresh: function() { + this.element.attr( { + "aria-valuemin": this.options.min, + "aria-valuemax": this.options.max, + + // TODO: what should we do with values that can't be parsed? + "aria-valuenow": this._parse( this.element.val() ) + } ); + }, + + isValid: function() { + var value = this.value(); + + // Null is invalid + if ( value === null ) { + return false; + } + + // If value gets adjusted, it's invalid + return value === this._adjustValue( value ); + }, + + // Update the value without triggering change + _value: function( value, allowAny ) { + var parsed; + if ( value !== "" ) { + parsed = this._parse( value ); + if ( parsed !== null ) { + if ( !allowAny ) { + parsed = this._adjustValue( parsed ); + } + value = this._format( parsed ); + } + } + this.element.val( value ); + this._refresh(); + }, + + _destroy: function() { + this.element + .prop( "disabled", false ) + .removeAttr( "autocomplete role aria-valuemin aria-valuemax aria-valuenow" ); + + this.uiSpinner.replaceWith( this.element ); + }, + + stepUp: spinnerModifier( function( steps ) { + this._stepUp( steps ); + } ), + _stepUp: function( steps ) { + if ( this._start() ) { + this._spin( ( steps || 1 ) * this.options.step ); + this._stop(); + } + }, + + stepDown: spinnerModifier( function( steps ) { + this._stepDown( steps ); + } ), + _stepDown: function( steps ) { + if ( this._start() ) { + this._spin( ( steps || 1 ) * -this.options.step ); + this._stop(); + } + }, + + pageUp: spinnerModifier( function( pages ) { + this._stepUp( ( pages || 1 ) * this.options.page ); + } ), + + pageDown: spinnerModifier( function( pages ) { + this._stepDown( ( pages || 1 ) * this.options.page ); + } ), + + value: function( newVal ) { + if ( !arguments.length ) { + return this._parse( this.element.val() ); + } + spinnerModifier( this._value ).call( this, newVal ); + }, + + widget: function() { + return this.uiSpinner; + } +} ); + +// DEPRECATED +// TODO: switch return back to widget declaration at top of file when this is removed +if ( $.uiBackCompat === true ) { + + // Backcompat for spinner html extension points + $.widget( "ui.spinner", $.ui.spinner, { + _enhance: function() { + this.uiSpinner = this.element + .attr( "autocomplete", "off" ) + .wrap( this._uiSpinnerHtml() ) + .parent() + + // Add buttons + .append( this._buttonHtml() ); + }, + _uiSpinnerHtml: function() { + return ""; + }, + + _buttonHtml: function() { + return ""; + } + } ); +} + +var widgetsSpinner = $.ui.spinner; + + +/*! + * jQuery UI Tabs 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Tabs +//>>group: Widgets +//>>description: Transforms a set of container elements into a tab structure. +//>>docs: https://api.jqueryui.com/tabs/ +//>>demos: https://jqueryui.com/tabs/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/tabs.css +//>>css.theme: ../../themes/base/theme.css + + +$.widget( "ui.tabs", { + version: "1.14.1", + delay: 300, + options: { + active: null, + classes: { + "ui-tabs": "ui-corner-all", + "ui-tabs-nav": "ui-corner-all", + "ui-tabs-panel": "ui-corner-bottom", + "ui-tabs-tab": "ui-corner-top" + }, + collapsible: false, + event: "click", + heightStyle: "content", + hide: null, + show: null, + + // Callbacks + activate: null, + beforeActivate: null, + beforeLoad: null, + load: null + }, + + _isLocal: ( function() { + var rhash = /#.*$/; + + return function( anchor ) { + var anchorUrl, locationUrl; + + anchorUrl = anchor.href.replace( rhash, "" ); + locationUrl = location.href.replace( rhash, "" ); + + // Decoding may throw an error if the URL isn't UTF-8 (#9518) + try { + anchorUrl = decodeURIComponent( anchorUrl ); + } catch ( error ) {} + try { + locationUrl = decodeURIComponent( locationUrl ); + } catch ( error ) {} + + return anchor.hash.length > 1 && anchorUrl === locationUrl; + }; + } )(), + + _create: function() { + var that = this, + options = this.options; + + this.running = false; + + this._addClass( "ui-tabs", "ui-widget ui-widget-content" ); + this._toggleClass( "ui-tabs-collapsible", null, options.collapsible ); + + this._processTabs(); + options.active = this._initialActive(); + + // Take disabling tabs via class attribute from HTML + // into account and update option properly. + if ( Array.isArray( options.disabled ) ) { + options.disabled = $.uniqueSort( options.disabled.concat( + $.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) { + return that.tabs.index( li ); + } ) + ) ).sort(); + } + + // Check for length avoids error when initializing empty list + if ( this.options.active !== false && this.anchors.length ) { + this.active = this._findActive( options.active ); + } else { + this.active = $(); + } + + this._refresh(); + + if ( this.active.length ) { + this.load( options.active ); + } + }, + + _initialActive: function() { + var active = this.options.active, + collapsible = this.options.collapsible, + locationHashDecoded = decodeURIComponent( location.hash.substring( 1 ) ); + + if ( active === null ) { + + // check the fragment identifier in the URL + if ( locationHashDecoded ) { + this.tabs.each( function( i, tab ) { + if ( $( tab ).attr( "aria-controls" ) === locationHashDecoded ) { + active = i; + return false; + } + } ); + } + + // Check for a tab marked active via a class + if ( active === null ) { + active = this.tabs.index( this.tabs.filter( ".ui-tabs-active" ) ); + } + + // No active tab, set to false + if ( active === null || active === -1 ) { + active = this.tabs.length ? 0 : false; + } + } + + // Handle numbers: negative, out of range + if ( active !== false ) { + active = this.tabs.index( this.tabs.eq( active ) ); + if ( active === -1 ) { + active = collapsible ? false : 0; + } + } + + // Don't allow collapsible: false and active: false + if ( !collapsible && active === false && this.anchors.length ) { + active = 0; + } + + return active; + }, + + _getCreateEventData: function() { + return { + tab: this.active, + panel: !this.active.length ? $() : this._getPanelForTab( this.active ) + }; + }, + + _tabKeydown: function( event ) { + var focusedTab = $( this.document[ 0 ].activeElement ).closest( "li" ), + selectedIndex = this.tabs.index( focusedTab ), + goingForward = true; + + if ( this._handlePageNav( event ) ) { + return; + } + + switch ( event.keyCode ) { + case $.ui.keyCode.RIGHT: + case $.ui.keyCode.DOWN: + selectedIndex++; + break; + case $.ui.keyCode.UP: + case $.ui.keyCode.LEFT: + goingForward = false; + selectedIndex--; + break; + case $.ui.keyCode.END: + selectedIndex = this.anchors.length - 1; + break; + case $.ui.keyCode.HOME: + selectedIndex = 0; + break; + case $.ui.keyCode.SPACE: + + // Activate only, no collapsing + event.preventDefault(); + clearTimeout( this.activating ); + this._activate( selectedIndex ); + return; + case $.ui.keyCode.ENTER: + + // Toggle (cancel delayed activation, allow collapsing) + event.preventDefault(); + clearTimeout( this.activating ); + + // Determine if we should collapse or activate + this._activate( selectedIndex === this.options.active ? false : selectedIndex ); + return; + default: + return; + } + + // Focus the appropriate tab, based on which key was pressed + event.preventDefault(); + clearTimeout( this.activating ); + selectedIndex = this._focusNextTab( selectedIndex, goingForward ); + + // Navigating with control/command key will prevent automatic activation + if ( !event.ctrlKey && !event.metaKey ) { + + // Update aria-selected immediately so that AT think the tab is already selected. + // Otherwise AT may confuse the user by stating that they need to activate the tab, + // but the tab will already be activated by the time the announcement finishes. + focusedTab.attr( "aria-selected", "false" ); + this.tabs.eq( selectedIndex ).attr( "aria-selected", "true" ); + + this.activating = this._delay( function() { + this.option( "active", selectedIndex ); + }, this.delay ); + } + }, + + _panelKeydown: function( event ) { + if ( this._handlePageNav( event ) ) { + return; + } + + // Ctrl+up moves focus to the current tab + if ( event.ctrlKey && event.keyCode === $.ui.keyCode.UP ) { + event.preventDefault(); + this.active.trigger( "focus" ); + } + }, + + // Alt+page up/down moves focus to the previous/next tab (and activates) + _handlePageNav: function( event ) { + if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_UP ) { + this._activate( this._focusNextTab( this.options.active - 1, false ) ); + return true; + } + if ( event.altKey && event.keyCode === $.ui.keyCode.PAGE_DOWN ) { + this._activate( this._focusNextTab( this.options.active + 1, true ) ); + return true; + } + }, + + _findNextTab: function( index, goingForward ) { + var lastTabIndex = this.tabs.length - 1; + + function constrain() { + if ( index > lastTabIndex ) { + index = 0; + } + if ( index < 0 ) { + index = lastTabIndex; + } + return index; + } + + while ( $.inArray( constrain(), this.options.disabled ) !== -1 ) { + index = goingForward ? index + 1 : index - 1; + } + + return index; + }, + + _focusNextTab: function( index, goingForward ) { + index = this._findNextTab( index, goingForward ); + this.tabs.eq( index ).trigger( "focus" ); + return index; + }, + + _setOption: function( key, value ) { + if ( key === "active" ) { + + // _activate() will handle invalid values and update this.options + this._activate( value ); + return; + } + + this._super( key, value ); + + if ( key === "collapsible" ) { + this._toggleClass( "ui-tabs-collapsible", null, value ); + + // Setting collapsible: false while collapsed; open first panel + if ( !value && this.options.active === false ) { + this._activate( 0 ); + } + } + + if ( key === "event" ) { + this._setupEvents( value ); + } + + if ( key === "heightStyle" ) { + this._setupHeightStyle( value ); + } + }, + + refresh: function() { + var options = this.options, + lis = this.tablist.children( ":has(a[href])" ); + + // Get disabled tabs from class attribute from HTML + // this will get converted to a boolean if needed in _refresh() + options.disabled = $.map( lis.filter( ".ui-state-disabled" ), function( tab ) { + return lis.index( tab ); + } ); + + this._processTabs(); + + // Was collapsed or no tabs + if ( options.active === false || !this.anchors.length ) { + options.active = false; + this.active = $(); + + // was active, but active tab is gone + } else if ( this.active.length && !$.contains( this.tablist[ 0 ], this.active[ 0 ] ) ) { + + // all remaining tabs are disabled + if ( this.tabs.length === options.disabled.length ) { + options.active = false; + this.active = $(); + + // activate previous tab + } else { + this._activate( this._findNextTab( Math.max( 0, options.active - 1 ), false ) ); + } + + // was active, active tab still exists + } else { + + // make sure active index is correct + options.active = this.tabs.index( this.active ); + } + + this._refresh(); + }, + + _refresh: function() { + this._setOptionDisabled( this.options.disabled ); + this._setupEvents( this.options.event ); + this._setupHeightStyle( this.options.heightStyle ); + + this.tabs.not( this.active ).attr( { + "aria-selected": "false", + "aria-expanded": "false", + tabIndex: -1 + } ); + this.panels.not( this._getPanelForTab( this.active ) ) + .hide() + .attr( { + "aria-hidden": "true" + } ); + + // Make sure one tab is in the tab order + if ( !this.active.length ) { + this.tabs.eq( 0 ).attr( "tabIndex", 0 ); + } else { + this.active + .attr( { + "aria-selected": "true", + "aria-expanded": "true", + tabIndex: 0 + } ); + this._addClass( this.active, "ui-tabs-active", "ui-state-active" ); + this._getPanelForTab( this.active ) + .show() + .attr( { + "aria-hidden": "false" + } ); + } + }, + + _processTabs: function() { + var that = this, + prevTabs = this.tabs, + prevAnchors = this.anchors, + prevPanels = this.panels; + + this.tablist = this._getList().attr( "role", "tablist" ); + this._addClass( this.tablist, "ui-tabs-nav", + "ui-helper-reset ui-helper-clearfix ui-widget-header" ); + + // Prevent users from focusing disabled tabs via click + this.tablist + .on( "mousedown" + this.eventNamespace, "> li", function( event ) { + if ( $( this ).is( ".ui-state-disabled" ) ) { + event.preventDefault(); + } + } ); + + this.tabs = this.tablist.find( "> li:has(a[href])" ) + .attr( { + role: "tab", + tabIndex: -1 + } ); + this._addClass( this.tabs, "ui-tabs-tab", "ui-state-default" ); + + this.anchors = this.tabs.map( function() { + return $( "a", this )[ 0 ]; + } ) + .attr( { + tabIndex: -1 + } ); + this._addClass( this.anchors, "ui-tabs-anchor" ); + + this.panels = $(); + + this.anchors.each( function( i, anchor ) { + var selector, panel, panelId, + anchorId = $( anchor ).uniqueId().attr( "id" ), + tab = $( anchor ).closest( "li" ), + originalAriaControls = tab.attr( "aria-controls" ); + + // Inline tab + if ( that._isLocal( anchor ) ) { + selector = decodeURIComponent( anchor.hash ); + panelId = selector.substring( 1 ); + panel = that.element.find( "#" + CSS.escape( panelId ) ); + + // remote tab + } else { + + // If the tab doesn't already have aria-controls, + // generate an id by using a throw-away element + panelId = tab.attr( "aria-controls" ) || $( {} ).uniqueId()[ 0 ].id; + selector = "#" + panelId; + panel = that.element.find( selector ); + if ( !panel.length ) { + panel = that._createPanel( panelId ); + panel.insertAfter( that.panels[ i - 1 ] || that.tablist ); + } + panel.attr( "aria-live", "polite" ); + } + + if ( panel.length ) { + that.panels = that.panels.add( panel ); + } + if ( originalAriaControls ) { + tab.data( "ui-tabs-aria-controls", originalAriaControls ); + } + tab.attr( { + "aria-controls": panelId, + "aria-labelledby": anchorId + } ); + panel.attr( "aria-labelledby", anchorId ); + } ); + + this.panels.attr( "role", "tabpanel" ); + this._addClass( this.panels, "ui-tabs-panel", "ui-widget-content" ); + + // Avoid memory leaks (#10056) + if ( prevTabs ) { + this._off( prevTabs.not( this.tabs ) ); + this._off( prevAnchors.not( this.anchors ) ); + this._off( prevPanels.not( this.panels ) ); + } + }, + + // Allow overriding how to find the list for rare usage scenarios (#7715) + _getList: function() { + return this.tablist || this.element.find( "ol, ul" ).eq( 0 ); + }, + + _createPanel: function( id ) { + return $( "
        " ) + .attr( "id", id ) + .data( "ui-tabs-destroy", true ); + }, + + _setOptionDisabled: function( disabled ) { + var currentItem, li, i; + + if ( Array.isArray( disabled ) ) { + if ( !disabled.length ) { + disabled = false; + } else if ( disabled.length === this.anchors.length ) { + disabled = true; + } + } + + // Disable tabs + for ( i = 0; ( li = this.tabs[ i ] ); i++ ) { + currentItem = $( li ); + if ( disabled === true || $.inArray( i, disabled ) !== -1 ) { + currentItem.attr( "aria-disabled", "true" ); + this._addClass( currentItem, null, "ui-state-disabled" ); + } else { + currentItem.removeAttr( "aria-disabled" ); + this._removeClass( currentItem, null, "ui-state-disabled" ); + } + } + + this.options.disabled = disabled; + + this._toggleClass( this.widget(), this.widgetFullName + "-disabled", null, + disabled === true ); + }, + + _setupEvents: function( event ) { + var events = {}; + if ( event ) { + $.each( event.split( " " ), function( index, eventName ) { + events[ eventName ] = "_eventHandler"; + } ); + } + + this._off( this.anchors.add( this.tabs ).add( this.panels ) ); + + // Always prevent the default action, even when disabled + this._on( true, this.anchors, { + click: function( event ) { + event.preventDefault(); + } + } ); + this._on( this.anchors, events ); + this._on( this.tabs, { keydown: "_tabKeydown" } ); + this._on( this.panels, { keydown: "_panelKeydown" } ); + + this._focusable( this.tabs ); + this._hoverable( this.tabs ); + }, + + _setupHeightStyle: function( heightStyle ) { + var maxHeight, + parent = this.element.parent(); + + if ( heightStyle === "fill" ) { + maxHeight = parent.height(); + maxHeight -= this.element.outerHeight() - this.element.height(); + + this.element.siblings( ":visible" ).each( function() { + var elem = $( this ), + position = elem.css( "position" ); + + if ( position === "absolute" || position === "fixed" ) { + return; + } + maxHeight -= elem.outerHeight( true ); + } ); + + this.element.children().not( this.panels ).each( function() { + maxHeight -= $( this ).outerHeight( true ); + } ); + + this.panels.each( function() { + $( this ).height( Math.max( 0, maxHeight - + $( this ).innerHeight() + $( this ).height() ) ); + } ) + .css( "overflow", "auto" ); + } else if ( heightStyle === "auto" ) { + maxHeight = 0; + this.panels.each( function() { + maxHeight = Math.max( maxHeight, $( this ).height( "" ).height() ); + } ).height( maxHeight ); + } + }, + + _eventHandler: function( event ) { + var options = this.options, + active = this.active, + anchor = $( event.currentTarget ), + tab = anchor.closest( "li" ), + clickedIsActive = tab[ 0 ] === active[ 0 ], + collapsing = clickedIsActive && options.collapsible, + toShow = collapsing ? $() : this._getPanelForTab( tab ), + toHide = !active.length ? $() : this._getPanelForTab( active ), + eventData = { + oldTab: active, + oldPanel: toHide, + newTab: collapsing ? $() : tab, + newPanel: toShow + }; + + event.preventDefault(); + + if ( tab.hasClass( "ui-state-disabled" ) || + + // tab is already loading + tab.hasClass( "ui-tabs-loading" ) || + + // can't switch durning an animation + this.running || + + // click on active header, but not collapsible + ( clickedIsActive && !options.collapsible ) || + + // allow canceling activation + ( this._trigger( "beforeActivate", event, eventData ) === false ) ) { + return; + } + + options.active = collapsing ? false : this.tabs.index( tab ); + + this.active = clickedIsActive ? $() : tab; + if ( this.xhr ) { + this.xhr.abort(); + } + + if ( !toHide.length && !toShow.length ) { + $.error( "jQuery UI Tabs: Mismatching fragment identifier." ); + } + + if ( toShow.length ) { + this.load( this.tabs.index( tab ), event ); + } + this._toggle( event, eventData ); + }, + + // Handles show/hide for selecting tabs + _toggle: function( event, eventData ) { + var that = this, + toShow = eventData.newPanel, + toHide = eventData.oldPanel; + + this.running = true; + + function complete() { + that.running = false; + that._trigger( "activate", event, eventData ); + } + + function show() { + that._addClass( eventData.newTab.closest( "li" ), "ui-tabs-active", "ui-state-active" ); + + if ( toShow.length && that.options.show ) { + that._show( toShow, that.options.show, complete ); + } else { + toShow.show(); + complete(); + } + } + + // Start out by hiding, then showing, then completing + if ( toHide.length && this.options.hide ) { + this._hide( toHide, this.options.hide, function() { + that._removeClass( eventData.oldTab.closest( "li" ), + "ui-tabs-active", "ui-state-active" ); + show(); + } ); + } else { + this._removeClass( eventData.oldTab.closest( "li" ), + "ui-tabs-active", "ui-state-active" ); + toHide.hide(); + show(); + } + + toHide.attr( "aria-hidden", "true" ); + eventData.oldTab.attr( { + "aria-selected": "false", + "aria-expanded": "false" + } ); + + // If we're switching tabs, remove the old tab from the tab order. + // If we're opening from collapsed state, remove the previous tab from the tab order. + // If we're collapsing, then keep the collapsing tab in the tab order. + if ( toShow.length && toHide.length ) { + eventData.oldTab.attr( "tabIndex", -1 ); + } else if ( toShow.length ) { + this.tabs.filter( function() { + return $( this ).attr( "tabIndex" ) === 0; + } ) + .attr( "tabIndex", -1 ); + } + + toShow.attr( "aria-hidden", "false" ); + eventData.newTab.attr( { + "aria-selected": "true", + "aria-expanded": "true", + tabIndex: 0 + } ); + }, + + _activate: function( index ) { + var anchor, + active = this._findActive( index ); + + // Trying to activate the already active panel + if ( active[ 0 ] === this.active[ 0 ] ) { + return; + } + + // Trying to collapse, simulate a click on the current active header + if ( !active.length ) { + active = this.active; + } + + anchor = active.find( ".ui-tabs-anchor" )[ 0 ]; + this._eventHandler( { + target: anchor, + currentTarget: anchor, + preventDefault: $.noop + } ); + }, + + _findActive: function( index ) { + return index === false ? $() : this.tabs.eq( index ); + }, + + _getIndex: function( index ) { + + // meta-function to give users option to provide a href string instead of a numerical index. + if ( typeof index === "string" ) { + index = this.anchors.index( this.anchors.filter( "[href$='" + + CSS.escape( index ) + "']" ) ); + } + + return index; + }, + + _destroy: function() { + if ( this.xhr ) { + this.xhr.abort(); + } + + this.tablist + .removeAttr( "role" ) + .off( this.eventNamespace ); + + this.anchors + .removeAttr( "role tabIndex" ) + .removeUniqueId(); + + this.tabs.add( this.panels ).each( function() { + if ( $.data( this, "ui-tabs-destroy" ) ) { + $( this ).remove(); + } else { + $( this ).removeAttr( "role tabIndex " + + "aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded" ); + } + } ); + + this.tabs.each( function() { + var li = $( this ), + prev = li.data( "ui-tabs-aria-controls" ); + if ( prev ) { + li + .attr( "aria-controls", prev ) + .removeData( "ui-tabs-aria-controls" ); + } else { + li.removeAttr( "aria-controls" ); + } + } ); + + this.panels.show(); + + if ( this.options.heightStyle !== "content" ) { + this.panels.css( "height", "" ); + } + }, + + enable: function( index ) { + var disabled = this.options.disabled; + if ( disabled === false ) { + return; + } + + if ( index === undefined ) { + disabled = false; + } else { + index = this._getIndex( index ); + if ( Array.isArray( disabled ) ) { + disabled = $.map( disabled, function( num ) { + return num !== index ? num : null; + } ); + } else { + disabled = $.map( this.tabs, function( li, num ) { + return num !== index ? num : null; + } ); + } + } + this._setOptionDisabled( disabled ); + }, + + disable: function( index ) { + var disabled = this.options.disabled; + if ( disabled === true ) { + return; + } + + if ( index === undefined ) { + disabled = true; + } else { + index = this._getIndex( index ); + if ( $.inArray( index, disabled ) !== -1 ) { + return; + } + if ( Array.isArray( disabled ) ) { + disabled = $.merge( [ index ], disabled ).sort(); + } else { + disabled = [ index ]; + } + } + this._setOptionDisabled( disabled ); + }, + + load: function( index, event ) { + index = this._getIndex( index ); + var that = this, + tab = this.tabs.eq( index ), + anchor = tab.find( ".ui-tabs-anchor" ), + panel = this._getPanelForTab( tab ), + eventData = { + tab: tab, + panel: panel + }, + complete = function( jqXHR, status ) { + if ( status === "abort" ) { + that.panels.stop( false, true ); + } + + that._removeClass( tab, "ui-tabs-loading" ); + panel.removeAttr( "aria-busy" ); + + if ( jqXHR === that.xhr ) { + delete that.xhr; + } + }; + + // Not remote + if ( this._isLocal( anchor[ 0 ] ) ) { + return; + } + + this.xhr = $.ajax( this._ajaxSettings( anchor, event, eventData ) ); + + if ( this.xhr.statusText !== "canceled" ) { + this._addClass( tab, "ui-tabs-loading" ); + panel.attr( "aria-busy", "true" ); + + this.xhr + .done( function( response, status, jqXHR ) { + panel.html( response ); + that._trigger( "load", event, eventData ); + + complete( jqXHR, status ); + } ) + .fail( function( jqXHR, status ) { + complete( jqXHR, status ); + } ); + } + }, + + _ajaxSettings: function( anchor, event, eventData ) { + var that = this; + return { + url: anchor.attr( "href" ), + beforeSend: function( jqXHR, settings ) { + return that._trigger( "beforeLoad", event, + $.extend( { jqXHR: jqXHR, ajaxSettings: settings }, eventData ) ); + } + }; + }, + + _getPanelForTab: function( tab ) { + var id = $( tab ).attr( "aria-controls" ); + return this.element.find( "#" + CSS.escape( id ) ); + } +} ); + +// DEPRECATED +// TODO: Switch return back to widget declaration at top of file when this is removed +if ( $.uiBackCompat === true ) { + + // Backcompat for ui-tab class (now ui-tabs-tab) + $.widget( "ui.tabs", $.ui.tabs, { + _processTabs: function() { + this._superApply( arguments ); + this._addClass( this.tabs, "ui-tab" ); + } + } ); +} + +var widgetsTabs = $.ui.tabs; + + +/*! + * jQuery UI Tooltip 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Tooltip +//>>group: Widgets +//>>description: Shows additional information for any element on hover or focus. +//>>docs: https://api.jqueryui.com/tooltip/ +//>>demos: https://jqueryui.com/tooltip/ +//>>css.structure: ../../themes/base/core.css +//>>css.structure: ../../themes/base/tooltip.css +//>>css.theme: ../../themes/base/theme.css + + +$.widget( "ui.tooltip", { + version: "1.14.1", + options: { + classes: { + "ui-tooltip": "ui-corner-all ui-widget-shadow" + }, + content: function() { + var title = $( this ).attr( "title" ); + + // Escape title, since we're going from an attribute to raw HTML + return $( "" ).text( title ).html(); + }, + hide: true, + + // Disabled elements have inconsistent behavior across browsers (#8661) + items: "[title]:not([disabled])", + position: { + my: "left top+15", + at: "left bottom", + collision: "flipfit flip" + }, + show: true, + track: false, + + // Callbacks + close: null, + open: null + }, + + _addDescribedBy: function( elem, id ) { + var describedby = ( elem.attr( "aria-describedby" ) || "" ).split( /\s+/ ); + describedby.push( id ); + elem + .data( "ui-tooltip-id", id ) + .attr( "aria-describedby", String.prototype.trim.call( describedby.join( " " ) ) ); + }, + + _removeDescribedBy: function( elem ) { + var id = elem.data( "ui-tooltip-id" ), + describedby = ( elem.attr( "aria-describedby" ) || "" ).split( /\s+/ ), + index = $.inArray( id, describedby ); + + if ( index !== -1 ) { + describedby.splice( index, 1 ); + } + + elem.removeData( "ui-tooltip-id" ); + describedby = String.prototype.trim.call( describedby.join( " " ) ); + if ( describedby ) { + elem.attr( "aria-describedby", describedby ); + } else { + elem.removeAttr( "aria-describedby" ); + } + }, + + _create: function() { + this._on( { + mouseover: "open", + focusin: "open" + } ); + + // IDs of generated tooltips, needed for destroy + this.tooltips = {}; + + // IDs of parent tooltips where we removed the title attribute + this.parents = {}; + + // Append the aria-live region so tooltips announce correctly + this.liveRegion = $( "
        " ) + .attr( { + role: "log", + "aria-live": "assertive", + "aria-relevant": "additions" + } ) + .appendTo( this.document[ 0 ].body ); + this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" ); + + this.disabledTitles = $( [] ); + }, + + _setOption: function( key, value ) { + var that = this; + + this._super( key, value ); + + if ( key === "content" ) { + $.each( this.tooltips, function( id, tooltipData ) { + that._updateContent( tooltipData.element ); + } ); + } + }, + + _setOptionDisabled: function( value ) { + this[ value ? "_disable" : "_enable" ](); + }, + + _disable: function() { + var that = this; + + // Close open tooltips + $.each( this.tooltips, function( id, tooltipData ) { + var event = $.Event( "blur" ); + event.target = event.currentTarget = tooltipData.element[ 0 ]; + that.close( event, true ); + } ); + + // Remove title attributes to prevent native tooltips + this.disabledTitles = this.disabledTitles.add( + this.element.find( this.options.items ).addBack() + .filter( function() { + var element = $( this ); + if ( element.is( "[title]" ) ) { + return element + .data( "ui-tooltip-title", element.attr( "title" ) ) + .removeAttr( "title" ); + } + } ) + ); + }, + + _enable: function() { + + // restore title attributes + this.disabledTitles.each( function() { + var element = $( this ); + if ( element.data( "ui-tooltip-title" ) ) { + element.attr( "title", element.data( "ui-tooltip-title" ) ); + } + } ); + this.disabledTitles = $( [] ); + }, + + open: function( event ) { + var that = this, + target = $( event ? event.target : this.element ) + + // we need closest here due to mouseover bubbling, + // but always pointing at the same event target + .closest( this.options.items ); + + // No element to show a tooltip for or the tooltip is already open + if ( !target.length || target.data( "ui-tooltip-id" ) ) { + return; + } + + if ( target.attr( "title" ) ) { + target.data( "ui-tooltip-title", target.attr( "title" ) ); + } + + target.data( "ui-tooltip-open", true ); + + // Kill parent tooltips, custom or native, for hover + if ( event && event.type === "mouseover" ) { + target.parents().each( function() { + var parent = $( this ), + blurEvent; + if ( parent.data( "ui-tooltip-open" ) ) { + blurEvent = $.Event( "blur" ); + blurEvent.target = blurEvent.currentTarget = this; + that.close( blurEvent, true ); + } + if ( parent.attr( "title" ) ) { + parent.uniqueId(); + that.parents[ this.id ] = { + element: this, + title: parent.attr( "title" ) + }; + parent.attr( "title", "" ); + } + } ); + } + + this._registerCloseHandlers( event, target ); + this._updateContent( target, event ); + }, + + _updateContent: function( target, event ) { + var content, + contentOption = this.options.content, + that = this, + eventType = event ? event.type : null; + + if ( typeof contentOption === "string" || contentOption.nodeType || + contentOption.jquery ) { + return this._open( event, target, contentOption ); + } + + content = contentOption.call( target[ 0 ], function( response ) { + + // Ignore async response if tooltip was closed already + if ( !target.data( "ui-tooltip-open" ) ) { + return; + } + + // JQuery creates a special event for focusin when it doesn't + // exist natively. To improve performance, the native event + // object is reused and the type is changed. Therefore, we can't + // rely on the type being correct after the event finished + // bubbling, so we set it back to the previous value. (#8740) + if ( event ) { + event.type = eventType; + } + that._open( event, target, response ); + } ); + if ( content ) { + this._open( event, target, content ); + } + }, + + _open: function( event, target, content ) { + var tooltipData, tooltip, delayedShow, a11yContent, + positionOption = $.extend( {}, this.options.position ); + + if ( !content ) { + return; + } + + // Content can be updated multiple times. If the tooltip already + // exists, then just update the content and bail. + tooltipData = this._find( target ); + if ( tooltipData ) { + tooltipData.tooltip.find( ".ui-tooltip-content" ).html( content ); + return; + } + + // If we have a title, clear it to prevent the native tooltip + // we have to check first to avoid defining a title if none exists + // (we don't want to cause an element to start matching [title]) + // + // We use removeAttr only for key events, to allow IE to export the correct + // accessible attributes. For mouse events, set to empty string to avoid + // native tooltip showing up (happens only when removing inside mouseover). + if ( target.is( "[title]" ) ) { + if ( event && event.type === "mouseover" ) { + target.attr( "title", "" ); + } else { + target.removeAttr( "title" ); + } + } + + tooltipData = this._tooltip( target ); + tooltip = tooltipData.tooltip; + this._addDescribedBy( target, tooltip.attr( "id" ) ); + tooltip.find( ".ui-tooltip-content" ).html( content ); + + // Support: Voiceover on OS X, JAWS on IE <= 9 + // JAWS announces deletions even when aria-relevant="additions" + // Voiceover will sometimes re-read the entire log region's contents from the beginning + this.liveRegion.children().hide(); + a11yContent = $( "
        " ).html( tooltip.find( ".ui-tooltip-content" ).html() ); + a11yContent.removeAttr( "name" ).find( "[name]" ).removeAttr( "name" ); + a11yContent.removeAttr( "id" ).find( "[id]" ).removeAttr( "id" ); + a11yContent.appendTo( this.liveRegion ); + + function position( event ) { + positionOption.of = event; + if ( tooltip.is( ":hidden" ) ) { + return; + } + tooltip.position( positionOption ); + } + if ( this.options.track && event && /^mouse/.test( event.type ) ) { + this._on( this.document, { + mousemove: position + } ); + + // trigger once to override element-relative positioning + position( event ); + } else { + tooltip.position( $.extend( { + of: target + }, this.options.position ) ); + } + + tooltip.hide(); + + this._show( tooltip, this.options.show ); + + // Handle tracking tooltips that are shown with a delay (#8644). As soon + // as the tooltip is visible, position the tooltip using the most recent + // event. + // Adds the check to add the timers only when both delay and track options are set (#14682) + if ( this.options.track && this.options.show && this.options.show.delay ) { + delayedShow = this.delayedShow = setInterval( function() { + if ( tooltip.is( ":visible" ) ) { + position( positionOption.of ); + clearInterval( delayedShow ); + } + }, 13 ); + } + + this._trigger( "open", event, { tooltip: tooltip } ); + }, + + _registerCloseHandlers: function( event, target ) { + var events = { + keyup: function( event ) { + if ( event.keyCode === $.ui.keyCode.ESCAPE ) { + var fakeEvent = $.Event( event ); + fakeEvent.currentTarget = target[ 0 ]; + this.close( fakeEvent, true ); + } + } + }; + + // Only bind remove handler for delegated targets. Non-delegated + // tooltips will handle this in destroy. + if ( target[ 0 ] !== this.element[ 0 ] ) { + events.remove = function() { + var targetElement = this._find( target ); + if ( targetElement ) { + this._removeTooltip( targetElement.tooltip ); + } + }; + } + + if ( !event || event.type === "mouseover" ) { + events.mouseleave = "close"; + } + if ( !event || event.type === "focusin" ) { + events.focusout = "close"; + } + this._on( true, target, events ); + }, + + close: function( event ) { + var tooltip, + that = this, + target = $( event ? event.currentTarget : this.element ), + tooltipData = this._find( target ); + + // The tooltip may already be closed + if ( !tooltipData ) { + + // We set ui-tooltip-open immediately upon open (in open()), but only set the + // additional data once there's actually content to show (in _open()). So even if the + // tooltip doesn't have full data, we always remove ui-tooltip-open in case we're in + // the period between open() and _open(). + target.removeData( "ui-tooltip-open" ); + return; + } + + tooltip = tooltipData.tooltip; + + // Disabling closes the tooltip, so we need to track when we're closing + // to avoid an infinite loop in case the tooltip becomes disabled on close + if ( tooltipData.closing ) { + return; + } + + // Clear the interval for delayed tracking tooltips + clearInterval( this.delayedShow ); + + // Only set title if we had one before (see comment in _open()) + // If the title attribute has changed since open(), don't restore + if ( target.data( "ui-tooltip-title" ) && !target.attr( "title" ) ) { + target.attr( "title", target.data( "ui-tooltip-title" ) ); + } + + this._removeDescribedBy( target ); + + tooltipData.hiding = true; + tooltip.stop( true ); + this._hide( tooltip, this.options.hide, function() { + that._removeTooltip( $( this ) ); + } ); + + target.removeData( "ui-tooltip-open" ); + this._off( target, "mouseleave focusout keyup" ); + + // Remove 'remove' binding only on delegated targets + if ( target[ 0 ] !== this.element[ 0 ] ) { + this._off( target, "remove" ); + } + this._off( this.document, "mousemove" ); + + if ( event && event.type === "mouseleave" ) { + $.each( this.parents, function( id, parent ) { + $( parent.element ).attr( "title", parent.title ); + delete that.parents[ id ]; + } ); + } + + tooltipData.closing = true; + this._trigger( "close", event, { tooltip: tooltip } ); + if ( !tooltipData.hiding ) { + tooltipData.closing = false; + } + }, + + _tooltip: function( element ) { + var tooltip = $( "
        " ).attr( "role", "tooltip" ), + content = $( "
        " ).appendTo( tooltip ), + id = tooltip.uniqueId().attr( "id" ); + + this._addClass( content, "ui-tooltip-content" ); + this._addClass( tooltip, "ui-tooltip", "ui-widget ui-widget-content" ); + + tooltip.appendTo( this._appendTo( element ) ); + + return this.tooltips[ id ] = { + element: element, + tooltip: tooltip + }; + }, + + _find: function( target ) { + var id = target.data( "ui-tooltip-id" ); + return id ? this.tooltips[ id ] : null; + }, + + _removeTooltip: function( tooltip ) { + + // Clear the interval for delayed tracking tooltips + clearInterval( this.delayedShow ); + + tooltip.remove(); + delete this.tooltips[ tooltip.attr( "id" ) ]; + }, + + _appendTo: function( target ) { + var element = target.closest( ".ui-front, dialog" ); + + if ( !element.length ) { + element = this.document[ 0 ].body; + } + + return element; + }, + + _destroy: function() { + var that = this; + + // Close open tooltips + $.each( this.tooltips, function( id, tooltipData ) { + + // Delegate to close method to handle common cleanup + var event = $.Event( "blur" ), + element = tooltipData.element; + event.target = event.currentTarget = element[ 0 ]; + that.close( event, true ); + + // Remove immediately; destroying an open tooltip doesn't use the + // hide animation + $( "#" + id ).remove(); + + // Restore the title + if ( element.data( "ui-tooltip-title" ) ) { + + // If the title attribute has changed since open(), don't restore + if ( !element.attr( "title" ) ) { + element.attr( "title", element.data( "ui-tooltip-title" ) ); + } + element.removeData( "ui-tooltip-title" ); + } + } ); + this.liveRegion.remove(); + } +} ); + +// DEPRECATED +// TODO: Switch return back to widget declaration at top of file when this is removed +if ( $.uiBackCompat === true ) { + + // Backcompat for tooltipClass option + $.widget( "ui.tooltip", $.ui.tooltip, { + options: { + tooltipClass: null + }, + _tooltip: function() { + var tooltipData = this._superApply( arguments ); + if ( this.options.tooltipClass ) { + tooltipData.tooltip.addClass( this.options.tooltipClass ); + } + return tooltipData; + } + } ); +} + +var widgetsTooltip = $.ui.tooltip; + + + +// Create a local jQuery because jQuery Color relies on it and the +// global may not exist with AMD and a custom build (#10199). +// This module is a noop if used as a regular AMD module. +// eslint-disable-next-line no-unused-vars +var jQuery = $; + + +/*! + * jQuery Color Animations v3.0.0 + * https://github.com/jquery/jquery-color + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + * + * Date: Wed May 15 16:49:44 2024 +0200 + */ + + + var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor " + + "borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor", + + class2type = {}, + toString = class2type.toString, + + // plusequals test for += 100 -= 100 + rplusequals = /^([\-+])=\s*(\d+\.?\d*)/, + + // a set of RE's that can match strings and generate color tuples. + stringParsers = [ { + re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, + parse: function( execResult ) { + return [ + execResult[ 1 ], + execResult[ 2 ], + execResult[ 3 ], + execResult[ 4 ] + ]; + } + }, { + re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, + parse: function( execResult ) { + return [ + execResult[ 1 ] * 2.55, + execResult[ 2 ] * 2.55, + execResult[ 3 ] * 2.55, + execResult[ 4 ] + ]; + } + }, { + + // this regex ignores A-F because it's compared against an already lowercased string + re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})?/, + parse: function( execResult ) { + return [ + parseInt( execResult[ 1 ], 16 ), + parseInt( execResult[ 2 ], 16 ), + parseInt( execResult[ 3 ], 16 ), + execResult[ 4 ] ? + ( parseInt( execResult[ 4 ], 16 ) / 255 ).toFixed( 2 ) : + 1 + ]; + } + }, { + + // this regex ignores A-F because it's compared against an already lowercased string + re: /#([a-f0-9])([a-f0-9])([a-f0-9])([a-f0-9])?/, + parse: function( execResult ) { + return [ + parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ), + parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ), + parseInt( execResult[ 3 ] + execResult[ 3 ], 16 ), + execResult[ 4 ] ? + ( parseInt( execResult[ 4 ] + execResult[ 4 ], 16 ) / 255 ) + .toFixed( 2 ) : + 1 + ]; + } + }, { + re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/, + space: "hsla", + parse: function( execResult ) { + return [ + execResult[ 1 ], + execResult[ 2 ] / 100, + execResult[ 3 ] / 100, + execResult[ 4 ] + ]; + } + } ], + + // jQuery.Color( ) + color = jQuery.Color = function( color, green, blue, alpha ) { + return new jQuery.Color.fn.parse( color, green, blue, alpha ); + }, + spaces = { + rgba: { + props: { + red: { + idx: 0, + type: "byte" + }, + green: { + idx: 1, + type: "byte" + }, + blue: { + idx: 2, + type: "byte" + } + } + }, + + hsla: { + props: { + hue: { + idx: 0, + type: "degrees" + }, + saturation: { + idx: 1, + type: "percent" + }, + lightness: { + idx: 2, + type: "percent" + } + } + } + }, + propTypes = { + "byte": { + floor: true, + max: 255 + }, + "percent": { + max: 1 + }, + "degrees": { + mod: 360, + floor: true + } + }, + + // colors = jQuery.Color.names + colors, + + // local aliases of functions called often + each = jQuery.each; + +// define cache name and alpha properties +// for rgba and hsla spaces +each( spaces, function( spaceName, space ) { + space.cache = "_" + spaceName; + space.props.alpha = { + idx: 3, + type: "percent", + def: 1 + }; +} ); + +// Populate the class2type map +jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ), + function( _i, name ) { + class2type[ "[object " + name + "]" ] = name.toLowerCase(); + } ); + +function getType( obj ) { + if ( obj == null ) { + return obj + ""; + } + + return typeof obj === "object" ? + class2type[ toString.call( obj ) ] || "object" : + typeof obj; +} + +function clamp( value, prop, allowEmpty ) { + var type = propTypes[ prop.type ] || {}; + + if ( value == null ) { + return ( allowEmpty || !prop.def ) ? null : prop.def; + } + + // ~~ is an short way of doing floor for positive numbers + value = type.floor ? ~~value : parseFloat( value ); + + if ( type.mod ) { + + // we add mod before modding to make sure that negatives values + // get converted properly: -10 -> 350 + return ( value + type.mod ) % type.mod; + } + + // for now all property types without mod have min and max + return Math.min( type.max, Math.max( 0, value ) ); +} + +function stringParse( string ) { + var inst = color(), + rgba = inst._rgba = []; + + string = string.toLowerCase(); + + each( stringParsers, function( _i, parser ) { + var parsed, + match = parser.re.exec( string ), + values = match && parser.parse( match ), + spaceName = parser.space || "rgba"; + + if ( values ) { + parsed = inst[ spaceName ]( values ); + + // if this was an rgba parse the assignment might happen twice + // oh well.... + inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ]; + rgba = inst._rgba = parsed._rgba; + + // exit each( stringParsers ) here because we matched + return false; + } + } ); + + // Found a stringParser that handled it + if ( rgba.length ) { + + // if this came from a parsed string, force "transparent" when alpha is 0 + // chrome, (and maybe others) return "transparent" as rgba(0,0,0,0) + if ( rgba.join() === "0,0,0,0" ) { + jQuery.extend( rgba, colors.transparent ); + } + return inst; + } + + // named colors + return colors[ string ]; +} + +color.fn = jQuery.extend( color.prototype, { + parse: function( red, green, blue, alpha ) { + if ( red === undefined ) { + this._rgba = [ null, null, null, null ]; + return this; + } + if ( red.jquery || red.nodeType ) { + red = jQuery( red ).css( green ); + green = undefined; + } + + var inst = this, + type = getType( red ), + rgba = this._rgba = []; + + // more than 1 argument specified - assume ( red, green, blue, alpha ) + if ( green !== undefined ) { + red = [ red, green, blue, alpha ]; + type = "array"; + } + + if ( type === "string" ) { + return this.parse( stringParse( red ) || colors._default ); + } + + if ( type === "array" ) { + each( spaces.rgba.props, function( _key, prop ) { + rgba[ prop.idx ] = clamp( red[ prop.idx ], prop ); + } ); + return this; + } + + if ( type === "object" ) { + if ( red instanceof color ) { + each( spaces, function( _spaceName, space ) { + if ( red[ space.cache ] ) { + inst[ space.cache ] = red[ space.cache ].slice(); + } + } ); + } else { + each( spaces, function( _spaceName, space ) { + var cache = space.cache; + each( space.props, function( key, prop ) { + + // if the cache doesn't exist, and we know how to convert + if ( !inst[ cache ] && space.to ) { + + // if the value was null, we don't need to copy it + // if the key was alpha, we don't need to copy it either + if ( key === "alpha" || red[ key ] == null ) { + return; + } + inst[ cache ] = space.to( inst._rgba ); + } + + // this is the only case where we allow nulls for ALL properties. + // call clamp with alwaysAllowEmpty + inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true ); + } ); + + // everything defined but alpha? + if ( inst[ cache ] && jQuery.inArray( + null, + inst[ cache ].slice( 0, 3 ) + ) < 0 ) { + + // use the default of 1 + if ( inst[ cache ][ 3 ] == null ) { + inst[ cache ][ 3 ] = 1; + } + + if ( space.from ) { + inst._rgba = space.from( inst[ cache ] ); + } + } + } ); + } + return this; + } + }, + is: function( compare ) { + var is = color( compare ), + same = true, + inst = this; + + each( spaces, function( _, space ) { + var localCache, + isCache = is[ space.cache ]; + if ( isCache ) { + localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || []; + each( space.props, function( _, prop ) { + if ( isCache[ prop.idx ] != null ) { + same = ( isCache[ prop.idx ] === localCache[ prop.idx ] ); + return same; + } + } ); + } + return same; + } ); + return same; + }, + _space: function() { + var used = [], + inst = this; + each( spaces, function( spaceName, space ) { + if ( inst[ space.cache ] ) { + used.push( spaceName ); + } + } ); + return used.pop(); + }, + transition: function( other, distance ) { + var end = color( other ), + spaceName = end._space(), + space = spaces[ spaceName ], + startColor = this.alpha() === 0 ? color( "transparent" ) : this, + start = startColor[ space.cache ] || space.to( startColor._rgba ), + result = start.slice(); + + end = end[ space.cache ]; + each( space.props, function( _key, prop ) { + var index = prop.idx, + startValue = start[ index ], + endValue = end[ index ], + type = propTypes[ prop.type ] || {}; + + // if null, don't override start value + if ( endValue === null ) { + return; + } + + // if null - use end + if ( startValue === null ) { + result[ index ] = endValue; + } else { + if ( type.mod ) { + if ( endValue - startValue > type.mod / 2 ) { + startValue += type.mod; + } else if ( startValue - endValue > type.mod / 2 ) { + startValue -= type.mod; + } + } + result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop ); + } + } ); + return this[ spaceName ]( result ); + }, + blend: function( opaque ) { + + // if we are already opaque - return ourself + if ( this._rgba[ 3 ] === 1 ) { + return this; + } + + var rgb = this._rgba.slice(), + a = rgb.pop(), + blend = color( opaque )._rgba; + + return color( jQuery.map( rgb, function( v, i ) { + return ( 1 - a ) * blend[ i ] + a * v; + } ) ); + }, + toRgbaString: function() { + var prefix = "rgba(", + rgba = jQuery.map( this._rgba, function( v, i ) { + if ( v != null ) { + return v; + } + return i > 2 ? 1 : 0; + } ); + + if ( rgba[ 3 ] === 1 ) { + rgba.pop(); + prefix = "rgb("; + } + + return prefix + rgba.join( ", " ) + ")"; + }, + toHslaString: function() { + var prefix = "hsla(", + hsla = jQuery.map( this.hsla(), function( v, i ) { + if ( v == null ) { + v = i > 2 ? 1 : 0; + } + + // catch 1 and 2 + if ( i && i < 3 ) { + v = Math.round( v * 100 ) + "%"; + } + return v; + } ); + + if ( hsla[ 3 ] === 1 ) { + hsla.pop(); + prefix = "hsl("; + } + return prefix + hsla.join( ", " ) + ")"; + }, + toHexString: function( includeAlpha ) { + var rgba = this._rgba.slice(), + alpha = rgba.pop(); + + if ( includeAlpha ) { + rgba.push( ~~( alpha * 255 ) ); + } + + return "#" + jQuery.map( rgba, function( v ) { + + // default to 0 when nulls exist + return ( "0" + ( v || 0 ).toString( 16 ) ).substr( -2 ); + } ).join( "" ); + }, + toString: function() { + return this.toRgbaString(); + } +} ); +color.fn.parse.prototype = color.fn; + +// hsla conversions adapted from: +// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021 + +function hue2rgb( p, q, h ) { + h = ( h + 1 ) % 1; + if ( h * 6 < 1 ) { + return p + ( q - p ) * h * 6; + } + if ( h * 2 < 1 ) { + return q; + } + if ( h * 3 < 2 ) { + return p + ( q - p ) * ( ( 2 / 3 ) - h ) * 6; + } + return p; +} + +spaces.hsla.to = function( rgba ) { + if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) { + return [ null, null, null, rgba[ 3 ] ]; + } + var r = rgba[ 0 ] / 255, + g = rgba[ 1 ] / 255, + b = rgba[ 2 ] / 255, + a = rgba[ 3 ], + max = Math.max( r, g, b ), + min = Math.min( r, g, b ), + diff = max - min, + add = max + min, + l = add * 0.5, + h, s; + + if ( min === max ) { + h = 0; + } else if ( r === max ) { + h = ( 60 * ( g - b ) / diff ) + 360; + } else if ( g === max ) { + h = ( 60 * ( b - r ) / diff ) + 120; + } else { + h = ( 60 * ( r - g ) / diff ) + 240; + } + + // chroma (diff) == 0 means greyscale which, by definition, saturation = 0% + // otherwise, saturation is based on the ratio of chroma (diff) to lightness (add) + if ( diff === 0 ) { + s = 0; + } else if ( l <= 0.5 ) { + s = diff / add; + } else { + s = diff / ( 2 - add ); + } + return [ Math.round( h ) % 360, s, l, a == null ? 1 : a ]; +}; + +spaces.hsla.from = function( hsla ) { + if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) { + return [ null, null, null, hsla[ 3 ] ]; + } + var h = hsla[ 0 ] / 360, + s = hsla[ 1 ], + l = hsla[ 2 ], + a = hsla[ 3 ], + q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s, + p = 2 * l - q; + + return [ + Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ), + Math.round( hue2rgb( p, q, h ) * 255 ), + Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ), + a + ]; +}; + + +each( spaces, function( spaceName, space ) { + var props = space.props, + cache = space.cache, + to = space.to, + from = space.from; + + // makes rgba() and hsla() + color.fn[ spaceName ] = function( value ) { + + // generate a cache for this space if it doesn't exist + if ( to && !this[ cache ] ) { + this[ cache ] = to( this._rgba ); + } + if ( value === undefined ) { + return this[ cache ].slice(); + } + + var ret, + type = getType( value ), + arr = ( type === "array" || type === "object" ) ? value : arguments, + local = this[ cache ].slice(); + + each( props, function( key, prop ) { + var val = arr[ type === "object" ? key : prop.idx ]; + if ( val == null ) { + val = local[ prop.idx ]; + } + local[ prop.idx ] = clamp( val, prop ); + } ); + + if ( from ) { + ret = color( from( local ) ); + ret[ cache ] = local; + return ret; + } else { + return color( local ); + } + }; + + // makes red() green() blue() alpha() hue() saturation() lightness() + each( props, function( key, prop ) { + + // alpha is included in more than one space + if ( color.fn[ key ] ) { + return; + } + color.fn[ key ] = function( value ) { + var local, cur, match, fn, + vtype = getType( value ); + + if ( key === "alpha" ) { + fn = this._hsla ? "hsla" : "rgba"; + } else { + fn = spaceName; + } + local = this[ fn ](); + cur = local[ prop.idx ]; + + if ( vtype === "undefined" ) { + return cur; + } + + if ( vtype === "function" ) { + value = value.call( this, cur ); + vtype = getType( value ); + } + if ( value == null && prop.empty ) { + return this; + } + if ( vtype === "string" ) { + match = rplusequals.exec( value ); + if ( match ) { + value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 ); + } + } + local[ prop.idx ] = value; + return this[ fn ]( local ); + }; + } ); +} ); + +// add cssHook and .fx.step function for each named hook. +// accept a space separated string of properties +color.hook = function( hook ) { + var hooks = hook.split( " " ); + each( hooks, function( _i, hook ) { + jQuery.cssHooks[ hook ] = { + set: function( elem, value ) { + var parsed; + + if ( value !== "transparent" && + ( getType( value ) !== "string" || + ( parsed = stringParse( value ) ) ) ) { + value = color( parsed || value ); + value = value.toRgbaString(); + } + elem.style[ hook ] = value; + } + }; + jQuery.fx.step[ hook ] = function( fx ) { + if ( !fx.colorInit ) { + fx.start = color( fx.elem, hook ); + fx.end = color( fx.end ); + fx.colorInit = true; + } + jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) ); + }; + } ); + +}; + +color.hook( stepHooks ); + +jQuery.cssHooks.borderColor = { + expand: function( value ) { + var expanded = {}; + + each( [ "Top", "Right", "Bottom", "Left" ], function( _i, part ) { + expanded[ "border" + part + "Color" ] = value; + } ); + return expanded; + } +}; + +// Basic color names only. +// Usage of any of the other color names requires adding yourself or including +// jquery.color.svg-names.js. +colors = jQuery.Color.names = { + + // 4.1. Basic color keywords + aqua: "#00ffff", + black: "#000000", + blue: "#0000ff", + fuchsia: "#ff00ff", + gray: "#808080", + green: "#008000", + lime: "#00ff00", + maroon: "#800000", + navy: "#000080", + olive: "#808000", + purple: "#800080", + red: "#ff0000", + silver: "#c0c0c0", + teal: "#008080", + white: "#ffffff", + yellow: "#ffff00", + + // 4.2.3. "transparent" color keyword + transparent: [ null, null, null, 0 ], + + _default: "#ffffff" +}; + + +/*! + * jQuery UI Effects 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Effects Core +//>>group: Effects +/* eslint-disable max-len */ +//>>description: Extends the internal jQuery effects. Includes morphing and easing. Required by all other effects. +/* eslint-enable max-len */ +//>>docs: https://api.jqueryui.com/category/effects-core/ +//>>demos: https://jqueryui.com/effect/ + + +var dataSpace = "ui-effects-", + dataSpaceStyle = "ui-effects-style", + dataSpaceAnimated = "ui-effects-animated"; + +$.effects = { + effect: {} +}; + +/******************************************************************************/ +/****************************** CLASS ANIMATIONS ******************************/ +/******************************************************************************/ +( function() { + +var classAnimationActions = [ "add", "remove", "toggle" ], + shorthandStyles = { + border: 1, + borderBottom: 1, + borderColor: 1, + borderLeft: 1, + borderRight: 1, + borderTop: 1, + borderWidth: 1, + margin: 1, + padding: 1 + }; + +$.each( + [ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], + function( _, prop ) { + $.fx.step[ prop ] = function( fx ) { + if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) { + jQuery.style( fx.elem, prop, fx.end ); + fx.setAttr = true; + } + }; + } +); + +function camelCase( string ) { + return string.replace( /-([\da-z])/gi, function( all, letter ) { + return letter.toUpperCase(); + } ); +} + +function getElementStyles( elem ) { + var key, len, + style = elem.ownerDocument.defaultView.getComputedStyle( elem ), + styles = {}; + + len = style.length; + while ( len-- ) { + key = style[ len ]; + if ( typeof style[ key ] === "string" ) { + styles[ camelCase( key ) ] = style[ key ]; + } + } + + return styles; +} + +function styleDifference( oldStyle, newStyle ) { + var diff = {}, + name, value; + + for ( name in newStyle ) { + value = newStyle[ name ]; + if ( oldStyle[ name ] !== value ) { + if ( !shorthandStyles[ name ] ) { + if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) { + diff[ name ] = value; + } + } + } + } + + return diff; +} + +$.effects.animateClass = function( value, duration, easing, callback ) { + var o = $.speed( duration, easing, callback ); + + return this.queue( function() { + var animated = $( this ), + baseClass = animated.attr( "class" ) || "", + applyClassChange, + allAnimations = o.children ? animated.find( "*" ).addBack() : animated; + + // Map the animated objects to store the original styles. + allAnimations = allAnimations.map( function() { + var el = $( this ); + return { + el: el, + start: getElementStyles( this ) + }; + } ); + + // Apply class change + applyClassChange = function() { + $.each( classAnimationActions, function( i, action ) { + if ( value[ action ] ) { + animated[ action + "Class" ]( value[ action ] ); + } + } ); + }; + applyClassChange(); + + // Map all animated objects again - calculate new styles and diff + allAnimations = allAnimations.map( function() { + this.end = getElementStyles( this.el[ 0 ] ); + this.diff = styleDifference( this.start, this.end ); + return this; + } ); + + // Apply original class + animated.attr( "class", baseClass ); + + // Map all animated objects again - this time collecting a promise + allAnimations = allAnimations.map( function() { + var styleInfo = this, + dfd = $.Deferred(), + opts = $.extend( {}, o, { + queue: false, + complete: function() { + dfd.resolve( styleInfo ); + } + } ); + + this.el.animate( this.diff, opts ); + return dfd.promise(); + } ); + + // Once all animations have completed: + $.when.apply( $, allAnimations.get() ).done( function() { + + // Set the final class + applyClassChange(); + + // For each animated element, + // clear all css properties that were animated + $.each( arguments, function() { + var el = this.el; + $.each( this.diff, function( key ) { + el.css( key, "" ); + } ); + } ); + + // This is guarnteed to be there if you use jQuery.speed() + // it also handles dequeuing the next anim... + o.complete.call( animated[ 0 ] ); + } ); + } ); +}; + +$.fn.extend( { + addClass: ( function( orig ) { + return function( classNames, speed, easing, callback ) { + return speed ? + $.effects.animateClass.call( this, + { add: classNames }, speed, easing, callback ) : + orig.apply( this, arguments ); + }; + } )( $.fn.addClass ), + + removeClass: ( function( orig ) { + return function( classNames, speed, easing, callback ) { + return arguments.length > 1 ? + $.effects.animateClass.call( this, + { remove: classNames }, speed, easing, callback ) : + orig.apply( this, arguments ); + }; + } )( $.fn.removeClass ), + + toggleClass: ( function( orig ) { + return function( classNames, force, speed, easing, callback ) { + if ( typeof force === "boolean" || force === undefined ) { + if ( !speed ) { + + // Without speed parameter + return orig.apply( this, arguments ); + } else { + return $.effects.animateClass.call( this, + ( force ? { add: classNames } : { remove: classNames } ), + speed, easing, callback ); + } + } else { + + // Without force parameter + return $.effects.animateClass.call( this, + { toggle: classNames }, force, speed, easing ); + } + }; + } )( $.fn.toggleClass ), + + switchClass: function( remove, add, speed, easing, callback ) { + return $.effects.animateClass.call( this, { + add: add, + remove: remove + }, speed, easing, callback ); + } +} ); + +} )(); + +/******************************************************************************/ +/*********************************** EFFECTS **********************************/ +/******************************************************************************/ + +( function() { + +if ( $.expr && $.expr.pseudos && $.expr.pseudos.animated ) { + $.expr.pseudos.animated = ( function( orig ) { + return function( elem ) { + return !!$( elem ).data( dataSpaceAnimated ) || orig( elem ); + }; + } )( $.expr.pseudos.animated ); +} + +if ( $.uiBackCompat === true ) { + $.extend( $.effects, { + + // Saves a set of properties in a data storage + save: function( element, set ) { + var i = 0, length = set.length; + for ( ; i < length; i++ ) { + if ( set[ i ] !== null ) { + element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] ); + } + } + }, + + // Restores a set of previously saved properties from a data storage + restore: function( element, set ) { + var val, i = 0, length = set.length; + for ( ; i < length; i++ ) { + if ( set[ i ] !== null ) { + val = element.data( dataSpace + set[ i ] ); + element.css( set[ i ], val ); + } + } + }, + + setMode: function( el, mode ) { + if ( mode === "toggle" ) { + mode = el.is( ":hidden" ) ? "show" : "hide"; + } + return mode; + }, + + // Wraps the element around a wrapper that copies position properties + createWrapper: function( element ) { + + // If the element is already wrapped, return it + if ( element.parent().is( ".ui-effects-wrapper" ) ) { + return element.parent(); + } + + // Wrap the element + var props = { + width: element.outerWidth( true ), + height: element.outerHeight( true ), + "float": element.css( "float" ) + }, + wrapper = $( "
        " ) + .addClass( "ui-effects-wrapper" ) + .css( { + fontSize: "100%", + background: "transparent", + border: "none", + margin: 0, + padding: 0 + } ), + + // Store the size in case width/height are defined in % - Fixes #5245 + size = { + width: element.width(), + height: element.height() + }, + active = document.activeElement; + + // Support: Firefox + // Firefox incorrectly exposes anonymous content + // https://bugzilla.mozilla.org/show_bug.cgi?id=561664 + try { + // eslint-disable-next-line no-unused-expressions + active.id; + } catch ( e ) { + active = document.body; + } + + element.wrap( wrapper ); + + // Fixes #7595 - Elements lose focus when wrapped. + if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) { + $( active ).trigger( "focus" ); + } + + // Hotfix for jQuery 1.4 since some change in wrap() seems to actually + // lose the reference to the wrapped element + wrapper = element.parent(); + + // Transfer positioning properties to the wrapper + if ( element.css( "position" ) === "static" ) { + wrapper.css( { position: "relative" } ); + element.css( { position: "relative" } ); + } else { + $.extend( props, { + position: element.css( "position" ), + zIndex: element.css( "z-index" ) + } ); + $.each( [ "top", "left", "bottom", "right" ], function( i, pos ) { + props[ pos ] = element.css( pos ); + if ( isNaN( parseInt( props[ pos ], 10 ) ) ) { + props[ pos ] = "auto"; + } + } ); + element.css( { + position: "relative", + top: 0, + left: 0, + right: "auto", + bottom: "auto" + } ); + } + element.css( size ); + + return wrapper.css( props ).show(); + }, + + removeWrapper: function( element ) { + var active = document.activeElement; + + if ( element.parent().is( ".ui-effects-wrapper" ) ) { + element.parent().replaceWith( element ); + + // Fixes #7595 - Elements lose focus when wrapped. + if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) { + $( active ).trigger( "focus" ); + } + } + + return element; + } + } ); +} + +$.extend( $.effects, { + version: "1.14.1", + + define: function( name, mode, effect ) { + if ( !effect ) { + effect = mode; + mode = "effect"; + } + + $.effects.effect[ name ] = effect; + $.effects.effect[ name ].mode = mode; + + return effect; + }, + + scaledDimensions: function( element, percent, direction ) { + if ( percent === 0 ) { + return { + height: 0, + width: 0, + outerHeight: 0, + outerWidth: 0 + }; + } + + var x = direction !== "horizontal" ? ( ( percent || 100 ) / 100 ) : 1, + y = direction !== "vertical" ? ( ( percent || 100 ) / 100 ) : 1; + + return { + height: element.height() * y, + width: element.width() * x, + outerHeight: element.outerHeight() * y, + outerWidth: element.outerWidth() * x + }; + + }, + + clipToBox: function( animation ) { + return { + width: animation.clip.right - animation.clip.left, + height: animation.clip.bottom - animation.clip.top, + left: animation.clip.left, + top: animation.clip.top + }; + }, + + // Injects recently queued functions to be first in line (after "inprogress") + unshift: function( element, queueLength, count ) { + var queue = element.queue(); + + if ( queueLength > 1 ) { + queue.splice.apply( queue, + [ 1, 0 ].concat( queue.splice( queueLength, count ) ) ); + } + element.dequeue(); + }, + + saveStyle: function( element ) { + element.data( dataSpaceStyle, element[ 0 ].style.cssText ); + }, + + restoreStyle: function( element ) { + element[ 0 ].style.cssText = element.data( dataSpaceStyle ) || ""; + element.removeData( dataSpaceStyle ); + }, + + mode: function( element, mode ) { + var hidden = element.is( ":hidden" ); + + if ( mode === "toggle" ) { + mode = hidden ? "show" : "hide"; + } + if ( hidden ? mode === "hide" : mode === "show" ) { + mode = "none"; + } + return mode; + }, + + // Translates a [top,left] array into a baseline value + getBaseline: function( origin, original ) { + var y, x; + + switch ( origin[ 0 ] ) { + case "top": + y = 0; + break; + case "middle": + y = 0.5; + break; + case "bottom": + y = 1; + break; + default: + y = origin[ 0 ] / original.height; + } + + switch ( origin[ 1 ] ) { + case "left": + x = 0; + break; + case "center": + x = 0.5; + break; + case "right": + x = 1; + break; + default: + x = origin[ 1 ] / original.width; + } + + return { + x: x, + y: y + }; + }, + + // Creates a placeholder element so that the original element can be made absolute + createPlaceholder: function( element ) { + var placeholder, + cssPosition = element.css( "position" ), + position = element.position(); + + // Lock in margins first to account for form elements, which + // will change margin if you explicitly set height + // see: https://jsfiddle.net/JZSMt/3/ https://bugs.webkit.org/show_bug.cgi?id=107380 + // Support: Safari + element.css( { + marginTop: element.css( "marginTop" ), + marginBottom: element.css( "marginBottom" ), + marginLeft: element.css( "marginLeft" ), + marginRight: element.css( "marginRight" ) + } ) + .outerWidth( element.outerWidth() ) + .outerHeight( element.outerHeight() ); + + if ( /^(static|relative)/.test( cssPosition ) ) { + cssPosition = "absolute"; + + placeholder = $( "<" + element[ 0 ].nodeName + ">" ).insertAfter( element ).css( { + + // Convert inline to inline block to account for inline elements + // that turn to inline block based on content (like img) + display: /^(inline|ruby)/.test( element.css( "display" ) ) ? + "inline-block" : + "block", + visibility: "hidden", + + // Margins need to be set to account for margin collapse + marginTop: element.css( "marginTop" ), + marginBottom: element.css( "marginBottom" ), + marginLeft: element.css( "marginLeft" ), + marginRight: element.css( "marginRight" ), + "float": element.css( "float" ) + } ) + .outerWidth( element.outerWidth() ) + .outerHeight( element.outerHeight() ) + .addClass( "ui-effects-placeholder" ); + + element.data( dataSpace + "placeholder", placeholder ); + } + + element.css( { + position: cssPosition, + left: position.left, + top: position.top + } ); + + return placeholder; + }, + + removePlaceholder: function( element ) { + var dataKey = dataSpace + "placeholder", + placeholder = element.data( dataKey ); + + if ( placeholder ) { + placeholder.remove(); + element.removeData( dataKey ); + } + }, + + // Removes a placeholder if it exists and restores + // properties that were modified during placeholder creation + cleanUp: function( element ) { + $.effects.restoreStyle( element ); + $.effects.removePlaceholder( element ); + }, + + setTransition: function( element, list, factor, value ) { + value = value || {}; + $.each( list, function( i, x ) { + var unit = element.cssUnit( x ); + if ( unit[ 0 ] > 0 ) { + value[ x ] = unit[ 0 ] * factor + unit[ 1 ]; + } + } ); + return value; + } +} ); + +// Return an effect options object for the given parameters: +function _normalizeArguments( effect, options, speed, callback ) { + + // Allow passing all options as the first parameter + if ( $.isPlainObject( effect ) ) { + options = effect; + effect = effect.effect; + } + + // Convert to an object + effect = { effect: effect }; + + // Catch (effect, null, ...) + if ( options == null ) { + options = {}; + } + + // Catch (effect, callback) + if ( typeof options === "function" ) { + callback = options; + speed = null; + options = {}; + } + + // Catch (effect, speed, ?) + if ( typeof options === "number" || $.fx.speeds[ options ] ) { + callback = speed; + speed = options; + options = {}; + } + + // Catch (effect, options, callback) + if ( typeof speed === "function" ) { + callback = speed; + speed = null; + } + + // Add options to effect + if ( options ) { + $.extend( effect, options ); + } + + speed = speed || options.duration; + effect.duration = $.fx.off ? 0 : + typeof speed === "number" ? speed : + speed in $.fx.speeds ? $.fx.speeds[ speed ] : + $.fx.speeds._default; + + effect.complete = callback || options.complete; + + return effect; +} + +function standardAnimationOption( option ) { + + // Valid standard speeds (nothing, number, named speed) + if ( !option || typeof option === "number" || $.fx.speeds[ option ] ) { + return true; + } + + // Invalid strings - treat as "normal" speed + if ( typeof option === "string" && !$.effects.effect[ option ] ) { + return true; + } + + // Complete callback + if ( typeof option === "function" ) { + return true; + } + + // Options hash (but not naming an effect) + if ( typeof option === "object" && !option.effect ) { + return true; + } + + // Didn't match any standard API + return false; +} + +$.fn.extend( { + effect: function( /* effect, options, speed, callback */ ) { + var args = _normalizeArguments.apply( this, arguments ), + effectMethod = $.effects.effect[ args.effect ], + defaultMode = effectMethod.mode, + queue = args.queue, + queueName = queue || "fx", + complete = args.complete, + mode = args.mode, + modes = [], + prefilter = function( next ) { + var el = $( this ), + normalizedMode = $.effects.mode( el, mode ) || defaultMode; + + // Sentinel for duck-punching the :animated pseudo-selector + el.data( dataSpaceAnimated, true ); + + // Save effect mode for later use, + // we can't just call $.effects.mode again later, + // as the .show() below destroys the initial state + modes.push( normalizedMode ); + + // See $.uiBackCompat inside of run() for removal of defaultMode in 1.14 + if ( defaultMode && ( normalizedMode === "show" || + ( normalizedMode === defaultMode && normalizedMode === "hide" ) ) ) { + el.show(); + } + + if ( !defaultMode || normalizedMode !== "none" ) { + $.effects.saveStyle( el ); + } + + if ( typeof next === "function" ) { + next(); + } + }; + + if ( $.fx.off || !effectMethod ) { + + // Delegate to the original method (e.g., .show()) if possible + if ( mode ) { + return this[ mode ]( args.duration, complete ); + } else { + return this.each( function() { + if ( complete ) { + complete.call( this ); + } + } ); + } + } + + function run( next ) { + var elem = $( this ); + + function cleanup() { + elem.removeData( dataSpaceAnimated ); + + $.effects.cleanUp( elem ); + + if ( args.mode === "hide" ) { + elem.hide(); + } + + done(); + } + + function done() { + if ( typeof complete === "function" ) { + complete.call( elem[ 0 ] ); + } + + if ( typeof next === "function" ) { + next(); + } + } + + // Override mode option on a per element basis, + // as toggle can be either show or hide depending on element state + args.mode = modes.shift(); + + if ( $.uiBackCompat === true && !defaultMode ) { + if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) { + + // Call the core method to track "olddisplay" properly + elem[ mode ](); + done(); + } else { + effectMethod.call( elem[ 0 ], args, done ); + } + } else { + if ( args.mode === "none" ) { + + // Call the core method to track "olddisplay" properly + elem[ mode ](); + done(); + } else { + effectMethod.call( elem[ 0 ], args, cleanup ); + } + } + } + + // Run prefilter on all elements first to ensure that + // any showing or hiding happens before placeholder creation, + // which ensures that any layout changes are correctly captured. + return queue === false ? + this.each( prefilter ).each( run ) : + this.queue( queueName, prefilter ).queue( queueName, run ); + }, + + show: ( function( orig ) { + return function( option ) { + if ( standardAnimationOption( option ) ) { + return orig.apply( this, arguments ); + } else { + var args = _normalizeArguments.apply( this, arguments ); + args.mode = "show"; + return this.effect.call( this, args ); + } + }; + } )( $.fn.show ), + + hide: ( function( orig ) { + return function( option ) { + if ( standardAnimationOption( option ) ) { + return orig.apply( this, arguments ); + } else { + var args = _normalizeArguments.apply( this, arguments ); + args.mode = "hide"; + return this.effect.call( this, args ); + } + }; + } )( $.fn.hide ), + + toggle: ( function( orig ) { + return function( option ) { + if ( standardAnimationOption( option ) || typeof option === "boolean" ) { + return orig.apply( this, arguments ); + } else { + var args = _normalizeArguments.apply( this, arguments ); + args.mode = "toggle"; + return this.effect.call( this, args ); + } + }; + } )( $.fn.toggle ), + + cssUnit: function( key ) { + var style = this.css( key ), + val = []; + + $.each( [ "em", "px", "%", "pt" ], function( i, unit ) { + if ( style.indexOf( unit ) > 0 ) { + val = [ parseFloat( style ), unit ]; + } + } ); + return val; + }, + + cssClip: function( clipObj ) { + if ( clipObj ) { + return this.css( "clip", "rect(" + clipObj.top + "px " + clipObj.right + "px " + + clipObj.bottom + "px " + clipObj.left + "px)" ); + } + return parseClip( this.css( "clip" ), this ); + }, + + transfer: function( options, done ) { + var element = $( this ), + target = $( options.to ), + targetFixed = target.css( "position" ) === "fixed", + body = $( "body" ), + fixTop = targetFixed ? body.scrollTop() : 0, + fixLeft = targetFixed ? body.scrollLeft() : 0, + endPosition = target.offset(), + animation = { + top: endPosition.top - fixTop, + left: endPosition.left - fixLeft, + height: target.innerHeight(), + width: target.innerWidth() + }, + startPosition = element.offset(), + transfer = $( "
        " ); + + transfer + .appendTo( "body" ) + .addClass( options.className ) + .css( { + top: startPosition.top - fixTop, + left: startPosition.left - fixLeft, + height: element.innerHeight(), + width: element.innerWidth(), + position: targetFixed ? "fixed" : "absolute" + } ) + .animate( animation, options.duration, options.easing, function() { + transfer.remove(); + if ( typeof done === "function" ) { + done(); + } + } ); + } +} ); + +function parseClip( str, element ) { + var outerWidth = element.outerWidth(), + outerHeight = element.outerHeight(), + clipRegex = /^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/, + values = clipRegex.exec( str ) || [ "", 0, outerWidth, outerHeight, 0 ]; + + return { + top: parseFloat( values[ 1 ] ) || 0, + right: values[ 2 ] === "auto" ? outerWidth : parseFloat( values[ 2 ] ), + bottom: values[ 3 ] === "auto" ? outerHeight : parseFloat( values[ 3 ] ), + left: parseFloat( values[ 4 ] ) || 0 + }; +} + +$.fx.step.clip = function( fx ) { + if ( !fx.clipInit ) { + fx.start = $( fx.elem ).cssClip(); + if ( typeof fx.end === "string" ) { + fx.end = parseClip( fx.end, fx.elem ); + } + fx.clipInit = true; + } + + $( fx.elem ).cssClip( { + top: fx.pos * ( fx.end.top - fx.start.top ) + fx.start.top, + right: fx.pos * ( fx.end.right - fx.start.right ) + fx.start.right, + bottom: fx.pos * ( fx.end.bottom - fx.start.bottom ) + fx.start.bottom, + left: fx.pos * ( fx.end.left - fx.start.left ) + fx.start.left + } ); +}; + +} )(); + +/******************************************************************************/ +/*********************************** EASING ***********************************/ +/******************************************************************************/ + +( function() { + +// Based on easing equations from Robert Penner (http://robertpenner.com/easing) + +var baseEasings = {}; + +$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) { + baseEasings[ name ] = function( p ) { + return Math.pow( p, i + 2 ); + }; +} ); + +$.extend( baseEasings, { + Sine: function( p ) { + return 1 - Math.cos( p * Math.PI / 2 ); + }, + Circ: function( p ) { + return 1 - Math.sqrt( 1 - p * p ); + }, + Elastic: function( p ) { + return p === 0 || p === 1 ? p : + -Math.pow( 2, 8 * ( p - 1 ) ) * Math.sin( ( ( p - 1 ) * 80 - 7.5 ) * Math.PI / 15 ); + }, + Back: function( p ) { + return p * p * ( 3 * p - 2 ); + }, + Bounce: function( p ) { + var pow2, + bounce = 4; + + while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {} + return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 ); + } +} ); + +$.each( baseEasings, function( name, easeIn ) { + $.easing[ "easeIn" + name ] = easeIn; + $.easing[ "easeOut" + name ] = function( p ) { + return 1 - easeIn( 1 - p ); + }; + $.easing[ "easeInOut" + name ] = function( p ) { + return p < 0.5 ? + easeIn( p * 2 ) / 2 : + 1 - easeIn( p * -2 + 2 ) / 2; + }; +} ); + +} )(); + +var effect = $.effects; + + +/*! + * jQuery UI Effects Blind 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Blind Effect +//>>group: Effects +//>>description: Blinds the element. +//>>docs: https://api.jqueryui.com/blind-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, done ) { + var map = { + up: [ "bottom", "top" ], + vertical: [ "bottom", "top" ], + down: [ "top", "bottom" ], + left: [ "right", "left" ], + horizontal: [ "right", "left" ], + right: [ "left", "right" ] + }, + element = $( this ), + direction = options.direction || "up", + start = element.cssClip(), + animate = { clip: $.extend( {}, start ) }, + placeholder = $.effects.createPlaceholder( element ); + + animate.clip[ map[ direction ][ 0 ] ] = animate.clip[ map[ direction ][ 1 ] ]; + + if ( options.mode === "show" ) { + element.cssClip( animate.clip ); + if ( placeholder ) { + placeholder.css( $.effects.clipToBox( animate ) ); + } + + animate.clip = start; + } + + if ( placeholder ) { + placeholder.animate( $.effects.clipToBox( animate ), options.duration, options.easing ); + } + + element.animate( animate, { + queue: false, + duration: options.duration, + easing: options.easing, + complete: done + } ); +} ); + + +/*! + * jQuery UI Effects Bounce 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Bounce Effect +//>>group: Effects +//>>description: Bounces an element horizontally or vertically n times. +//>>docs: https://api.jqueryui.com/bounce-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectBounce = $.effects.define( "bounce", function( options, done ) { + var upAnim, downAnim, refValue, + element = $( this ), + + // Defaults: + mode = options.mode, + hide = mode === "hide", + show = mode === "show", + direction = options.direction || "up", + distance = options.distance, + times = options.times || 5, + + // Number of internal animations + anims = times * 2 + ( show || hide ? 1 : 0 ), + speed = options.duration / anims, + easing = options.easing, + + // Utility: + ref = ( direction === "up" || direction === "down" ) ? "top" : "left", + motion = ( direction === "up" || direction === "left" ), + i = 0, + + queuelen = element.queue().length; + + $.effects.createPlaceholder( element ); + + refValue = element.css( ref ); + + // Default distance for the BIGGEST bounce is the outer Distance / 3 + if ( !distance ) { + distance = element[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3; + } + + if ( show ) { + downAnim = { opacity: 1 }; + downAnim[ ref ] = refValue; + + // If we are showing, force opacity 0 and set the initial position + // then do the "first" animation + element + .css( "opacity", 0 ) + .css( ref, motion ? -distance * 2 : distance * 2 ) + .animate( downAnim, speed, easing ); + } + + // Start at the smallest distance if we are hiding + if ( hide ) { + distance = distance / Math.pow( 2, times - 1 ); + } + + downAnim = {}; + downAnim[ ref ] = refValue; + + // Bounces up/down/left/right then back to 0 -- times * 2 animations happen here + for ( ; i < times; i++ ) { + upAnim = {}; + upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance; + + element + .animate( upAnim, speed, easing ) + .animate( downAnim, speed, easing ); + + distance = hide ? distance * 2 : distance / 2; + } + + // Last Bounce when Hiding + if ( hide ) { + upAnim = { opacity: 0 }; + upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance; + + element.animate( upAnim, speed, easing ); + } + + element.queue( done ); + + $.effects.unshift( element, queuelen, anims + 1 ); +} ); + + +/*! + * jQuery UI Effects Clip 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Clip Effect +//>>group: Effects +//>>description: Clips the element on and off like an old TV. +//>>docs: https://api.jqueryui.com/clip-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectClip = $.effects.define( "clip", "hide", function( options, done ) { + var start, + animate = {}, + element = $( this ), + direction = options.direction || "vertical", + both = direction === "both", + horizontal = both || direction === "horizontal", + vertical = both || direction === "vertical"; + + start = element.cssClip(); + animate.clip = { + top: vertical ? ( start.bottom - start.top ) / 2 : start.top, + right: horizontal ? ( start.right - start.left ) / 2 : start.right, + bottom: vertical ? ( start.bottom - start.top ) / 2 : start.bottom, + left: horizontal ? ( start.right - start.left ) / 2 : start.left + }; + + $.effects.createPlaceholder( element ); + + if ( options.mode === "show" ) { + element.cssClip( animate.clip ); + animate.clip = start; + } + + element.animate( animate, { + queue: false, + duration: options.duration, + easing: options.easing, + complete: done + } ); + +} ); + + +/*! + * jQuery UI Effects Drop 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Drop Effect +//>>group: Effects +//>>description: Moves an element in one direction and hides it at the same time. +//>>docs: https://api.jqueryui.com/drop-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectDrop = $.effects.define( "drop", "hide", function( options, done ) { + + var distance, + element = $( this ), + mode = options.mode, + show = mode === "show", + direction = options.direction || "left", + ref = ( direction === "up" || direction === "down" ) ? "top" : "left", + motion = ( direction === "up" || direction === "left" ) ? "-=" : "+=", + oppositeMotion = ( motion === "+=" ) ? "-=" : "+=", + animation = { + opacity: 0 + }; + + $.effects.createPlaceholder( element ); + + distance = options.distance || + element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2; + + animation[ ref ] = motion + distance; + + if ( show ) { + element.css( animation ); + + animation[ ref ] = oppositeMotion + distance; + animation.opacity = 1; + } + + // Animate + element.animate( animation, { + queue: false, + duration: options.duration, + easing: options.easing, + complete: done + } ); +} ); + + +/*! + * jQuery UI Effects Explode 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Explode Effect +//>>group: Effects +/* eslint-disable max-len */ +//>>description: Explodes an element in all directions into n pieces. Implodes an element to its original wholeness. +/* eslint-enable max-len */ +//>>docs: https://api.jqueryui.com/explode-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectExplode = $.effects.define( "explode", "hide", function( options, done ) { + + var i, j, left, top, mx, my, + rows = options.pieces ? Math.round( Math.sqrt( options.pieces ) ) : 3, + cells = rows, + element = $( this ), + mode = options.mode, + show = mode === "show", + + // Show and then visibility:hidden the element before calculating offset + offset = element.show().css( "visibility", "hidden" ).offset(), + + // Width and height of a piece + width = Math.ceil( element.outerWidth() / cells ), + height = Math.ceil( element.outerHeight() / rows ), + pieces = []; + + // Children animate complete: + function childComplete() { + pieces.push( this ); + if ( pieces.length === rows * cells ) { + animComplete(); + } + } + + // Clone the element for each row and cell. + for ( i = 0; i < rows; i++ ) { // ===> + top = offset.top + i * height; + my = i - ( rows - 1 ) / 2; + + for ( j = 0; j < cells; j++ ) { // ||| + left = offset.left + j * width; + mx = j - ( cells - 1 ) / 2; + + // Create a clone of the now hidden main element that will be absolute positioned + // within a wrapper div off the -left and -top equal to size of our pieces + element + .clone() + .appendTo( "body" ) + .wrap( "
        " ) + .css( { + position: "absolute", + visibility: "visible", + left: -j * width, + top: -i * height + } ) + + // Select the wrapper - make it overflow: hidden and absolute positioned based on + // where the original was located +left and +top equal to the size of pieces + .parent() + .addClass( "ui-effects-explode" ) + .css( { + position: "absolute", + overflow: "hidden", + width: width, + height: height, + left: left + ( show ? mx * width : 0 ), + top: top + ( show ? my * height : 0 ), + opacity: show ? 0 : 1 + } ) + .animate( { + left: left + ( show ? 0 : mx * width ), + top: top + ( show ? 0 : my * height ), + opacity: show ? 1 : 0 + }, options.duration || 500, options.easing, childComplete ); + } + } + + function animComplete() { + element.css( { + visibility: "visible" + } ); + $( pieces ).remove(); + done(); + } +} ); + + +/*! + * jQuery UI Effects Fade 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Fade Effect +//>>group: Effects +//>>description: Fades the element. +//>>docs: https://api.jqueryui.com/fade-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectFade = $.effects.define( "fade", "toggle", function( options, done ) { + var show = options.mode === "show"; + + $( this ) + .css( "opacity", show ? 0 : 1 ) + .animate( { + opacity: show ? 1 : 0 + }, { + queue: false, + duration: options.duration, + easing: options.easing, + complete: done + } ); +} ); + + +/*! + * jQuery UI Effects Fold 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Fold Effect +//>>group: Effects +//>>description: Folds an element first horizontally and then vertically. +//>>docs: https://api.jqueryui.com/fold-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectFold = $.effects.define( "fold", "hide", function( options, done ) { + + // Create element + var element = $( this ), + mode = options.mode, + show = mode === "show", + hide = mode === "hide", + size = options.size || 15, + percent = /([0-9]+)%/.exec( size ), + horizFirst = !!options.horizFirst, + ref = horizFirst ? [ "right", "bottom" ] : [ "bottom", "right" ], + duration = options.duration / 2, + + placeholder = $.effects.createPlaceholder( element ), + + start = element.cssClip(), + animation1 = { clip: $.extend( {}, start ) }, + animation2 = { clip: $.extend( {}, start ) }, + + distance = [ start[ ref[ 0 ] ], start[ ref[ 1 ] ] ], + + queuelen = element.queue().length; + + if ( percent ) { + size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ]; + } + animation1.clip[ ref[ 0 ] ] = size; + animation2.clip[ ref[ 0 ] ] = size; + animation2.clip[ ref[ 1 ] ] = 0; + + if ( show ) { + element.cssClip( animation2.clip ); + if ( placeholder ) { + placeholder.css( $.effects.clipToBox( animation2 ) ); + } + + animation2.clip = start; + } + + // Animate + element + .queue( function( next ) { + if ( placeholder ) { + placeholder + .animate( $.effects.clipToBox( animation1 ), duration, options.easing ) + .animate( $.effects.clipToBox( animation2 ), duration, options.easing ); + } + + next(); + } ) + .animate( animation1, duration, options.easing ) + .animate( animation2, duration, options.easing ) + .queue( done ); + + $.effects.unshift( element, queuelen, 4 ); +} ); + + +/*! + * jQuery UI Effects Highlight 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Highlight Effect +//>>group: Effects +//>>description: Highlights the background of an element in a defined color for a custom duration. +//>>docs: https://api.jqueryui.com/highlight-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectHighlight = $.effects.define( "highlight", "show", function( options, done ) { + var element = $( this ), + animation = { + backgroundColor: element.css( "backgroundColor" ) + }; + + if ( options.mode === "hide" ) { + animation.opacity = 0; + } + + $.effects.saveStyle( element ); + + element + .css( { + backgroundImage: "none", + backgroundColor: options.color || "#ffff99" + } ) + .animate( animation, { + queue: false, + duration: options.duration, + easing: options.easing, + complete: done + } ); +} ); + + +/*! + * jQuery UI Effects Size 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Size Effect +//>>group: Effects +//>>description: Resize an element to a specified width and height. +//>>docs: https://api.jqueryui.com/size-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectSize = $.effects.define( "size", function( options, done ) { + + // Create element + var baseline, factor, temp, + element = $( this ), + + // Copy for children + cProps = [ "fontSize" ], + vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ], + hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ], + + // Set options + mode = options.mode, + restore = mode !== "effect", + scale = options.scale || "both", + origin = options.origin || [ "middle", "center" ], + position = element.css( "position" ), + pos = element.position(), + original = $.effects.scaledDimensions( element ), + from = options.from || original, + to = options.to || $.effects.scaledDimensions( element, 0 ); + + $.effects.createPlaceholder( element ); + + if ( mode === "show" ) { + temp = from; + from = to; + to = temp; + } + + // Set scaling factor + factor = { + from: { + y: from.height / original.height, + x: from.width / original.width + }, + to: { + y: to.height / original.height, + x: to.width / original.width + } + }; + + // Scale the css box + if ( scale === "box" || scale === "both" ) { + + // Vertical props scaling + if ( factor.from.y !== factor.to.y ) { + from = $.effects.setTransition( element, vProps, factor.from.y, from ); + to = $.effects.setTransition( element, vProps, factor.to.y, to ); + } + + // Horizontal props scaling + if ( factor.from.x !== factor.to.x ) { + from = $.effects.setTransition( element, hProps, factor.from.x, from ); + to = $.effects.setTransition( element, hProps, factor.to.x, to ); + } + } + + // Scale the content + if ( scale === "content" || scale === "both" ) { + + // Vertical props scaling + if ( factor.from.y !== factor.to.y ) { + from = $.effects.setTransition( element, cProps, factor.from.y, from ); + to = $.effects.setTransition( element, cProps, factor.to.y, to ); + } + } + + // Adjust the position properties based on the provided origin points + if ( origin ) { + baseline = $.effects.getBaseline( origin, original ); + from.top = ( original.outerHeight - from.outerHeight ) * baseline.y + pos.top; + from.left = ( original.outerWidth - from.outerWidth ) * baseline.x + pos.left; + to.top = ( original.outerHeight - to.outerHeight ) * baseline.y + pos.top; + to.left = ( original.outerWidth - to.outerWidth ) * baseline.x + pos.left; + } + delete from.outerHeight; + delete from.outerWidth; + element.css( from ); + + // Animate the children if desired + if ( scale === "content" || scale === "both" ) { + + vProps = vProps.concat( [ "marginTop", "marginBottom" ] ).concat( cProps ); + hProps = hProps.concat( [ "marginLeft", "marginRight" ] ); + + // Only animate children with width attributes specified + // TODO: is this right? should we include anything with css width specified as well + element.find( "*[width]" ).each( function() { + var child = $( this ), + childOriginal = $.effects.scaledDimensions( child ), + childFrom = { + height: childOriginal.height * factor.from.y, + width: childOriginal.width * factor.from.x, + outerHeight: childOriginal.outerHeight * factor.from.y, + outerWidth: childOriginal.outerWidth * factor.from.x + }, + childTo = { + height: childOriginal.height * factor.to.y, + width: childOriginal.width * factor.to.x, + outerHeight: childOriginal.height * factor.to.y, + outerWidth: childOriginal.width * factor.to.x + }; + + // Vertical props scaling + if ( factor.from.y !== factor.to.y ) { + childFrom = $.effects.setTransition( child, vProps, factor.from.y, childFrom ); + childTo = $.effects.setTransition( child, vProps, factor.to.y, childTo ); + } + + // Horizontal props scaling + if ( factor.from.x !== factor.to.x ) { + childFrom = $.effects.setTransition( child, hProps, factor.from.x, childFrom ); + childTo = $.effects.setTransition( child, hProps, factor.to.x, childTo ); + } + + if ( restore ) { + $.effects.saveStyle( child ); + } + + // Animate children + child.css( childFrom ); + child.animate( childTo, options.duration, options.easing, function() { + + // Restore children + if ( restore ) { + $.effects.restoreStyle( child ); + } + } ); + } ); + } + + // Animate + element.animate( to, { + queue: false, + duration: options.duration, + easing: options.easing, + complete: function() { + + var offset = element.offset(); + + if ( to.opacity === 0 ) { + element.css( "opacity", from.opacity ); + } + + if ( !restore ) { + element + .css( "position", position === "static" ? "relative" : position ) + .offset( offset ); + + // Need to save style here so that automatic style restoration + // doesn't restore to the original styles from before the animation. + $.effects.saveStyle( element ); + } + + done(); + } + } ); + +} ); + + +/*! + * jQuery UI Effects Scale 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Scale Effect +//>>group: Effects +//>>description: Grows or shrinks an element and its content. +//>>docs: https://api.jqueryui.com/scale-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectScale = $.effects.define( "scale", function( options, done ) { + + // Create element + var el = $( this ), + mode = options.mode, + percent = parseInt( options.percent, 10 ) || + ( parseInt( options.percent, 10 ) === 0 ? 0 : ( mode !== "effect" ? 0 : 100 ) ), + + newOptions = $.extend( true, { + from: $.effects.scaledDimensions( el ), + to: $.effects.scaledDimensions( el, percent, options.direction || "both" ), + origin: options.origin || [ "middle", "center" ] + }, options ); + + // Fade option to support puff + if ( options.fade ) { + newOptions.from.opacity = 1; + newOptions.to.opacity = 0; + } + + $.effects.effect.size.call( this, newOptions, done ); +} ); + + +/*! + * jQuery UI Effects Puff 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Puff Effect +//>>group: Effects +//>>description: Creates a puff effect by scaling the element up and hiding it at the same time. +//>>docs: https://api.jqueryui.com/puff-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectPuff = $.effects.define( "puff", "hide", function( options, done ) { + var newOptions = $.extend( true, {}, options, { + fade: true, + percent: parseInt( options.percent, 10 ) || 150 + } ); + + $.effects.effect.scale.call( this, newOptions, done ); +} ); + + +/*! + * jQuery UI Effects Pulsate 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Pulsate Effect +//>>group: Effects +//>>description: Pulsates an element n times by changing the opacity to zero and back. +//>>docs: https://api.jqueryui.com/pulsate-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectPulsate = $.effects.define( "pulsate", "show", function( options, done ) { + var element = $( this ), + mode = options.mode, + show = mode === "show", + hide = mode === "hide", + showhide = show || hide, + + // Showing or hiding leaves off the "last" animation + anims = ( ( options.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ), + duration = options.duration / anims, + animateTo = 0, + i = 1, + queuelen = element.queue().length; + + if ( show || !element.is( ":visible" ) ) { + element.css( "opacity", 0 ).show(); + animateTo = 1; + } + + // Anims - 1 opacity "toggles" + for ( ; i < anims; i++ ) { + element.animate( { opacity: animateTo }, duration, options.easing ); + animateTo = 1 - animateTo; + } + + element.animate( { opacity: animateTo }, duration, options.easing ); + + element.queue( done ); + + $.effects.unshift( element, queuelen, anims + 1 ); +} ); + + +/*! + * jQuery UI Effects Shake 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Shake Effect +//>>group: Effects +//>>description: Shakes an element horizontally or vertically n times. +//>>docs: https://api.jqueryui.com/shake-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectShake = $.effects.define( "shake", function( options, done ) { + + var i = 1, + element = $( this ), + direction = options.direction || "left", + distance = options.distance || 20, + times = options.times || 3, + anims = times * 2 + 1, + speed = Math.round( options.duration / anims ), + ref = ( direction === "up" || direction === "down" ) ? "top" : "left", + positiveMotion = ( direction === "up" || direction === "left" ), + animation = {}, + animation1 = {}, + animation2 = {}, + + queuelen = element.queue().length; + + $.effects.createPlaceholder( element ); + + // Animation + animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance; + animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2; + animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2; + + // Animate + element.animate( animation, speed, options.easing ); + + // Shakes + for ( ; i < times; i++ ) { + element + .animate( animation1, speed, options.easing ) + .animate( animation2, speed, options.easing ); + } + + element + .animate( animation1, speed, options.easing ) + .animate( animation, speed / 2, options.easing ) + .queue( done ); + + $.effects.unshift( element, queuelen, anims + 1 ); +} ); + + +/*! + * jQuery UI Effects Slide 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Slide Effect +//>>group: Effects +//>>description: Slides an element in and out of the viewport. +//>>docs: https://api.jqueryui.com/slide-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effectsEffectSlide = $.effects.define( "slide", "show", function( options, done ) { + var startClip, startRef, + element = $( this ), + map = { + up: [ "bottom", "top" ], + down: [ "top", "bottom" ], + left: [ "right", "left" ], + right: [ "left", "right" ] + }, + mode = options.mode, + direction = options.direction || "left", + ref = ( direction === "up" || direction === "down" ) ? "top" : "left", + positiveMotion = ( direction === "up" || direction === "left" ), + distance = options.distance || + element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ), + animation = {}; + + $.effects.createPlaceholder( element ); + + startClip = element.cssClip(); + startRef = element.position()[ ref ]; + + // Define hide animation + animation[ ref ] = ( positiveMotion ? -1 : 1 ) * distance + startRef; + animation.clip = element.cssClip(); + animation.clip[ map[ direction ][ 1 ] ] = animation.clip[ map[ direction ][ 0 ] ]; + + // Reverse the animation if we're showing + if ( mode === "show" ) { + element.cssClip( animation.clip ); + element.css( ref, animation[ ref ] ); + animation.clip = startClip; + animation[ ref ] = startRef; + } + + // Actually animate + element.animate( animation, { + queue: false, + duration: options.duration, + easing: options.easing, + complete: done + } ); +} ); + + +/*! + * jQuery UI Effects Transfer 1.14.1 + * https://jqueryui.com + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license. + * https://jquery.org/license + */ + +//>>label: Transfer Effect +//>>group: Effects +//>>description: Displays a transfer effect from one element to another. +//>>docs: https://api.jqueryui.com/transfer-effect/ +//>>demos: https://jqueryui.com/effect/ + + +var effect; +if ( $.uiBackCompat === true ) { + effect = $.effects.define( "transfer", function( options, done ) { + $( this ).transfer( options, done ); + } ); +} +var effectsEffectTransfer = effect; + + + + +} ); diff --git a/assets/jquery-ui/jquery-ui.min.css b/assets/jquery-ui/jquery-ui.min.css new file mode 100644 index 00000000..dc13954e --- /dev/null +++ b/assets/jquery-ui/jquery-ui.min.css @@ -0,0 +1,7 @@ +/*! jQuery UI - v1.14.1 - 2024-11-14 +* https://jqueryui.com +* Includes: draggable.css, core.css, resizable.css, selectable.css, sortable.css, accordion.css, autocomplete.css, menu.css, button.css, controlgroup.css, checkboxradio.css, datepicker.css, dialog.css, progressbar.css, selectmenu.css, slider.css, spinner.css, tabs.css, tooltip.css, theme.css +* To view and modify this theme, visit https://jqueryui.com/themeroller/?ffDefault=Arial%2CHelvetica%2Csans-serif&fsDefault=1em&fwDefault=normal&cornerRadius=3px&bgColorHeader=e9e9e9&bgTextureHeader=flat&borderColorHeader=dddddd&fcHeader=333333&iconColorHeader=444444&bgColorContent=ffffff&bgTextureContent=flat&borderColorContent=dddddd&fcContent=333333&iconColorContent=444444&bgColorDefault=f6f6f6&bgTextureDefault=flat&borderColorDefault=c5c5c5&fcDefault=454545&iconColorDefault=777777&bgColorHover=ededed&bgTextureHover=flat&borderColorHover=cccccc&fcHover=2b2b2b&iconColorHover=555555&bgColorActive=007fff&bgTextureActive=flat&borderColorActive=003eff&fcActive=ffffff&iconColorActive=ffffff&bgColorHighlight=fffa90&bgTextureHighlight=flat&borderColorHighlight=dad55e&fcHighlight=777620&iconColorHighlight=777620&bgColorError=fddfdf&bgTextureError=flat&borderColorError=f1a899&fcError=5f3f3f&iconColorError=cc0000&bgColorOverlay=aaaaaa&bgTextureOverlay=flat&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=666666&bgTextureShadow=flat&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=5px&offsetTopShadow=0px&offsetLeftShadow=0px&cornerRadiusShadow=8px +* Copyright OpenJS Foundation and other contributors; Licensed MIT */ + +.ui-draggable-handle{touch-action:none}.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important;pointer-events:none}.ui-icon{display:inline-block;vertical-align:middle;margin-top:-.25em;position:relative;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-icon-block{left:50%;margin-left:-8px;display:block}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-resizable{position:relative}.ui-resizable-handle{position:absolute;font-size:0.1px;display:block;touch-action:none}.ui-resizable-disabled .ui-resizable-handle,.ui-resizable-autohide .ui-resizable-handle{display:none}.ui-resizable-n{cursor:n-resize;height:7px;width:100%;top:-5px;left:0}.ui-resizable-s{cursor:s-resize;height:7px;width:100%;bottom:-5px;left:0}.ui-resizable-e{cursor:e-resize;width:7px;right:-5px;top:0;height:100%}.ui-resizable-w{cursor:w-resize;width:7px;left:-5px;top:0;height:100%}.ui-resizable-se{cursor:se-resize;width:12px;height:12px;right:1px;bottom:1px}.ui-resizable-sw{cursor:sw-resize;width:9px;height:9px;left:-5px;bottom:-5px}.ui-resizable-nw{cursor:nw-resize;width:9px;height:9px;left:-5px;top:-5px}.ui-resizable-ne{cursor:ne-resize;width:9px;height:9px;right:-5px;top:-5px}.ui-selectable{touch-action:none}.ui-selectable-helper{position:absolute;z-index:100;border:1px dotted black}.ui-sortable-handle{touch-action:none}.ui-accordion .ui-accordion-header{display:block;cursor:pointer;position:relative;margin:2px 0 0 0;padding:.5em .5em .5em .7em;font-size:100%}.ui-accordion .ui-accordion-content{padding:1em 2.2em;border-top:0;overflow:auto}.ui-autocomplete{position:absolute;top:0;left:0;cursor:default}.ui-menu{list-style:none;padding:0;margin:0;display:block;outline:0}.ui-menu .ui-menu{position:absolute}.ui-menu .ui-menu-item{margin:0;cursor:pointer}.ui-menu .ui-menu-item-wrapper{position:relative;padding:3px 1em 3px .4em}.ui-menu .ui-menu-divider{margin:5px 0;height:0;font-size:0;line-height:0;border-width:1px 0 0 0}.ui-menu .ui-state-focus,.ui-menu .ui-state-active{margin:-1px}.ui-menu-icons{position:relative}.ui-menu-icons .ui-menu-item-wrapper{padding-left:2em}.ui-menu .ui-icon{position:absolute;top:0;bottom:0;left:.2em;margin:auto 0}.ui-menu .ui-menu-icon{left:auto;right:0}.ui-button{padding:.4em 1em;display:inline-block;position:relative;line-height:normal;margin-right:.1em;cursor:pointer;vertical-align:middle;text-align:center;-webkit-user-select:none;user-select:none}.ui-button,.ui-button:link,.ui-button:visited,.ui-button:hover,.ui-button:active{text-decoration:none}.ui-button-icon-only{width:2em;box-sizing:border-box;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-button-icon-only{text-indent:0}.ui-button-icon-only .ui-icon{position:absolute;top:50%;left:50%;margin-top:-8px;margin-left:-8px}.ui-button.ui-icon-notext .ui-icon{padding:0;width:2.1em;height:2.1em;text-indent:-9999px;white-space:nowrap}input.ui-button.ui-icon-notext .ui-icon{width:auto;height:auto;text-indent:0;white-space:normal;padding:.4em 1em}input.ui-button::-moz-focus-inner,button.ui-button::-moz-focus-inner{border:0;padding:0}.ui-controlgroup{vertical-align:middle;display:inline-block}.ui-controlgroup > .ui-controlgroup-item{float:left;margin-left:0;margin-right:0}.ui-controlgroup > .ui-controlgroup-item:focus,.ui-controlgroup > .ui-controlgroup-item.ui-visual-focus{z-index:9999}.ui-controlgroup-vertical > .ui-controlgroup-item{display:block;float:none;width:100%;margin-top:0;margin-bottom:0;text-align:left}.ui-controlgroup-vertical .ui-controlgroup-item{box-sizing:border-box}.ui-controlgroup .ui-controlgroup-label{padding:.4em 1em}.ui-controlgroup .ui-controlgroup-label span{font-size:80%}.ui-controlgroup-horizontal .ui-controlgroup-label + .ui-controlgroup-item{border-left:none}.ui-controlgroup-vertical .ui-controlgroup-label + .ui-controlgroup-item{border-top:none}.ui-controlgroup-horizontal .ui-controlgroup-label.ui-widget-content{border-right:none}.ui-controlgroup-vertical .ui-controlgroup-label.ui-widget-content{border-bottom:none}.ui-controlgroup-vertical .ui-spinner-input{width:calc( 100% - 2.4em )}.ui-controlgroup-vertical .ui-spinner .ui-spinner-up{border-top-style:solid}.ui-checkboxradio-label .ui-icon-background{box-shadow:inset 1px 1px 1px #ccc;border-radius:.12em;border:none}.ui-checkboxradio-radio-label .ui-icon-background{width:16px;height:16px;border-radius:1em;overflow:visible;border:none}.ui-checkboxradio-radio-label.ui-checkboxradio-checked .ui-icon,.ui-checkboxradio-radio-label.ui-checkboxradio-checked:hover .ui-icon{background-image:none;width:8px;height:8px;border-width:4px;border-style:solid}.ui-checkboxradio-disabled{pointer-events:none}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}.ui-datepicker .ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat;left:.5em;top:.3em}.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:20px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:none;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-n{height:2px;top:0}.ui-dialog .ui-resizable-e{width:2px;right:0}.ui-dialog .ui-resizable-s{height:2px;bottom:0}.ui-dialog .ui-resizable-w{width:2px;left:0}.ui-dialog .ui-resizable-se,.ui-dialog .ui-resizable-sw,.ui-dialog .ui-resizable-ne,.ui-dialog .ui-resizable-nw{width:7px;height:7px}.ui-dialog .ui-resizable-se{right:0;bottom:0}.ui-dialog .ui-resizable-sw{left:0;bottom:0}.ui-dialog .ui-resizable-ne{right:0;top:0}.ui-dialog .ui-resizable-nw{left:0;top:0}.ui-draggable .ui-dialog-titlebar{cursor:move}.ui-progressbar{height:2em;text-align:left;overflow:hidden}.ui-progressbar .ui-progressbar-value{margin:-1px;height:100%}.ui-progressbar .ui-progressbar-overlay{background:url("data:image/gif;base64,R0lGODlhKAAoAIABAAAAAP///yH/C05FVFNDQVBFMi4wAwEAAAAh+QQJAQABACwAAAAAKAAoAAACkYwNqXrdC52DS06a7MFZI+4FHBCKoDeWKXqymPqGqxvJrXZbMx7Ttc+w9XgU2FB3lOyQRWET2IFGiU9m1frDVpxZZc6bfHwv4c1YXP6k1Vdy292Fb6UkuvFtXpvWSzA+HycXJHUXiGYIiMg2R6W459gnWGfHNdjIqDWVqemH2ekpObkpOlppWUqZiqr6edqqWQAAIfkECQEAAQAsAAAAACgAKAAAApSMgZnGfaqcg1E2uuzDmmHUBR8Qil95hiPKqWn3aqtLsS18y7G1SzNeowWBENtQd+T1JktP05nzPTdJZlR6vUxNWWjV+vUWhWNkWFwxl9VpZRedYcflIOLafaa28XdsH/ynlcc1uPVDZxQIR0K25+cICCmoqCe5mGhZOfeYSUh5yJcJyrkZWWpaR8doJ2o4NYq62lAAACH5BAkBAAEALAAAAAAoACgAAAKVDI4Yy22ZnINRNqosw0Bv7i1gyHUkFj7oSaWlu3ovC8GxNso5fluz3qLVhBVeT/Lz7ZTHyxL5dDalQWPVOsQWtRnuwXaFTj9jVVh8pma9JjZ4zYSj5ZOyma7uuolffh+IR5aW97cHuBUXKGKXlKjn+DiHWMcYJah4N0lYCMlJOXipGRr5qdgoSTrqWSq6WFl2ypoaUAAAIfkECQEAAQAsAAAAACgAKAAAApaEb6HLgd/iO7FNWtcFWe+ufODGjRfoiJ2akShbueb0wtI50zm02pbvwfWEMWBQ1zKGlLIhskiEPm9R6vRXxV4ZzWT2yHOGpWMyorblKlNp8HmHEb/lCXjcW7bmtXP8Xt229OVWR1fod2eWqNfHuMjXCPkIGNileOiImVmCOEmoSfn3yXlJWmoHGhqp6ilYuWYpmTqKUgAAIfkECQEAAQAsAAAAACgAKAAAApiEH6kb58biQ3FNWtMFWW3eNVcojuFGfqnZqSebuS06w5V80/X02pKe8zFwP6EFWOT1lDFk8rGERh1TTNOocQ61Hm4Xm2VexUHpzjymViHrFbiELsefVrn6XKfnt2Q9G/+Xdie499XHd2g4h7ioOGhXGJboGAnXSBnoBwKYyfioubZJ2Hn0RuRZaflZOil56Zp6iioKSXpUAAAh+QQJAQABACwAAAAAKAAoAAACkoQRqRvnxuI7kU1a1UU5bd5tnSeOZXhmn5lWK3qNTWvRdQxP8qvaC+/yaYQzXO7BMvaUEmJRd3TsiMAgswmNYrSgZdYrTX6tSHGZO73ezuAw2uxuQ+BbeZfMxsexY35+/Qe4J1inV0g4x3WHuMhIl2jXOKT2Q+VU5fgoSUI52VfZyfkJGkha6jmY+aaYdirq+lQAACH5BAkBAAEALAAAAAAoACgAAAKWBIKpYe0L3YNKToqswUlvznigd4wiR4KhZrKt9Upqip61i9E3vMvxRdHlbEFiEXfk9YARYxOZZD6VQ2pUunBmtRXo1Lf8hMVVcNl8JafV38aM2/Fu5V16Bn63r6xt97j09+MXSFi4BniGFae3hzbH9+hYBzkpuUh5aZmHuanZOZgIuvbGiNeomCnaxxap2upaCZsq+1kAACH5BAkBAAEALAAAAAAoACgAAAKXjI8By5zf4kOxTVrXNVlv1X0d8IGZGKLnNpYtm8Lr9cqVeuOSvfOW79D9aDHizNhDJidFZhNydEahOaDH6nomtJjp1tutKoNWkvA6JqfRVLHU/QUfau9l2x7G54d1fl995xcIGAdXqMfBNadoYrhH+Mg2KBlpVpbluCiXmMnZ2Sh4GBqJ+ckIOqqJ6LmKSllZmsoq6wpQAAAh+QQJAQABACwAAAAAKAAoAAAClYx/oLvoxuJDkU1a1YUZbJ59nSd2ZXhWqbRa2/gF8Gu2DY3iqs7yrq+xBYEkYvFSM8aSSObE+ZgRl1BHFZNr7pRCavZ5BW2142hY3AN/zWtsmf12p9XxxFl2lpLn1rseztfXZjdIWIf2s5dItwjYKBgo9yg5pHgzJXTEeGlZuenpyPmpGQoKOWkYmSpaSnqKileI2FAAACH5BAkBAAEALAAAAAAoACgAAAKVjB+gu+jG4kORTVrVhRlsnn2dJ3ZleFaptFrb+CXmO9OozeL5VfP99HvAWhpiUdcwkpBH3825AwYdU8xTqlLGhtCosArKMpvfa1mMRae9VvWZfeB2XfPkeLmm18lUcBj+p5dnN8jXZ3YIGEhYuOUn45aoCDkp16hl5IjYJvjWKcnoGQpqyPlpOhr3aElaqrq56Bq7VAAAOw==");height:100%;opacity:0.25}.ui-progressbar-indeterminate .ui-progressbar-value{background-image:none}.ui-selectmenu-menu{padding:0;margin:0;position:absolute;top:0;left:0;display:none}.ui-selectmenu-menu .ui-menu{overflow:auto;overflow-x:hidden;padding-bottom:1px}.ui-selectmenu-menu .ui-menu .ui-selectmenu-optgroup{font-size:1em;font-weight:bold;line-height:1.5;padding:2px 0.4em;margin:0.5em 0 0 0;height:auto;border:0}.ui-selectmenu-open{display:block}.ui-selectmenu-text{display:block;margin-right:20px;overflow:hidden;text-overflow:ellipsis}.ui-selectmenu-button.ui-button{text-align:left;white-space:nowrap;width:14em}.ui-selectmenu-icon.ui-icon{float:right;margin-top:0}.ui-slider{position:relative;text-align:left}.ui-slider .ui-slider-handle{position:absolute;z-index:2;width:1.2em;height:1.2em;cursor:pointer;touch-action:none}.ui-slider .ui-slider-range{position:absolute;z-index:1;font-size:.7em;display:block;border:0;background-position:0 0}.ui-slider-horizontal{height:.8em}.ui-slider-horizontal .ui-slider-handle{top:-.3em;margin-left:-.6em}.ui-slider-horizontal .ui-slider-range{top:0;height:100%}.ui-slider-horizontal .ui-slider-range-min{left:0}.ui-slider-horizontal .ui-slider-range-max{right:0}.ui-slider-vertical{width:.8em;height:100px}.ui-slider-vertical .ui-slider-handle{left:-.3em;margin-left:0;margin-bottom:-.6em}.ui-slider-vertical .ui-slider-range{left:0;width:100%}.ui-slider-vertical .ui-slider-range-min{bottom:0}.ui-slider-vertical .ui-slider-range-max{top:0}.ui-spinner{position:relative;display:inline-block;overflow:hidden;padding:0;vertical-align:middle}.ui-spinner-input{border:none;background:none;color:inherit;padding:.222em 0;margin:.2em 0;vertical-align:middle;margin-left:.4em;margin-right:2em}.ui-spinner-button{width:1.6em;height:50%;font-size:.5em;padding:0;margin:0;text-align:center;position:absolute;cursor:default;display:block;overflow:hidden;right:0}.ui-spinner a.ui-spinner-button{border-top-style:none;border-bottom-style:none;border-right-style:none}.ui-spinner-up{top:0}.ui-spinner-down{bottom:0}.ui-tabs{position:relative;padding:.2em}.ui-tabs .ui-tabs-nav{margin:0;padding:.2em .2em 0}.ui-tabs .ui-tabs-nav li{list-style:none;float:left;position:relative;top:0;margin:1px .2em 0 0;border-bottom-width:0;padding:0;white-space:nowrap}.ui-tabs .ui-tabs-nav .ui-tabs-anchor{float:left;padding:.5em 1em;text-decoration:none}.ui-tabs .ui-tabs-nav li.ui-tabs-active{margin-bottom:-1px;padding-bottom:1px}.ui-tabs .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-state-disabled .ui-tabs-anchor,.ui-tabs .ui-tabs-nav li.ui-tabs-loading .ui-tabs-anchor{cursor:text}.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active .ui-tabs-anchor{cursor:pointer}.ui-tabs .ui-tabs-panel{display:block;border-width:0;padding:1em 1.4em;background:none}.ui-tooltip{padding:8px;position:absolute;z-index:9999;max-width:300px}body .ui-tooltip{border-width:2px}.ui-widget{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget .ui-widget{font-size:1em}.ui-widget input,.ui-widget select,.ui-widget textarea,.ui-widget button{font-family:Arial,Helvetica,sans-serif;font-size:1em}.ui-widget.ui-widget-content{border:1px solid #c5c5c5}.ui-widget-content{border:1px solid #ddd;background:#fff;color:#333}.ui-widget-content a{color:#333}.ui-widget-header{border:1px solid #ddd;background:#e9e9e9;color:#333;font-weight:bold}.ui-widget-header a{color:#333}.ui-state-default,.ui-widget-content .ui-state-default,.ui-widget-header .ui-state-default,.ui-button,html .ui-button.ui-state-disabled:hover,html .ui-button.ui-state-disabled:active{border:1px solid #c5c5c5;background:#f6f6f6;font-weight:normal;color:#454545}.ui-state-default a,.ui-state-default a:link,.ui-state-default a:visited,a.ui-button,a:link.ui-button,a:visited.ui-button,.ui-button{color:#454545;text-decoration:none}.ui-state-hover,.ui-widget-content .ui-state-hover,.ui-widget-header .ui-state-hover,.ui-state-focus,.ui-widget-content .ui-state-focus,.ui-widget-header .ui-state-focus,.ui-button:hover,.ui-button:focus{border:1px solid #ccc;background:#ededed;font-weight:normal;color:#2b2b2b}.ui-state-hover a,.ui-state-hover a:hover,.ui-state-hover a:link,.ui-state-hover a:visited,.ui-state-focus a,.ui-state-focus a:hover,.ui-state-focus a:link,.ui-state-focus a:visited,a.ui-button:hover,a.ui-button:focus{color:#2b2b2b;text-decoration:none}.ui-visual-focus{box-shadow:0 0 3px 1px rgb(94,158,214)}.ui-state-active,.ui-widget-content .ui-state-active,.ui-widget-header .ui-state-active,a.ui-button:active,.ui-button:active,.ui-button.ui-state-active:hover{border:1px solid #003eff;background:#007fff;font-weight:normal;color:#fff}.ui-icon-background,.ui-state-active .ui-icon-background{border:#003eff;background-color:#fff}.ui-state-active a,.ui-state-active a:link,.ui-state-active a:visited{color:#fff;text-decoration:none}.ui-state-highlight,.ui-widget-content .ui-state-highlight,.ui-widget-header .ui-state-highlight{border:1px solid #dad55e;background:#fffa90;color:#777620}.ui-state-checked{border:1px solid #dad55e;background:#fffa90}.ui-state-highlight a,.ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a{color:#777620}.ui-state-error,.ui-widget-content .ui-state-error,.ui-widget-header .ui-state-error{border:1px solid #f1a899;background:#fddfdf;color:#5f3f3f}.ui-state-error a,.ui-widget-content .ui-state-error a,.ui-widget-header .ui-state-error a{color:#5f3f3f}.ui-state-error-text,.ui-widget-content .ui-state-error-text,.ui-widget-header .ui-state-error-text{color:#5f3f3f}.ui-priority-primary,.ui-widget-content .ui-priority-primary,.ui-widget-header .ui-priority-primary{font-weight:bold}.ui-priority-secondary,.ui-widget-content .ui-priority-secondary,.ui-widget-header .ui-priority-secondary{opacity:.7;font-weight:normal}.ui-state-disabled,.ui-widget-content .ui-state-disabled,.ui-widget-header .ui-state-disabled{opacity:.35;background-image:none}.ui-icon{width:16px;height:16px}.ui-icon,.ui-widget-content .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-widget-header .ui-icon{background-image:url("images/ui-icons_444444_256x240.png")}.ui-state-hover .ui-icon,.ui-state-focus .ui-icon,.ui-button:hover .ui-icon,.ui-button:focus .ui-icon{background-image:url("images/ui-icons_555555_256x240.png")}.ui-state-active .ui-icon,.ui-button:active .ui-icon{background-image:url("images/ui-icons_ffffff_256x240.png")}.ui-state-highlight .ui-icon,.ui-button .ui-state-highlight.ui-icon{background-image:url("images/ui-icons_777620_256x240.png")}.ui-state-error .ui-icon,.ui-state-error-text .ui-icon{background-image:url("images/ui-icons_cc0000_256x240.png")}.ui-button .ui-icon{background-image:url("images/ui-icons_777777_256x240.png")}.ui-icon-blank.ui-icon-blank.ui-icon-blank{background-image:none}.ui-icon-caret-1-n{background-position:0 0}.ui-icon-caret-1-ne{background-position:-16px 0}.ui-icon-caret-1-e{background-position:-32px 0}.ui-icon-caret-1-se{background-position:-48px 0}.ui-icon-caret-1-s{background-position:-65px 0}.ui-icon-caret-1-sw{background-position:-80px 0}.ui-icon-caret-1-w{background-position:-96px 0}.ui-icon-caret-1-nw{background-position:-112px 0}.ui-icon-caret-2-n-s{background-position:-128px 0}.ui-icon-caret-2-e-w{background-position:-144px 0}.ui-icon-triangle-1-n{background-position:0 -16px}.ui-icon-triangle-1-ne{background-position:-16px -16px}.ui-icon-triangle-1-e{background-position:-32px -16px}.ui-icon-triangle-1-se{background-position:-48px -16px}.ui-icon-triangle-1-s{background-position:-65px -16px}.ui-icon-triangle-1-sw{background-position:-80px -16px}.ui-icon-triangle-1-w{background-position:-96px -16px}.ui-icon-triangle-1-nw{background-position:-112px -16px}.ui-icon-triangle-2-n-s{background-position:-128px -16px}.ui-icon-triangle-2-e-w{background-position:-144px -16px}.ui-icon-arrow-1-n{background-position:0 -32px}.ui-icon-arrow-1-ne{background-position:-16px -32px}.ui-icon-arrow-1-e{background-position:-32px -32px}.ui-icon-arrow-1-se{background-position:-48px -32px}.ui-icon-arrow-1-s{background-position:-65px -32px}.ui-icon-arrow-1-sw{background-position:-80px -32px}.ui-icon-arrow-1-w{background-position:-96px -32px}.ui-icon-arrow-1-nw{background-position:-112px -32px}.ui-icon-arrow-2-n-s{background-position:-128px -32px}.ui-icon-arrow-2-ne-sw{background-position:-144px -32px}.ui-icon-arrow-2-e-w{background-position:-160px -32px}.ui-icon-arrow-2-se-nw{background-position:-176px -32px}.ui-icon-arrowstop-1-n{background-position:-192px -32px}.ui-icon-arrowstop-1-e{background-position:-208px -32px}.ui-icon-arrowstop-1-s{background-position:-224px -32px}.ui-icon-arrowstop-1-w{background-position:-240px -32px}.ui-icon-arrowthick-1-n{background-position:1px -48px}.ui-icon-arrowthick-1-ne{background-position:-16px -48px}.ui-icon-arrowthick-1-e{background-position:-32px -48px}.ui-icon-arrowthick-1-se{background-position:-48px -48px}.ui-icon-arrowthick-1-s{background-position:-64px -48px}.ui-icon-arrowthick-1-sw{background-position:-80px -48px}.ui-icon-arrowthick-1-w{background-position:-96px -48px}.ui-icon-arrowthick-1-nw{background-position:-112px -48px}.ui-icon-arrowthick-2-n-s{background-position:-128px -48px}.ui-icon-arrowthick-2-ne-sw{background-position:-144px -48px}.ui-icon-arrowthick-2-e-w{background-position:-160px -48px}.ui-icon-arrowthick-2-se-nw{background-position:-176px -48px}.ui-icon-arrowthickstop-1-n{background-position:-192px -48px}.ui-icon-arrowthickstop-1-e{background-position:-208px -48px}.ui-icon-arrowthickstop-1-s{background-position:-224px -48px}.ui-icon-arrowthickstop-1-w{background-position:-240px -48px}.ui-icon-arrowreturnthick-1-w{background-position:0 -64px}.ui-icon-arrowreturnthick-1-n{background-position:-16px -64px}.ui-icon-arrowreturnthick-1-e{background-position:-32px -64px}.ui-icon-arrowreturnthick-1-s{background-position:-48px -64px}.ui-icon-arrowreturn-1-w{background-position:-64px -64px}.ui-icon-arrowreturn-1-n{background-position:-80px -64px}.ui-icon-arrowreturn-1-e{background-position:-96px -64px}.ui-icon-arrowreturn-1-s{background-position:-112px -64px}.ui-icon-arrowrefresh-1-w{background-position:-128px -64px}.ui-icon-arrowrefresh-1-n{background-position:-144px -64px}.ui-icon-arrowrefresh-1-e{background-position:-160px -64px}.ui-icon-arrowrefresh-1-s{background-position:-176px -64px}.ui-icon-arrow-4{background-position:0 -80px}.ui-icon-arrow-4-diag{background-position:-16px -80px}.ui-icon-extlink{background-position:-32px -80px}.ui-icon-newwin{background-position:-48px -80px}.ui-icon-refresh{background-position:-64px -80px}.ui-icon-shuffle{background-position:-80px -80px}.ui-icon-transfer-e-w{background-position:-96px -80px}.ui-icon-transferthick-e-w{background-position:-112px -80px}.ui-icon-folder-collapsed{background-position:0 -96px}.ui-icon-folder-open{background-position:-16px -96px}.ui-icon-document{background-position:-32px -96px}.ui-icon-document-b{background-position:-48px -96px}.ui-icon-note{background-position:-64px -96px}.ui-icon-mail-closed{background-position:-80px -96px}.ui-icon-mail-open{background-position:-96px -96px}.ui-icon-suitcase{background-position:-112px -96px}.ui-icon-comment{background-position:-128px -96px}.ui-icon-person{background-position:-144px -96px}.ui-icon-print{background-position:-160px -96px}.ui-icon-trash{background-position:-176px -96px}.ui-icon-locked{background-position:-192px -96px}.ui-icon-unlocked{background-position:-208px -96px}.ui-icon-bookmark{background-position:-224px -96px}.ui-icon-tag{background-position:-240px -96px}.ui-icon-home{background-position:0 -112px}.ui-icon-flag{background-position:-16px -112px}.ui-icon-calendar{background-position:-32px -112px}.ui-icon-cart{background-position:-48px -112px}.ui-icon-pencil{background-position:-64px -112px}.ui-icon-clock{background-position:-80px -112px}.ui-icon-disk{background-position:-96px -112px}.ui-icon-calculator{background-position:-112px -112px}.ui-icon-zoomin{background-position:-128px -112px}.ui-icon-zoomout{background-position:-144px -112px}.ui-icon-search{background-position:-160px -112px}.ui-icon-wrench{background-position:-176px -112px}.ui-icon-gear{background-position:-192px -112px}.ui-icon-heart{background-position:-208px -112px}.ui-icon-star{background-position:-224px -112px}.ui-icon-link{background-position:-240px -112px}.ui-icon-cancel{background-position:0 -128px}.ui-icon-plus{background-position:-16px -128px}.ui-icon-plusthick{background-position:-32px -128px}.ui-icon-minus{background-position:-48px -128px}.ui-icon-minusthick{background-position:-64px -128px}.ui-icon-close{background-position:-80px -128px}.ui-icon-closethick{background-position:-96px -128px}.ui-icon-key{background-position:-112px -128px}.ui-icon-lightbulb{background-position:-128px -128px}.ui-icon-scissors{background-position:-144px -128px}.ui-icon-clipboard{background-position:-160px -128px}.ui-icon-copy{background-position:-176px -128px}.ui-icon-contact{background-position:-192px -128px}.ui-icon-image{background-position:-208px -128px}.ui-icon-video{background-position:-224px -128px}.ui-icon-script{background-position:-240px -128px}.ui-icon-alert{background-position:0 -144px}.ui-icon-info{background-position:-16px -144px}.ui-icon-notice{background-position:-32px -144px}.ui-icon-help{background-position:-48px -144px}.ui-icon-check{background-position:-64px -144px}.ui-icon-bullet{background-position:-80px -144px}.ui-icon-radio-on{background-position:-96px -144px}.ui-icon-radio-off{background-position:-112px -144px}.ui-icon-pin-w{background-position:-128px -144px}.ui-icon-pin-s{background-position:-144px -144px}.ui-icon-play{background-position:0 -160px}.ui-icon-pause{background-position:-16px -160px}.ui-icon-seek-next{background-position:-32px -160px}.ui-icon-seek-prev{background-position:-48px -160px}.ui-icon-seek-end{background-position:-64px -160px}.ui-icon-seek-start{background-position:-80px -160px}.ui-icon-seek-first{background-position:-80px -160px}.ui-icon-stop{background-position:-96px -160px}.ui-icon-eject{background-position:-112px -160px}.ui-icon-volume-off{background-position:-128px -160px}.ui-icon-volume-on{background-position:-144px -160px}.ui-icon-power{background-position:0 -176px}.ui-icon-signal-diag{background-position:-16px -176px}.ui-icon-signal{background-position:-32px -176px}.ui-icon-battery-0{background-position:-48px -176px}.ui-icon-battery-1{background-position:-64px -176px}.ui-icon-battery-2{background-position:-80px -176px}.ui-icon-battery-3{background-position:-96px -176px}.ui-icon-circle-plus{background-position:0 -192px}.ui-icon-circle-minus{background-position:-16px -192px}.ui-icon-circle-close{background-position:-32px -192px}.ui-icon-circle-triangle-e{background-position:-48px -192px}.ui-icon-circle-triangle-s{background-position:-64px -192px}.ui-icon-circle-triangle-w{background-position:-80px -192px}.ui-icon-circle-triangle-n{background-position:-96px -192px}.ui-icon-circle-arrow-e{background-position:-112px -192px}.ui-icon-circle-arrow-s{background-position:-128px -192px}.ui-icon-circle-arrow-w{background-position:-144px -192px}.ui-icon-circle-arrow-n{background-position:-160px -192px}.ui-icon-circle-zoomin{background-position:-176px -192px}.ui-icon-circle-zoomout{background-position:-192px -192px}.ui-icon-circle-check{background-position:-208px -192px}.ui-icon-circlesmall-plus{background-position:0 -208px}.ui-icon-circlesmall-minus{background-position:-16px -208px}.ui-icon-circlesmall-close{background-position:-32px -208px}.ui-icon-squaresmall-plus{background-position:-48px -208px}.ui-icon-squaresmall-minus{background-position:-64px -208px}.ui-icon-squaresmall-close{background-position:-80px -208px}.ui-icon-grip-dotted-vertical{background-position:0 -224px}.ui-icon-grip-dotted-horizontal{background-position:-16px -224px}.ui-icon-grip-solid-vertical{background-position:-32px -224px}.ui-icon-grip-solid-horizontal{background-position:-48px -224px}.ui-icon-gripsmall-diagonal-se{background-position:-64px -224px}.ui-icon-grip-diagonal-se{background-position:-80px -224px}.ui-corner-all,.ui-corner-top,.ui-corner-left,.ui-corner-tl{border-top-left-radius:3px}.ui-corner-all,.ui-corner-top,.ui-corner-right,.ui-corner-tr{border-top-right-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-left,.ui-corner-bl{border-bottom-left-radius:3px}.ui-corner-all,.ui-corner-bottom,.ui-corner-right,.ui-corner-br{border-bottom-right-radius:3px}.ui-widget-overlay{background:#aaa;opacity:.3}.ui-widget-shadow{box-shadow:0 0 5px #666} \ No newline at end of file diff --git a/assets/jquery-ui/jquery-ui.min.js b/assets/jquery-ui/jquery-ui.min.js new file mode 100644 index 00000000..849d7799 --- /dev/null +++ b/assets/jquery-ui/jquery-ui.min.js @@ -0,0 +1,6 @@ +/*! jQuery UI - v1.14.1 - 2024-11-14 +* https://jqueryui.com +* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js +* Copyright OpenJS Foundation and other contributors; Licensed MIT */ + +(t=>{"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(V){V.ui=V.ui||{};V.ui.version="1.14.1";var n,s,x,k,o,a,r,l,h,i,E=0,N=Array.prototype.hasOwnProperty,c=Array.prototype.slice;V.cleanData=(n=V.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=V._data(i,"events"))&&e.remove&&V(i).triggerHandler("remove");n(t)}),V.widget=function(t,i,e){var s,n,o,a,r={},l=t.split(".")[0];return"__proto__"===(t=t.split(".")[1])||"constructor"===t?V.error("Invalid widget name: "+t):(a=l+"-"+t,e||(e=i,i=V.Widget),Array.isArray(e)&&(e=V.extend.apply(null,[{}].concat(e))),V.expr.pseudos[a.toLowerCase()]=function(t){return!!V.data(t,a)},V[l]=V[l]||{},s=V[l][t],n=V[l][t]=function(t,e){if(!this||!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},V.extend(n,s,{version:e.version,_proto:V.extend({},e),_childConstructors:[]}),(o=new i).options=V.widget.extend({},o.options),V.each(e,function(e,s){function n(){return i.prototype[e].apply(this,arguments)}function o(t){return i.prototype[e].apply(this,t)}r[e]="function"!=typeof s?s:function(){var t,e=this._super,i=this._superApply;return this._super=n,this._superApply=o,t=s.apply(this,arguments),this._super=e,this._superApply=i,t}}),n.prototype=V.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},r,{constructor:n,namespace:l,widgetName:t,widgetFullName:a}),s?(V.each(s._childConstructors,function(t,e){var i=e.prototype;V.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),V.widget.bridge(t,n),n)},V.widget.extend=function(t){for(var e,i,s=c.call(arguments,1),n=0,o=s.length;n",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=V(e||this.defaultElement||this)[0],this.element=V(e),this.uuid=E++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=V(),this.hoverable=V(),this.focusable=V(),this.classesElementLookup={},e!==this&&(V.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=V(e.style?e.ownerDocument:e.document||e),this.window=V(this.document[0].defaultView||this.document[0].parentWindow)),this.options=V.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:V.noop,_create:V.noop,_init:V.noop,destroy:function(){var i=this;this._destroy(),V.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:V.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return V.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=V.widget.extend({},this.options[t]),n=0;n{var i=[];n.element.each(function(t,e){V.map(a.classesElementLookup,function(t){return t}).some(function(t){return t.is(e)})||i.push(e)}),a._on(V(i),{remove:"_untrackClassesElement"})})(),V(V.uniqueSort(i.get().concat(n.element.get())))):V(i.not(n.element).get()),a.classesElementLookup[t[s]]=i,o.push(t[s]),e&&n.classes[t[s]]&&o.push(n.classes[t[s]])}return(n=V.extend({element:this.element,classes:this.options.classes||{}},n)).keys&&t(n.keys.match(/\S+/g)||[],!0),n.extra&&t(n.extra.match(/\S+/g)||[]),o.join(" ")},_untrackClassesElement:function(i){var s=this;V.each(s.classesElementLookup,function(t,e){-1!==V.inArray(i.target,e)&&(s.classesElementLookup[t]=V(e.not(i.target).get()))}),this._off(V(i.target))},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){var n="string"==typeof t||null===t,e={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s="boolean"==typeof s?s:i};return e.element.toggleClass(this._classes(e),s),this},_on:function(n,o,t){var a,r=this;"boolean"!=typeof n&&(t=o,o=n,n=!1),t?(o=a=V(o),this.bindings=this.bindings.add(o)):(t=o,o=this.element,a=this.widget()),V.each(t,function(t,e){function i(){if(n||!0!==r.options.disabled&&!V(this).hasClass("ui-state-disabled"))return("string"==typeof e?r[e]:e).apply(r,arguments)}"string"!=typeof e&&(i.guid=e.guid=e.guid||i.guid||V.guid++);var t=t.match(/^([\w:-]*)\s*(.*)$/),s=t[1]+r.eventNamespace,t=t[2];t?a.on(s,t,i):o.on(s,i)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.off(e),this.bindings=V(this.bindings.not(t).get()),this.focusable=V(this.focusable.not(t).get()),this.hoverable=V(this.hoverable.not(t).get())},_delay:function(t,e){var i=this;return setTimeout(function(){return("string"==typeof t?i[t]:t).apply(i,arguments)},e||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){this._addClass(V(t.currentTarget),null,"ui-state-hover")},mouseleave:function(t){this._removeClass(V(t.currentTarget),null,"ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){this._addClass(V(t.currentTarget),null,"ui-state-focus")},focusout:function(t){this._removeClass(V(t.currentTarget),null,"ui-state-focus")}})},_trigger:function(t,e,i){var s,n,o=this.options[t];if(i=i||{},(e=V.Event(e)).type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),e.target=this.element[0],n=e.originalEvent)for(s in n)s in e||(e[s]=n[s]);return this.element.trigger(e,i),!("function"==typeof o&&!1===o.apply(this.element[0],[e].concat(i))||e.isDefaultPrevented())}},V.each({show:"fadeIn",hide:"fadeOut"},function(o,a){V.Widget.prototype["_"+o]=function(e,t,i){var s,n=(t="string"==typeof t?{effect:t}:t)?!0!==t&&"number"!=typeof t&&t.effect||a:o;"number"==typeof(t=t||{})?t={duration:t}:!0===t&&(t={}),s=!V.isEmptyObject(t),t.complete=i,t.delay&&e.delay(t.delay),s&&V.effects&&V.effects.effect[n]?e[o](t):n!==o&&e[n]?e[n](t.duration,t.easing,i):e.queue(function(t){V(this)[o](),i&&i.call(e[0]),t()})}}),V.widget;function C(t,e,i){return[parseFloat(t[0])*(h.test(t[0])?e/100:1),parseFloat(t[1])*(h.test(t[1])?i/100:1)]}function D(t,e){return parseInt(V.css(t,e),10)||0}function I(t){return null!=t&&t===t.window}x=Math.max,k=Math.abs,o=/left|center|right/,a=/top|center|bottom/,r=/[\+\-]\d+(\.[\d]+)?%?/,l=/^\w+/,h=/%$/,i=V.fn.position,V.position={scrollbarWidth:function(){var t,e,i;return void 0!==s?s:(i=(e=V("
        ")).children()[0],V("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i)},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.widthx(k(s),k(n))?o.important="horizontal":o.important="vertical",u.using.call(this,t,o)}),a.offset(V.extend(h,{using:t}))})):i.apply(this,arguments)},V.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,s=s.width,o=t.left-e.collisionPosition.marginLeft,a=n-o,r=o+e.collisionWidth-s-n;s=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),V.ui.plugin={add:function(t,e,i){var s,n=V.ui[t].prototype;for(s in i)n.plugins[s]=n.plugins[s]||[],n.plugins[s].push([e,i[s]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;n").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var e=this.document[0].activeElement;V(t.target).closest(e).length||V(e).trigger("blur")},_mouseStart:function(t){var e=this.options;return this.helper=this._createHelper(t),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),V.ui.ddmanager&&(V.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=0i[2]&&(o=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3])&&(a=i[3]+this.offset.click.top),s.grid&&(e=s.grid[1]?this.originalPageY+Math.round((a-this.originalPageY)/s.grid[1])*s.grid[1]:this.originalPageY,a=!i||e-this.offset.click.top>=i[1]||e-this.offset.click.top>i[3]?e:e-this.offset.click.top>=i[1]?e-s.grid[1]:e+s.grid[1],t=s.grid[0]?this.originalPageX+Math.round((o-this.originalPageX)/s.grid[0])*s.grid[0]:this.originalPageX,o=!i||t-this.offset.click.left>=i[0]||t-this.offset.click.left>i[2]?t:t-this.offset.click.left>=i[0]?t-s.grid[0]:t+s.grid[0]),"y"===s.axis&&(o=this.originalPageX),"x"===s.axis)?this.originalPageY:a)-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:n?0:this.offset.scroll.top),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:n?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(t,e,i){return i=i||this._uiHash(),V.ui.plugin.call(this,t,[e,i,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),i.offset=this.positionAbs),V.Widget.prototype._trigger.call(this,t,e,i)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),V.ui.plugin.add("draggable","connectToSortable",{start:function(e,t,i){var s=V.extend({},t,{item:i.element});i.sortables=[],V(i.options.connectToSortable).each(function(){var t=V(this).sortable("instance");t&&!t.options.disabled&&(i.sortables.push(t),t.refreshPositions(),t._trigger("activate",e,s))})},stop:function(e,t,i){var s=V.extend({},t,{item:i.element});i.cancelHelperRemoval=!1,V.each(i.sortables,function(){var t=this;t.isOver?(t.isOver=0,i.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,s))})},drag:function(i,s,n){V.each(n.sortables,function(){var t=!1,e=this;e.positionAbs=n.positionAbs,e.helperProportions=n.helperProportions,e.offset.click=n.offset.click,e._intersectsWith(e.containerCache)&&(t=!0,V.each(n.sortables,function(){return this.positionAbs=n.positionAbs,this.helperProportions=n.helperProportions,this.offset.click=n.offset.click,t=this!==e&&this._intersectsWith(this.containerCache)&&V.contains(e.element[0],this.element[0])?!1:t})),t?(e.isOver||(e.isOver=1,n._parent=s.helper.parent(),e.currentItem=s.helper.appendTo(e.element).data("ui-sortable-item",!0),e.options._helper=e.options.helper,e.options.helper=function(){return s.helper[0]},i.target=e.currentItem[0],e._mouseCapture(i,!0),e._mouseStart(i,!0,!0),e.offset.click.top=n.offset.click.top,e.offset.click.left=n.offset.click.left,e.offset.parent.left-=n.offset.parent.left-e.offset.parent.left,e.offset.parent.top-=n.offset.parent.top-e.offset.parent.top,n._trigger("toSortable",i),n.dropped=e.element,V.each(n.sortables,function(){this.refreshPositions()}),n.currentItem=n.element,e.fromOutside=n),e.currentItem&&(e._mouseDrag(i),s.position=e.position)):e.isOver&&(e.isOver=0,e.cancelHelperRemoval=!0,e.options._revert=e.options.revert,e.options.revert=!1,e._trigger("out",i,e._uiHash(e)),e._mouseStop(i,!0),e.options.revert=e.options._revert,e.options.helper=e.options._helper,e.placeholder&&e.placeholder.remove(),s.helper.appendTo(n._parent),n._refreshOffsets(i),s.position=n._generatePosition(i,!0),n._trigger("fromSortable",i),n.dropped=!1,V.each(n.sortables,function(){this.refreshPositions()}))})}}),V.ui.plugin.add("draggable","cursor",{start:function(t,e,i){var s=V("body"),i=i.options;s.css("cursor")&&(i._cursor=s.css("cursor")),s.css("cursor",i.cursor)},stop:function(t,e,i){i=i.options;i._cursor&&V("body").css("cursor",i._cursor)}}),V.ui.plugin.add("draggable","opacity",{start:function(t,e,i){e=V(e.helper),i=i.options;e.css("opacity")&&(i._opacity=e.css("opacity")),e.css("opacity",i.opacity)},stop:function(t,e,i){i=i.options;i._opacity&&V(e.helper).css("opacity",i._opacity)}}),V.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,e,i){var s=i.options,n=!1,o=i.scrollParentNotHidden[0],a=i.document[0];o!==a&&"HTML"!==o.tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+o.offsetHeight-t.pageY
        ").css({overflow:"hidden",position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,t={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(t),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this._proportionallyResize()),this._setupHandles(),e.autoHide&&V(this.element).on("mouseenter",function(){e.disabled||(i._removeClass("ui-resizable-autohide"),i._handles.show())}).on("mouseleave",function(){e.disabled||i.resizing||(i._addClass("ui-resizable-autohide"),i._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy(),this._addedHandles.remove();function t(t){V(t).removeData("resizable").removeData("ui-resizable").off(".resizable")}var e;return this.elementIsWrapper&&(t(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),t(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;case"aspectRatio":this._aspectRatio=!!e}},_setupHandles:function(){var t,e,i,s,n,o=this.options,a=this;if(this.handles=o.handles||(V(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=V(),this._addedHandles=V(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),i=this.handles.split(","),this.handles={},e=0;e"),this._addClass(n,"ui-resizable-handle "+s),n.css({zIndex:o.zIndex}),this.handles[t]=".ui-resizable-"+t,this.element.children(this.handles[t]).length||(this.element.append(n),this._addedHandles=this._addedHandles.add(n));this._renderAxis=function(t){var e,i,s;for(e in t=t||this.element,this.handles)this.handles[e].constructor===String?this.handles[e]=this.element.children(this.handles[e]).first().show():(this.handles[e].jquery||this.handles[e].nodeType)&&(this.handles[e]=V(this.handles[e]),this._on(this.handles[e],{mousedown:a._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=V(this.handles[e],this.element),s=/sw|ne|nw|se|n|s/.test(e)?s.outerHeight():s.outerWidth(),i=["padding",/ne|nw|n/.test(e)?"Top":/se|sw|s/.test(e)?"Bottom":/^e$/.test(e)?"Right":"Left"].join(""),t.css(i,s),this._proportionallyResize()),this._handles=this._handles.add(this.handles[e])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){a.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),a.axis=n&&n[1]?n[1]:"se")}),o.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._addedHandles.remove()},_mouseCapture:function(t){var e,i,s=!1;for(e in this.handles)(i=V(this.handles[e])[0])!==t.target&&!V.contains(i,t.target)||(s=!0);return!this.options.disabled&&s},_mouseStart:function(t){var e,i,s,n=this.options,o=this.element;return this.resizing=!0,this._renderProxy(),e=this._num(this.helper.css("left")),i=this._num(this.helper.css("top")),n.containment&&(e+=V(n.containment).scrollLeft()||0,i+=V(n.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:e,top:i},this._helper||(s=this._calculateAdjustedElementDimensions(o)),this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:s.width,height:s.height},this.originalSize=this._helper?{width:o.outerWidth(),height:o.outerHeight()}:{width:s.width,height:s.height},this.sizeDiff={width:o.outerWidth()-o.width(),height:o.outerHeight()-o.height()},this.originalPosition={left:e,top:i},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof n.aspectRatio?n.aspectRatio:this.originalSize.width/this.originalSize.height||1,s=V(".ui-resizable-"+this.axis).css("cursor"),V("body").css("cursor","auto"===s?this.axis+"-resize":s),this._addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var e=this.originalMousePosition,i=this.axis,s=t.pageX-e.left||0,e=t.pageY-e.top||0,i=this._change[i];return this._updatePrevProperties(),i&&(i=i.apply(this,[t,s,e]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),V.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges())),!1},_mouseStop:function(t){this.resizing=!1;var e,i,s,n=this.options,o=this;return this._helper&&(i=(e=(i=this._proportionallyResizeElements).length&&/textarea/i.test(i[0].nodeName))&&this._hasScroll(i[0],"left")?0:o.sizeDiff.height,e=e?0:o.sizeDiff.width,e={width:o.helper.width()-e,height:o.helper.height()-i},i=parseFloat(o.element.css("left"))+(o.position.left-o.originalPosition.left)||null,s=parseFloat(o.element.css("top"))+(o.position.top-o.originalPosition.top)||null,n.animate||this.element.css(V.extend(e,{top:s,left:i})),o.helper.height(o.size.height),o.helper.width(o.size.width),this._helper)&&!n.animate&&this._proportionallyResize(),V("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.helper.css(t),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px",this.helper.width(t.width)),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px",this.helper.height(t.height)),t},_updateVirtualBoundaries:function(t){var e,i,s,n=this.options,n={minWidth:this._isNumber(n.minWidth)?n.minWidth:0,maxWidth:this._isNumber(n.maxWidth)?n.maxWidth:1/0,minHeight:this._isNumber(n.minHeight)?n.minHeight:0,maxHeight:this._isNumber(n.maxHeight)?n.maxHeight:1/0};(this._aspectRatio||t)&&(t=n.minHeight*this.aspectRatio,i=n.minWidth/this.aspectRatio,e=n.maxHeight*this.aspectRatio,s=n.maxWidth/this.aspectRatio,n.minWidtht.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),i=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&i&&(t.top=l-e.minHeight),n&&i&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];e<4;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_calculateAdjustedElementDimensions:function(t){var e,i,s=t.get(0);return"content-box"!==t.css("box-sizing")||!this._hasScroll(s)&&!this._hasScroll(s,"left")?{height:parseFloat(t.css("height")),width:parseFloat(t.css("width"))}:(e=parseFloat(s.style.width),s=parseFloat(s.style.height),i=this._getPaddingPlusBorderDimensions(t),e=isNaN(e)?this._getElementTheoreticalSize(t,i,"width"):e,{height:isNaN(s)?this._getElementTheoreticalSize(t,i,"height"):s,width:e})},_getElementTheoreticalSize:function(t,e,i){return Math.max(0,Math.ceil(t.get(0)["offset"+i[0].toUpperCase()+i.slice(1)]-e[i]-.5))||0},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;e
        ").css({overflow:"hidden"}),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++e.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize;return{left:this.originalPosition.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize;return{top:this.originalPosition.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(t,e,i){return V.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,e,i]))},sw:function(t,e,i){return V.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,e,i]))},ne:function(t,e,i){return V.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,e,i]))},nw:function(t,e,i){return V.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,e,i]))}},_propagate:function(t,e){V.ui.plugin.call(this,t,[e,this.ui()]),"resize"!==t&&this._trigger(t,e,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),V.ui.plugin.add("resizable","animate",{stop:function(e){var i=V(this).resizable("instance"),t=i.options,s=i._proportionallyResizeElements,n=s.length&&/textarea/i.test(s[0].nodeName),o=n&&i._hasScroll(s[0],"left")?0:i.sizeDiff.height,n=n?0:i.sizeDiff.width,n={width:i.size.width-n,height:i.size.height-o},o=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,a=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(V.extend(n,a&&o?{top:a,left:o}:{}),{duration:t.animateDuration,easing:t.animateEasing,step:function(){var t={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};s&&s.length&&V(s[0]).css({width:t.width,height:t.height}),i._updateCache(t),i._propagate("resize",e)}})}}),V.ui.plugin.add("resizable","containment",{start:function(){var i,s,t,e,n=V(this).resizable("instance"),o=n.options,a=n.element,o=o.containment,a=o instanceof V?o.get(0):/parent/.test(o)?a.parent().get(0):o;a&&(n.containerElement=V(a),/document/.test(o)||o===document?(n.containerOffset={left:0,top:0},n.containerPosition={left:0,top:0},n.parentData={element:V(document),left:0,top:0,width:V(document).width(),height:V(document).height()||document.body.parentNode.scrollHeight}):(i=V(a),s=[],V(["Top","Right","Left","Bottom"]).each(function(t,e){s[t]=n._num(i.css("padding"+e))}),n.containerOffset=i.offset(),n.containerPosition=i.position(),n.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},o=n.containerOffset,e=n.containerSize.height,t=n.containerSize.width,t=n._hasScroll(a,"left")?a.scrollWidth:t,e=n._hasScroll(a)?a.scrollHeight:e,n.parentData={element:a,left:o.left,top:o.top,width:t,height:e}))},resize:function(t){var e=V(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.position,t=e._aspectRatio||t.shiftKey,o={top:0,left:0},a=e.containerElement,r=!0;a[0]!==document&&/static/.test(a.css("position"))&&(o=s),n.left<(e._helper?s.left:0)&&(e.size.width=e.size.width+(e._helper?e.position.left-s.left:e.position.left-o.left),t&&(e.size.height=e.size.width/e.aspectRatio,r=!1),e.position.left=i.helper?s.left:0),n.top<(e._helper?s.top:0)&&(e.size.height=e.size.height+(e._helper?e.position.top-s.top:e.position.top),t&&(e.size.width=e.size.height*e.aspectRatio,r=!1),e.position.top=e._helper?s.top:0),a=e.containerElement.get(0)===e.element.parent().get(0),i=/relative|absolute/.test(e.containerElement.css("position")),a&&i?(e.offset.left=e.parentData.left+e.position.left,e.offset.top=e.parentData.top+e.position.top):(e.offset.left=e.element.offset().left,e.offset.top=e.element.offset().top),n=Math.abs(e.sizeDiff.width+(e._helper?e.offset.left-o.left:e.offset.left-s.left)),a=Math.abs(e.sizeDiff.height+(e._helper?e.offset.top-o.top:e.offset.top-s.top)),n+e.size.width>=e.parentData.width&&(e.size.width=e.parentData.width-n,t)&&(e.size.height=e.size.width/e.aspectRatio,r=!1),a+e.size.height>=e.parentData.height&&(e.size.height=e.parentData.height-a,t)&&(e.size.width=e.size.height*e.aspectRatio,r=!1),r||(e.position.left=e.prevPosition.left,e.position.top=e.prevPosition.top,e.size.width=e.prevSize.width,e.size.height=e.prevSize.height)},stop:function(){var t=V(this).resizable("instance"),e=t.options,i=t.containerOffset,s=t.containerPosition,n=t.containerElement,o=V(t.helper),a=o.offset(),r=o.outerWidth()-t.sizeDiff.width,o=o.outerHeight()-t.sizeDiff.height;t._helper&&!e.animate&&/relative/.test(n.css("position"))&&V(this).css({left:a.left-s.left-i.left,width:r,height:o}),t._helper&&!e.animate&&/static/.test(n.css("position"))&&V(this).css({left:a.left-s.left-i.left,width:r,height:o})}}),V.ui.plugin.add("resizable","alsoResize",{start:function(){var i=V(this).resizable("instance"),t=i.options;V(t.alsoResize).each(function(){var t=V(this),e=i._calculateAdjustedElementDimensions(t);t.data("ui-resizable-alsoresize",{width:e.width,height:e.height,left:parseFloat(t.css("left")),top:parseFloat(t.css("top"))})})},resize:function(t,i){var e=V(this).resizable("instance"),s=e.options,n=e.originalSize,o=e.originalPosition,a={height:e.size.height-n.height||0,width:e.size.width-n.width||0,top:e.position.top-o.top||0,left:e.position.left-o.left||0};V(s.alsoResize).each(function(){var t=V(this),s=V(this).data("ui-resizable-alsoresize"),n={},e=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];V.each(e,function(t,e){var i=(s[e]||0)+(a[e]||0);i&&0<=i&&(n[e]=i||null)}),t.css(n)})},stop:function(){V(this).removeData("ui-resizable-alsoresize")}}),V.ui.plugin.add("resizable","ghost",{start:function(){var t=V(this).resizable("instance"),e=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}),t._addClass(t.ghost,"ui-resizable-ghost"),!0===V.uiBackCompat&&"string"==typeof t.options.ghost&&t.ghost.addClass(this.options.ghost),t.ghost.appendTo(t.helper)},resize:function(){var t=V(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=V(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),V.ui.plugin.add("resizable","grid",{resize:function(){var t,e=V(this).resizable("instance"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,a=e.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,l=r[0]||1,h=r[1]||1,c=Math.round((s.width-n.width)/l)*l,s=Math.round((s.height-n.height)/h)*h,u=n.width+c,d=n.height+s,p=i.maxWidth&&i.maxWidthu,m=i.minHeight&&i.minHeight>d;i.grid=r,g&&(u+=l),m&&(d+=h),p&&(u-=l),f&&(d-=h),/^(se|s|e)$/.test(a)?(e.size.width=u,e.size.height=d):/^(ne)$/.test(a)?(e.size.width=u,e.size.height=d,e.position.top=o.top-s):/^(sw)$/.test(a)?(e.size.width=u,e.size.height=d,e.position.left=o.left-c):((d-h<=0||u-l<=0)&&(t=e._getPaddingPlusBorderDimensions(this)),0"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(i){var s=this,t=this.options;this.opos=[i.pageX,i.pageY],this.elementPos=V(this.element[0]).offset(),this.options.disabled||(this.selectees=V(t.filter,this.element[0]),this._trigger("start",i),V(t.appendTo).append(this.helper),this.helper.css({left:i.pageX,top:i.pageY,width:0,height:0}),t.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var t=V.data(this,"selectable-item");t.startselected=!0,i.metaKey||i.ctrlKey||(s._removeClass(t.$element,"ui-selected"),t.selected=!1,s._addClass(t.$element,"ui-unselecting"),t.unselecting=!0,s._trigger("unselecting",i,{unselecting:t.element}))}),V(i.target).parents().addBack().each(function(){var t,e=V.data(this,"selectable-item");if(e)return t=!i.metaKey&&!i.ctrlKey||!e.$element.hasClass("ui-selected"),s._removeClass(e.$element,t?"ui-unselecting":"ui-selected")._addClass(e.$element,t?"ui-selecting":"ui-unselecting"),e.unselecting=!t,e.selecting=t,(e.selected=t)?s._trigger("selecting",i,{selecting:e.element}):s._trigger("unselecting",i,{unselecting:e.element}),!1}))},_mouseDrag:function(s){var t,n,o,a,r,l,h;if(this.dragged=!0,!this.options.disabled)return o=(n=this).options,a=this.opos[0],r=this.opos[1],(l=s.pageX) *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return e<=t&&t*{ cursor: "+o.cursor+" !important; }").appendTo(n)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!i)for(s=this.containers.length-1;0<=s;s--)this.containers[s]._trigger("activate",t,this._uiHash(this));return V.ui.ddmanager&&(V.ui.ddmanager.current=this),V.ui.ddmanager&&!o.dropBehaviour&&V.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this.helper.parent().is(this.appendTo)||(this.helper.detach().appendTo(this.appendTo),this.offset.parent=this._getParentOffset()),this.position=this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,this.lastPositionAbs=this.positionAbs=this._convertPositionTo("absolute"),this._mouseDrag(t),!0},_scroll:function(t){var e=this.options,i=!1;return this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageYt[this.floating?"width":"height"]?h&&c:o",i.document[0]);return i._addClass(t,"ui-sortable-placeholder",s||i.currentItem[0].className)._removeClass(t,"ui-sortable-helper"),"tbody"===n?i._createTrPlaceholder(i.currentItem.find("tr").eq(0),V("",i.document[0]).appendTo(t)):"tr"===n?i._createTrPlaceholder(i.currentItem,t):"img"===n&&t.attr("src",i.currentItem.attr("src")),s||t.css("visibility","hidden"),t},update:function(t,e){s&&!o.forcePlaceholderSize||(e.height()&&(!o.forcePlaceholderSize||"tbody"!==n&&"tr"!==n)||e.height(i.currentItem.innerHeight()-parseInt(i.currentItem.css("paddingTop")||0,10)-parseInt(i.currentItem.css("paddingBottom")||0,10)),e.width())||e.width(i.currentItem.innerWidth()-parseInt(i.currentItem.css("paddingLeft")||0,10)-parseInt(i.currentItem.css("paddingRight")||0,10))}}),i.placeholder=V(o.placeholder.element.call(i.element,i.currentItem)),i.currentItem.after(i.placeholder),o.placeholder.update(i,i.placeholder)},_createTrPlaceholder:function(t,e){var i=this;t.children().each(function(){V(" ",i.document[0]).attr("colspan",V(this).attr("colspan")||1).appendTo(e)})},_contactContainers:function(t){for(var e,i,s,n,o,a,r,l,h,c=null,u=null,d=this.containers.length-1;0<=d;d--)V.contains(this.currentItem[0],this.containers[d].element[0])||(this._intersectsWith(this.containers[d].containerCache)?c&&V.contains(this.containers[d].element[0],c.element[0])||(c=this.containers[d],u=d):this.containers[d].containerCache.over&&(this.containers[d]._trigger("out",t,this._uiHash(this)),this.containers[d].containerCache.over=0));if(c)if(1===this.containers.length)this.containers[u].containerCache.over||(this.containers[u]._trigger("over",t,this._uiHash(this)),this.containers[u].containerCache.over=1);else{for(i=1e4,s=null,n=(l=c.floating||this._isFloating(this.currentItem))?"left":"top",o=l?"width":"height",h=l?"pageX":"pageY",e=this.items.length-1;0<=e;e--)V.contains(this.containers[u].element[0],this.items[e].item[0])&&this.items[e].item[0]!==this.currentItem[0]&&(a=this.items[e].item.offset()[n],r=!1,t[h]-a>this.items[e][o]/2&&(r=!0),Math.abs(t[h]-a)this.containment[2]&&(i=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3])&&(s=this.containment[3]+this.offset.click.top),e.grid)&&(t=this.originalPageY+Math.round((s-this.originalPageY)/e.grid[1])*e.grid[1],s=!this.containment||t-this.offset.click.top>=this.containment[1]&&t-this.offset.click.top<=this.containment[3]?t:t-this.offset.click.top>=this.containment[1]?t-e.grid[1]:t+e.grid[1],t=this.originalPageX+Math.round((i-this.originalPageX)/e.grid[0])*e.grid[0],i=!this.containment||t-this.offset.click.left>=this.containment[0]&&t-this.offset.click.left<=this.containment[2]?t:t-this.offset.click.left>=this.containment[0]?t-e.grid[0]:t+e.grid[0]),{top:s-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop()),left:i-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){this.reverting=!1;var i,s=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(i in this._storedCSS)"auto"!==this._storedCSS[i]&&"static"!==this._storedCSS[i]||(this._storedCSS[i]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();function n(e,i,s){return function(t){s._trigger(e,t,i._uiHash(i))}}for(this.fromOutside&&!e&&s.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||s.push(function(t){this._trigger("update",t,this._uiHash())}),this===this.currentContainer||e||(s.push(function(t){this._trigger("remove",t,this._uiHash())}),s.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),s.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer))),i=this.containers.length-1;0<=i;i--)e||s.push(n("deactivate",this,this.containers[i])),this.containers[i].containerCache.over&&(s.push(n("out",this,this.containers[i])),this.containers[i].containerCache.over=0);if(this._storedStylesheet&&(this._storedStylesheet.remove(),this._storedStylesheet=null),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(i=0;i li > :first-child").add(t.find("> :not(li)").filter(function(t){return t%2==0}))},heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=V(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),t.collapsible||!1!==t.active&&null!=t.active||(t.active=0),this._processPanels(),t.active<0&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():V()}},_createIcons:function(){var t,e=this.options.icons;e&&(t=V(""),this._addClass(t,"ui-accordion-header-icon","ui-icon "+e.header),t.prependTo(this.headers),t=this.active.children(".ui-accordion-header-icon"),this._removeClass(t,e.header)._addClass(t,null,e.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){"active"===t?this._activate(e):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||!1!==this.options.active||this._activate(0),"icons"===t&&(this._destroyIcons(),e)&&this._createIcons())},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var e=V.ui.keyCode,i=this.headers.length,s=this.headers.index(t.target),n=!1;switch(t.keyCode){case e.RIGHT:case e.DOWN:n=this.headers[(s+1)%i];break;case e.LEFT:case e.UP:n=this.headers[(s-1+i)%i];break;case e.SPACE:case e.ENTER:this._eventHandler(t);break;case e.HOME:n=this.headers[0];break;case e.END:n=this.headers[i-1]}n&&(V(t.target).attr("tabIndex",-1),V(n).attr("tabIndex",0),V(n).trigger("focus"),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===V.ui.keyCode.UP&&t.ctrlKey&&V(t.currentTarget).prev().trigger("focus")},refresh:function(){var t=this.options;this._processPanels(),!1===t.active&&!0===t.collapsible||!this.headers.length?(t.active=!1,this.active=V()):!1===t.active?this._activate(0):this.active.length&&!V.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=V()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;"function"==typeof this.options.header?this.headers=this.options.header(this.element):this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var i,t=this.options,e=t.heightStyle,s=this.element.parent();this.active=this._findActive(t.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var t=V(this),e=t.uniqueId().attr("id"),i=t.next(),s=i.uniqueId().attr("id");t.attr("aria-controls",s),i.attr("aria-labelledby",e)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(t.event),"fill"===e?(i=s.height(),this.element.siblings(":visible").each(function(){var t=V(this),e=t.css("position");"absolute"!==e&&"fixed"!==e&&(i-=t.outerHeight(!0))}),this.headers.each(function(){i-=V(this).outerHeight(!0)}),this.headers.next().each(function(){V(this).height(Math.max(0,i-V(this).innerHeight()+V(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.headers.next().each(function(){var t=V(this).is(":visible");t||V(this).show(),i=Math.max(i,V(this).css("height","").height()),t||V(this).hide()}).height(i))},_activate:function(t){t=this._findActive(t)[0];t!==this.active[0]&&(t=t||this.active[0],this._eventHandler({target:t,currentTarget:t,preventDefault:V.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):V()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&V.each(t.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var e=this.options,i=this.active,s=V(t.currentTarget),n=s[0]===i[0],o=n&&e.collapsible,a=o?V():s.next(),r=i.next(),r={oldHeader:i,oldPanel:r,newHeader:o?V():s,newPanel:a};t.preventDefault(),n&&!e.collapsible||!1===this._trigger("beforeActivate",t,r)||(e.active=!o&&this.headers.index(s),this.active=n?V():s,this._toggle(r),this._removeClass(i,"ui-accordion-header-active","ui-state-active"),e.icons&&(a=i.children(".ui-accordion-header-icon"),this._removeClass(a,null,e.icons.activeHeader)._addClass(a,null,e.icons.header)),n)||(this._removeClass(s,"ui-accordion-header-collapsed")._addClass(s,"ui-accordion-header-active","ui-state-active"),e.icons&&(t=s.children(".ui-accordion-header-icon"),this._removeClass(t,null,e.icons.header)._addClass(t,null,e.icons.activeHeader)),this._addClass(s.next(),"ui-accordion-content-active"))},_toggle:function(t){var e=t.newPanel,i=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=e,this.prevHide=i,this.options.animate?this._animate(e,i,t):(i.hide(),e.show(),this._toggleComplete(t)),i.attr({"aria-hidden":"true"}),i.prev().attr({"aria-selected":"false","aria-expanded":"false"}),e.length&&i.length?i.prev().attr({tabIndex:-1,"aria-expanded":"false"}):e.length&&this.headers.filter(function(){return 0===parseInt(V(this).attr("tabIndex"),10)}).attr("tabIndex",-1),e.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,i,e){function s(){o._toggleComplete(e)}var n,o=this,a=0,r=t.css("box-sizing"),l=t.length&&(!i.length||t.index()",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=V(t.target),i=V(this.document[0].activeElement);!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active)&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){V.contains(this.element[0],this.document[0].activeElement)||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=V(t.target).closest(".ui-menu-item"),i=V(t.currentTarget),e[0]!==i[0])||i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=V(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case V.ui.keyCode.PAGE_UP:this.previousPage(t);break;case V.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case V.ui.keyCode.HOME:this._move("first","first",t);break;case V.ui.keyCode.END:this._move("last","last",t);break;case V.ui.keyCode.UP:this.previous(t);break;case V.ui.keyCode.DOWN:this.next(t);break;case V.ui.keyCode.LEFT:this.collapse(t);break;case V.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case V.ui.keyCode.ENTER:case V.ui.keyCode.SPACE:this._activate(t);break;case V.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),t=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=V(this),e=t.prev(),i=V("").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(t,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=V(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),e=(i=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(i,"ui-menu-item")._addClass(e,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!V.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(e=parseFloat(V.css(this.activeMenu[0],"borderTopWidth"))||0,i=parseFloat(V.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-e-i,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&"true"===this.element.prop("contentEditable"),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=V.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)i=!1,this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault();else if(!s){var e=V.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){n?(n=!1,t.preventDefault()):this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=V("        "; - -?> -
        - - - +{% endblock %} From b557b30a97ca5ad93df442267cedaddde557d688 Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Mon, 18 Nov 2024 16:26:54 -0500 Subject: [PATCH 124/173] #47: Add tests for the Schedules controller. --- src/Controller/Schedules.php | 2 +- .../remove_offering_dialog.html.twig | 8 +- templates/schedules/schedules.html.twig | 12 +- tests/Controller/SchedulesTest.php | 179 ++++++++++++++++++ 4 files changed, 190 insertions(+), 11 deletions(-) create mode 100644 tests/Controller/SchedulesTest.php diff --git a/src/Controller/Schedules.php b/src/Controller/Schedules.php index 2c9b95bc..2ca1de88 100755 --- a/src/Controller/Schedules.php +++ b/src/Controller/Schedules.php @@ -220,7 +220,7 @@ public function addAction(Request $request, ?\osid_id_Id $catalogId = null, ?\os // Get our ids from the POST $offeringIds = []; - foreach ($_POST as $key => $val) { + foreach ($request->request->all() as $key => $val) { if (preg_match('/^section_group_[0-9]+$/', $key)) { $offeringIds[] = $this->osidIdMap->fromString($val); } diff --git a/templates/schedules/remove_offering_dialog.html.twig b/templates/schedules/remove_offering_dialog.html.twig index 2567fa5e..79b71e73 100755 --- a/templates/schedules/remove_offering_dialog.html.twig +++ b/templates/schedules/remove_offering_dialog.html.twig @@ -3,7 +3,7 @@ -
        +
        {% if selected_config and selected_config.id %} From a1aeaacc9ac3e63459242fe0d63774f7b0768d6d Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 20 Dec 2024 11:25:25 -0500 Subject: [PATCH 166/173] #47: Can now delete export configurations. --- assets/export.js | 15 +++++---------- src/Controller/AdminExports.php | 18 ++++++++++++------ templates/admin/export_config.html.twig | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/assets/export.js b/assets/export.js index 3678f56d..fddb4183 100644 --- a/assets/export.js +++ b/assets/export.js @@ -258,7 +258,7 @@ function populate() { reset(); }); $("#delete-export-config-button").on("click", function () { - deleteConfig($("#configId").val()); + deleteConfig(); }); $("#show-hide-export-config-groups-button").on("click", function () { showHide(); @@ -602,23 +602,18 @@ function saveJSON() { // ------ CONFIGS ------- // -function deleteConfig(configId) { +function deleteConfig() { if ($("#warning-box").length) return; $("#config-body").append( - "

        Are you sure you want to delete this configuration? This cannot be undone. All related revisions will be gone as well.

        " + "

        Are you sure you want to delete this configuration? This cannot be undone. All related revisions will be gone as well.

        " ); resetEventListeners(); } -function confirmDelete(confId) { +function confirmDelete() { $.ajax({ - url: "../exports/" + configId + "/deleteconfig", + url: $("#config-body").data("delete-url"), type: "POST", - data: { - configId: confId, - }, error: function (error) { console.log(error); }, diff --git a/src/Controller/AdminExports.php b/src/Controller/AdminExports.php index 828b92a7..ceb71bea 100644 --- a/src/Controller/AdminExports.php +++ b/src/Controller/AdminExports.php @@ -182,21 +182,27 @@ public function newconfigAction() * * @since 1/23/18 */ - public function deleteconfigAction() + #[Route('/admin/exports/{exportId}/delete', name: 'admin_exports_delete_config', methods: ['POST'])] + public function deleteconfigAction($exportId) { - $this->_helper->layout()->disableLayout(); - $this->_helper->viewRenderer->setNoRender(true); + $db = $this->entityManager->getConnection(); // Delete revisions that depend on this config. - $db = Zend_Registry::get('db'); $query = 'DELETE FROM archive_configuration_revisions WHERE arch_conf_id = ?'; $stmt = $db->prepare($query); - $stmt->execute([filter_var($this->getRequest()->getPost('configId'), \FILTER_SANITIZE_NUMBER_INT)]); + $stmt->bindValue(1, $exportId); + $stmt->executeQuery(); // Delete this config. $query = 'DELETE FROM archive_configurations WHERE id = ?'; $stmt = $db->prepare($query); - $stmt->execute([$this->getRequest()->getPost('configId')]); + $stmt->bindValue(1, $exportId); + $stmt->executeQuery(); + + $response = new Response('Success'); + $response->headers->set('Content-Type', 'text/plain; charset=utf-8'); + + return $response; } /** diff --git a/templates/admin/export_config.html.twig b/templates/admin/export_config.html.twig index 74bfbcd9..78072586 100644 --- a/templates/admin/export_config.html.twig +++ b/templates/admin/export_config.html.twig @@ -23,7 +23,7 @@

        - or - Create a new configuration

        -
        +
        {% if selected_config and selected_config.id %} From 6a1f008bcfc80cc4728fd883601bb824279cd44c Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 20 Dec 2024 11:47:50 -0500 Subject: [PATCH 167/173] #47: Fix error when re-selecting the prompt. --- templates/admin/export_config.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/admin/export_config.html.twig b/templates/admin/export_config.html.twig index 78072586..b286a010 100644 --- a/templates/admin/export_config.html.twig +++ b/templates/admin/export_config.html.twig @@ -15,7 +15,7 @@
        {% for config in configs %} - + {% endfor %} -

        - or - Create a new configuration

        +

        - or - Create a new configuration

        -
        +
        {% if selected_config and selected_config.id %} @@ -35,7 +35,7 @@ - Revision history + Revision history
        @@ -47,7 +47,7 @@ - Revision history + Revision history {% endif %}
        {% endblock %} diff --git a/templates/admin/export/create_config.html.twig b/templates/admin/export/create_config.html.twig index f5d9905c..c6124612 100644 --- a/templates/admin/export/create_config.html.twig +++ b/templates/admin/export/create_config.html.twig @@ -7,9 +7,9 @@ {% block body %}

        Create New Catalog Export Configuration

        -
        « Back to Archive Export Configuration
        +
        « Back to Archive Export Configuration
        -
        +
        -

        - or - Create a new configuration

        +

        - or - Create a new configuration

        -
        +
        {% if selected_config and selected_config.id %} diff --git a/templates/admin/export/create_config.html.twig b/templates/admin/export/create_config.html.twig index c6124612..bc66342f 100644 --- a/templates/admin/export/create_config.html.twig +++ b/templates/admin/export/create_config.html.twig @@ -9,7 +9,7 @@

        Create New Catalog Export Configuration

        « Back to Archive Export Configuration
        - +
        +
        Error:
        diff --git a/templates/admin/export/create_config.html.twig b/templates/admin/export/create_config.html.twig index bc66342f..ee5d4b91 100644 --- a/templates/admin/export/create_config.html.twig +++ b/templates/admin/export/create_config.html.twig @@ -10,6 +10,7 @@
        « Back to Archive Export Configuration
        +
        From e495c6189efb8c6f10308c79814029797d8109ef Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 20 Dec 2024 14:48:06 -0500 Subject: [PATCH 172/173] #47: Fix deprecation notice for query(). --- src/Controller/AdminAntirequisites.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Controller/AdminAntirequisites.php b/src/Controller/AdminAntirequisites.php index e6d426ba..5c352e8d 100644 --- a/src/Controller/AdminAntirequisites.php +++ b/src/Controller/AdminAntirequisites.php @@ -27,7 +27,7 @@ public function antirequisitesAction(Request $request) $db = $this->entityManager->getConnection(); // Select our already-created antirequisites - $data['antirequisites'] = $db->query('SELECT * FROM antirequisites ORDER BY subj_code, crse_numb, subj_code_eqiv, crse_numb_eqiv')->fetchAllAssociative(); + $data['antirequisites'] = $db->executeQuery('SELECT * FROM antirequisites ORDER BY subj_code, crse_numb, subj_code_eqiv, crse_numb_eqiv')->fetchAllAssociative(); // Supply search results. $data['search_subj_code'] = $request->get('search_subj_code'); From c169d84f4ea969eeb45bb6f7511b3d2c11057d2a Mon Sep 17 00:00:00 2001 From: Adam Franco Date: Fri, 20 Dec 2024 16:53:39 -0500 Subject: [PATCH 173/173] #47: Add unit tests for Export configuration actions. --- application/sql/archive_export.sql | 115 ++++++----- application/sql/drop_archive_export.sql | 4 + src/Controller/AdminExportConfig.php | 4 +- .../admin/export/create_config.html.twig | 2 +- tests/AppDatabaseTestTrait.php | 2 + tests/Controller/AdminExportConfigTest.php | 184 ++++++++++++++++++ 6 files changed, 262 insertions(+), 49 deletions(-) create mode 100644 application/sql/drop_archive_export.sql create mode 100644 tests/Controller/AdminExportConfigTest.php diff --git a/application/sql/archive_export.sql b/application/sql/archive_export.sql index edcd3427..c9ee3da0 100644 --- a/application/sql/archive_export.sql +++ b/application/sql/archive_export.sql @@ -1,14 +1,18 @@ -- phpMyAdmin SQL Dump --- version 4.6.3 +-- version 5.1.1 -- https://www.phpmyadmin.net/ -- --- Host: hammer --- Generation Time: Jan 29, 2018 at 05:45 PM --- Server version: 10.1.30-MariaDB --- PHP Version: 5.6.32 +-- Host: database +-- Generation Time: Dec 20, 2024 at 08:41 PM +-- Server version: 10.11.9-MariaDB +-- PHP Version: 7.4.20 + +SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO"; +START TRANSACTION; +SET time_zone = "+00:00"; -- --- Database: `gselover_catalog` +-- Database: `symfony` -- -- -------------------------------------------------------- @@ -21,74 +25,66 @@ CREATE TABLE `archive_configurations` ( `id` int(11) NOT NULL, `label` varchar(100) DEFAULT NULL, `catalog_id` varchar(100) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; --- --- Indexes for table `archive_configurations` --- -ALTER TABLE `archive_configurations` - ADD PRIMARY KEY (`id`); - --- --- AUTO_INCREMENT for table `archive_configurations` --- -ALTER TABLE `archive_configurations` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; +-- -------------------------------------------------------- -- -- Table structure for table `archive_configuration_revisions` -- CREATE TABLE `archive_configuration_revisions` ( - `id` int(11) NOT NULL auto_increment, + `id` int(11) NOT NULL, `arch_conf_id` int(11) DEFAULT NULL, `note` varchar(100) DEFAULT NULL, - `last_saved` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + `last_saved` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(), `user_id` varchar(100) DEFAULT NULL, `user_disp_name` varchar(100) DEFAULT NULL, - `json_data` mediumtext -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + `json_data` longtext DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; --- --- Indexes for table `archive_configuration_revisions` --- -ALTER TABLE `archive_configuration_revisions` - ADD PRIMARY KEY (`id`), - ADD KEY `arch_conf_id` (`arch_conf_id`); +-- -------------------------------------------------------- -- --- AUTO_INCREMENT for table `archive_configuration_revisions` +-- Table structure for table `archive_export_progress` -- -ALTER TABLE `archive_configuration_revisions` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; --- --- Constraints for table `archive_configuration_revisions` --- -ALTER TABLE `archive_configuration_revisions` - ADD CONSTRAINT `archive_configuration_revisions_ibfk_1` FOREIGN KEY (`arch_conf_id`) REFERENCES `archive_configurations` (`id`); +CREATE TABLE `archive_export_progress` ( + `pid` int(11) NOT NULL, + `progress` varchar(255) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; + +-- -------------------------------------------------------- -- -- Table structure for table `archive_jobs` -- CREATE TABLE `archive_jobs` ( - `id` int(11) NOT NULL auto_increment, + `id` int(11) NOT NULL, `active` tinyint(1) DEFAULT NULL, `export_path` varchar(100) DEFAULT NULL, `config_id` int(11) DEFAULT NULL, `revision_id` int(11) DEFAULT NULL, `terms` varchar(100) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -- --- Table structure for table `archive_export_progress` +-- Indexes for dumped tables -- -CREATE TABLE `archive_export_progress` ( - `pid` int(11) NOT NULL, - `progress` varchar(255) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- +-- Indexes for table `archive_configurations` +-- +ALTER TABLE `archive_configurations` + ADD PRIMARY KEY (`id`); + +-- +-- Indexes for table `archive_configuration_revisions` +-- +ALTER TABLE `archive_configuration_revisions` + ADD PRIMARY KEY (`id`), + ADD KEY `arch_conf_id` (`arch_conf_id`); -- -- Indexes for table `archive_export_progress` @@ -104,15 +100,42 @@ ALTER TABLE `archive_jobs` ADD KEY `config_id` (`config_id`), ADD KEY `revision_id` (`revision_id`); +-- +-- AUTO_INCREMENT for dumped tables +-- + +-- +-- AUTO_INCREMENT for table `archive_configurations` +-- +ALTER TABLE `archive_configurations` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; + +-- +-- AUTO_INCREMENT for table `archive_configuration_revisions` +-- +ALTER TABLE `archive_configuration_revisions` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; + -- -- AUTO_INCREMENT for table `archive_jobs` -- +ALTER TABLE `archive_jobs` + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; + +-- +-- Constraints for dumped tables +-- + +-- +-- Constraints for table `archive_configuration_revisions` +-- ALTER TABLE `archive_configuration_revisions` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=1; + ADD CONSTRAINT `__archive_configuration_revisions_ibfk_1` FOREIGN KEY (`arch_conf_id`) REFERENCES `archive_configurations` (`id`); -- -- Constraints for table `archive_jobs` -- ALTER TABLE `archive_jobs` - ADD CONSTRAINT `archive_jobs_ibfk_1` FOREIGN KEY (`config_id`) REFERENCES `archive_configurations` (`id`), - ADD CONSTRAINT `archive_jobs_ibfk_2` FOREIGN KEY (`revision_id`) REFERENCES `archive_configuration_revisions` (`id`); + ADD CONSTRAINT `__archive_jobs_ibfk_1` FOREIGN KEY (`config_id`) REFERENCES `archive_configurations` (`id`), + ADD CONSTRAINT `__archive_jobs_ibfk_2` FOREIGN KEY (`revision_id`) REFERENCES `archive_configuration_revisions` (`id`); +COMMIT; diff --git a/application/sql/drop_archive_export.sql b/application/sql/drop_archive_export.sql new file mode 100644 index 00000000..a1cb3238 --- /dev/null +++ b/application/sql/drop_archive_export.sql @@ -0,0 +1,4 @@ +DROP TABLE IF EXISTS `archive_export_progress`; +DROP TABLE IF EXISTS `archive_jobs`; +DROP TABLE IF EXISTS `archive_configuration_revisions`; +DROP TABLE IF EXISTS `archive_configurations`; diff --git a/src/Controller/AdminExportConfig.php b/src/Controller/AdminExportConfig.php index ead007e0..ec8aa602 100644 --- a/src/Controller/AdminExportConfig.php +++ b/src/Controller/AdminExportConfig.php @@ -76,7 +76,7 @@ public function createAction(Request $request) $stmt = $db->prepare($query); $stmt->bindValue('label', $label); $stmt->bindValue('catalogId', $catalogId); - $stmt->execute(); + $stmt->executeQuery(); return $this->redirectToRoute('export_config_form', [ 'exportId' => $db->lastInsertId(), @@ -316,7 +316,7 @@ public function listrevisionsAction() $this->_helper->viewRenderer->setNoRender(true); $db = Zend_Registry::get('db'); - $revisions = $db->query('SELECT * FROM archive_configuration_revisions ORDER BY last_saved DESC')->fetchAll(); + $revisions = $db->executeQuery('SELECT * FROM archive_configuration_revisions ORDER BY last_saved DESC')->fetchAll(); echo json_encode($revisions); } diff --git a/templates/admin/export/create_config.html.twig b/templates/admin/export/create_config.html.twig index ee5d4b91..c4a047fb 100644 --- a/templates/admin/export/create_config.html.twig +++ b/templates/admin/export/create_config.html.twig @@ -9,7 +9,7 @@

        Create New Catalog Export Configuration

        « Back to Archive Export Configuration
        - +
        diff --git a/tests/AppDatabaseTestTrait.php b/tests/AppDatabaseTestTrait.php index 70265b9f..f041f83f 100644 --- a/tests/AppDatabaseTestTrait.php +++ b/tests/AppDatabaseTestTrait.php @@ -27,6 +27,7 @@ public static function loadAppDatabase() // Initialize our testing database $db = self::getDB(); \harmoni_SQLUtils::runSQLfile(APPLICATION_PATH.'/sql/user_schedules.sql', $db); + \harmoni_SQLUtils::runSQLfile(APPLICATION_PATH.'/sql/archive_export.sql', $db); } /** @@ -36,5 +37,6 @@ public static function tearDownAppDatabase() { $db = self::getDB(); \harmoni_SQLUtils::runSQLfile(APPLICATION_PATH.'/sql/drop_user_schedules.sql', $db); + \harmoni_SQLUtils::runSQLfile(APPLICATION_PATH.'/sql/drop_archive_export.sql', $db); } } diff --git a/tests/Controller/AdminExportConfigTest.php b/tests/Controller/AdminExportConfigTest.php new file mode 100644 index 00000000..bd5d23dc --- /dev/null +++ b/tests/Controller/AdminExportConfigTest.php @@ -0,0 +1,184 @@ +setSamlAttributes([ + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress' => ['honeybear@middlebury.edu'], + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname' => ['Winnie'], + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname' => ['The-Pooh'], + 'AssignedRoles' => ['App.EmailSendAllowed', 'App.Manager'], + ]); + + return $user; + } + + /** + * Create an export config an return its ID. + * + * @param KernelBrowser $client + * The client for making requests + * + * @return int + * The export ID + */ + private function createExportConfig(KernelBrowser $client): int + { + // Get the form. + $crawler = $client->request('GET', '/admin/exports/create'); + $this->assertResponseIsSuccessful(); + // Submit the form. + $form = $crawler->filter('#config-create-form')->form(); + $form['label'] = 'Fall/Spring Catalog'; + $form['catalog_id'] = 'catalog.MCUG'; + $crawler = $client->submit($form); + $this->assertResponseIsSuccessful(); + + // Get the ID from resulting modification form. + return $crawler->filter('#configId')->attr('value'); + } + + public function testConfigModifyVisibility(): void + { + $client = static::createClient(); + $client->loginUser($this->setUpUser()); + + $crawler = $client->request('GET', '/admin/exports/config'); + $this->assertResponseIsSuccessful(); + } + + public function testConfigModifyVisibilityNonManager(): void + { + $client = static::createClient(); + + $user = new SamlUser('WEBID99999990'); + $user->setSamlAttributes([ + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress' => ['honeybear@middlebury.edu'], + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname' => ['Winnie'], + 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname' => ['The-Pooh'], + 'AssignedRoles' => ['App.EmailSendAllowed'], + ]); + $client->loginUser($user); + + $client->request('GET', '/admin/exports/config'); + $this->assertEquals(403, $client->getResponse()->getStatusCode()); + } + + public function testConfigCreateAndDelete(): void + { + $client = static::createClient(); + $client->followRedirects(); + $client->loginUser($this->setUpUser()); + + // Get the form. + $crawler = $client->request('GET', '/admin/exports/create'); + $this->assertResponseIsSuccessful(); + + // Submit the form. + $form = $crawler->filter('#config-create-form')->form(); + $form['label'] = 'Fall/Spring Catalog'; + $form['catalog_id'] = 'catalog.MCUG'; + $crawler = $client->submit($form); + $this->assertResponseIsSuccessful(); + + // Delete the config we just created. + $deleteUrl = $crawler->filter('#config-body')->attr('data-delete-url'); + $csrfKey = $crawler->filter('#csrf-key-config-modify'); + $crawler = $client->request('POST', $deleteUrl, [ + $csrfKey->attr('name') => $csrfKey->attr('value'), + ]); + $this->assertResponseIsSuccessful(); + } + + public function testConfigModifyAndRevisions(): void + { + $client = static::createClient(); + $client->followRedirects(); + $client->loginUser($this->setUpUser()); + + $exportId = $this->createExportConfig($client); + + // Get the modification form. + $crawler = $client->request('GET', '/admin/exports/config/'.$exportId); + $this->assertResponseIsSuccessful(); + $csrfKey = $crawler->filter('#csrf-key-config-modify'); + $saveUrl = $crawler->filter('#config-body')->attr('data-insert-revision-url'); + + // Save a new revision. + $crawler = $client->request('POST', $saveUrl, [ + $csrfKey->attr('name') => $csrfKey->attr('value'), + 'note' => 'This is the first revision.', + 'jsonData' => '{"group1":{"title":"Geology","section1":{"type":"h1","value":"Geology+and+Earth+Science;Geology"},"section2":{"type":"course_list","value":"topic.subject.GEOL"}}}', + ]); + $this->assertResponseIsSuccessful(); + + // Save another new revision. + $crawler = $client->request('POST', $saveUrl, [ + $csrfKey->attr('name') => $csrfKey->attr('value'), + 'note' => 'This is the second revision.', + 'jsonData' => '{"group1":{"title":"Geology","section1":{"type":"h1","value":"Geology+and+Earth+Science;Geology"},"section2":{"type":"course_list","value":"topic.subject.GEOL"}},"group2":{"title":"Physics","section1":{"type":"h1","value":"Physics"},"section2":{"type":"custom_text","value":"About+Physics..."},"section3":{"type":"course_list","value":"topic.subject.PHYS"}}}', + ]); + $this->assertResponseIsSuccessful(); + + // Load the revision history page. + $crawler = $client->request('GET', '/admin/exports/'.$exportId.'/revisions'); + $this->assertResponseIsSuccessful(); + $revisionIds = []; + // Get the revision ids. + foreach ($crawler->filter('.revId') as $revIdInput) { + $revisionIds[] = $revIdInput->getAttribute('value'); + } + $this->assertGreaterThan(1, count($revisionIds)); + // Get the CSRF key and revert URL. + $csrfKey = $crawler->filter('#csrf-key-config-revert'); + foreach ($crawler->filter('.revert-button') as $revertButton) { + $revisionId = $revertButton->getAttribute('data-rev-id'); + $revertUrl = $revertButton->getAttribute('data-url'); + } + + // Try loading the compare revisions page. + $crawler = $client->request('GET', '/admin/exports/revisiondiff/'.$revisionIds[0].'/'.$revisionIds[1]); + $this->assertResponseIsSuccessful(); + + // Try loading the JSON view page. + $crawler = $client->request('GET', '/admin/exports/revision/'.$revisionIds[0].'/json'); + $this->assertResponseIsSuccessful(); + + // Try reverting to the first revision. + $client->request('POST', $revertUrl, [ + $csrfKey->attr('name') => $csrfKey->attr('value'), + 'revId' => $revisionId, + ]); + $this->assertResponseIsSuccessful(); + + // Try loading the latest JSON file. + $client->request('GET', '/admin/exports/'.$exportId.'/latest.json'); + $this->assertResponseIsSuccessful(); + $jsonString = $client->getResponse()->getContent(); + $result = json_decode($jsonString, \JSON_THROW_ON_ERROR); + $this->assertIsArray($result); + } + + public function testGenerateCourseList(): void + { + $client = static::createClient(); + $client->followRedirects(); + $client->loginUser($this->setUpUser()); + + // Try loading the latest JSON file. + $crawler = $client->request('GET', '/admin/exports/generatecourselist/catalog.MCUG'); + $this->assertResponseIsSuccessful(); + $this->assertSelectorTextContains('.section-dropdown', 'Chemistry'); + } +}
        Compare