diff --git a/composer.json b/composer.json index e7362ce9c..a51b22800 100644 --- a/composer.json +++ b/composer.json @@ -51,7 +51,7 @@ "eher/oauth": "1.0.7", "aws/aws-sdk-php": "3.67.17", "symfony/dotenv": "^5.1", - "ucfopen/materia-theme-ucf": "2.0.0-alpha1" + "ucfopen/materia-theme-ucf": "2.0.0" }, "suggest": { "ext-memcached": "*" @@ -97,9 +97,9 @@ "package": { "name": "ucfopen/materia-theme-ucf", "type": "fuel-package", - "version": "2.0.0-alpha1", + "version": "2.0.0", "dist": { - "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.0-alpha1.zip", + "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.0.zip", "type": "zip" }, "source": { diff --git a/composer.lock b/composer.lock index 35bc84b51..ac4c2792b 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": "b47e114425efd0da185ad829ad4eb404", + "content-hash": "83d952756f30d58a2c780016732c7eeb", "packages": [ { "name": "aws/aws-sdk-php", @@ -84,6 +84,11 @@ "s3", "sdk" ], + "support": { + "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", + "issues": "https://github.com/aws/aws-sdk-php/issues", + "source": "https://github.com/aws/aws-sdk-php/tree/3.67.17" + }, "time": "2018-09-21T20:29:41+00:00" }, { @@ -217,6 +222,10 @@ "zend", "zikula" ], + "support": { + "issues": "https://github.com/composer/installers/issues", + "source": "https://github.com/composer/installers/tree/v1.12.0" + }, "funding": [ { "url": "https://packagist.com", @@ -264,6 +273,10 @@ "BSD-3-Clause" ], "description": "OAuth 1 PHP Library", + "support": { + "issues": "https://github.com/EHER/OAuth/issues", + "source": "https://github.com/EHER/OAuth/tree/1.0.7" + }, "time": "2012-12-13T23:48:10+00:00" }, { @@ -272,17 +285,18 @@ "source": { "type": "git", "url": "https://github.com/fuel/auth.git", - "reference": "4ac41cd52e911405e1ba81a7d604f6332b8e9bf9" + "reference": "d6ad8342a01c0aba376a00fdf9e7ee42ecf04b4a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fuel/auth/zipball/4ac41cd52e911405e1ba81a7d604f6332b8e9bf9", - "reference": "4ac41cd52e911405e1ba81a7d604f6332b8e9bf9", + "url": "https://api.github.com/repos/fuel/auth/zipball/d6ad8342a01c0aba376a00fdf9e7ee42ecf04b4a", + "reference": "d6ad8342a01c0aba376a00fdf9e7ee42ecf04b4a", "shasum": "" }, "require": { "composer/installers": "~1.0" }, + "default-branch": true, "type": "fuel-package", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -296,7 +310,11 @@ ], "description": "FuelPHP 1.x Auth Package", "homepage": "https://github.com/fuel/auth", - "time": "2022-08-22T14:42:04+00:00" + "support": { + "issues": "https://github.com/fuel/auth/issues", + "source": "https://github.com/fuel/auth/tree/1.9/develop" + }, + "time": "2023-08-15T19:28:35+00:00" }, { "name": "fuel/core", @@ -304,12 +322,12 @@ "source": { "type": "git", "url": "https://github.com/fuel/core.git", - "reference": "1f7420ee89e5b84a32c6b83fedbf018addb213a1" + "reference": "0e6444a7b2903aa4df438dbd953be94a22bd3418" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fuel/core/zipball/1f7420ee89e5b84a32c6b83fedbf018addb213a1", - "reference": "1f7420ee89e5b84a32c6b83fedbf018addb213a1", + "url": "https://api.github.com/repos/fuel/core/zipball/0e6444a7b2903aa4df438dbd953be94a22bd3418", + "reference": "0e6444a7b2903aa4df438dbd953be94a22bd3418", "shasum": "" }, "require": { @@ -319,6 +337,7 @@ "paragonie/sodium_compat": "^1.6", "phpseclib/phpseclib": "~2.0" }, + "default-branch": true, "type": "fuel-package", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -332,7 +351,11 @@ ], "description": "FuelPHP 1.x Core", "homepage": "https://github.com/fuel/core", - "time": "2023-02-16T14:11:38+00:00" + "support": { + "issues": "https://github.com/fuel/core/issues", + "source": "https://github.com/fuel/core/tree/1.9/develop" + }, + "time": "2023-09-28T21:45:24+00:00" }, { "name": "fuel/email", @@ -340,17 +363,18 @@ "source": { "type": "git", "url": "https://github.com/fuel/email.git", - "reference": "a31c4b22544b8fd63579b7674f5172cbfc874039" + "reference": "07dd69dcad1998cab6a1be6130f7932c25ad03fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fuel/email/zipball/a31c4b22544b8fd63579b7674f5172cbfc874039", - "reference": "a31c4b22544b8fd63579b7674f5172cbfc874039", + "url": "https://api.github.com/repos/fuel/email/zipball/07dd69dcad1998cab6a1be6130f7932c25ad03fb", + "reference": "07dd69dcad1998cab6a1be6130f7932c25ad03fb", "shasum": "" }, "require": { "composer/installers": "~1.0" }, + "default-branch": true, "type": "fuel-package", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -364,7 +388,11 @@ ], "description": "FuelPHP 1.x Email Package", "homepage": "https://github.com/fuel/email", - "time": "2023-03-10T18:20:53+00:00" + "support": { + "issues": "https://github.com/fuel/email/issues", + "source": "https://github.com/fuel/email/tree/1.9/develop" + }, + "time": "2023-08-22T18:54:43+00:00" }, { "name": "fuel/oil", @@ -372,17 +400,18 @@ "source": { "type": "git", "url": "https://github.com/fuel/oil.git", - "reference": "a9e905ef5fb4824c5591b13a8fb60880b649dbd2" + "reference": "987062cd90b870ac921627f7713b1bfda03dfdab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fuel/oil/zipball/a9e905ef5fb4824c5591b13a8fb60880b649dbd2", - "reference": "a9e905ef5fb4824c5591b13a8fb60880b649dbd2", + "url": "https://api.github.com/repos/fuel/oil/zipball/987062cd90b870ac921627f7713b1bfda03dfdab", + "reference": "987062cd90b870ac921627f7713b1bfda03dfdab", "shasum": "" }, "require": { "composer/installers": "~1.0" }, + "default-branch": true, "type": "fuel-package", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -396,7 +425,11 @@ ], "description": "FuelPHP 1.x Oil Package", "homepage": "https://github.com/fuel/oil", - "time": "2023-02-16T14:14:12+00:00" + "support": { + "issues": "https://github.com/fuel/oil/issues", + "source": "https://github.com/fuel/oil/tree/1.9/develop" + }, + "time": "2023-08-08T15:44:07+00:00" }, { "name": "fuel/orm", @@ -404,17 +437,18 @@ "source": { "type": "git", "url": "https://github.com/fuel/orm.git", - "reference": "8dab1db2da57714d7f4cceab935ff5ff86eef881" + "reference": "d70d7b532b849b4c8e797cb11e3112b083bb9774" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fuel/orm/zipball/8dab1db2da57714d7f4cceab935ff5ff86eef881", - "reference": "8dab1db2da57714d7f4cceab935ff5ff86eef881", + "url": "https://api.github.com/repos/fuel/orm/zipball/d70d7b532b849b4c8e797cb11e3112b083bb9774", + "reference": "d70d7b532b849b4c8e797cb11e3112b083bb9774", "shasum": "" }, "require": { "composer/installers": "~1.0" }, + "default-branch": true, "type": "fuel-package", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -428,7 +462,11 @@ ], "description": "FuelPHP 1.x ORM Package", "homepage": "https://github.com/fuel/orm", - "time": "2022-12-08T19:27:40+00:00" + "support": { + "issues": "https://github.com/fuel/orm/issues", + "source": "https://github.com/fuel/orm/tree/1.9/develop" + }, + "time": "2023-04-16T21:39:15+00:00" }, { "name": "fuel/parser", @@ -447,6 +485,7 @@ "require": { "composer/installers": "~1.0" }, + "default-branch": true, "type": "fuel-package", "notification-url": "https://packagist.org/downloads/", "license": [ @@ -460,6 +499,10 @@ ], "description": "FuelPHP 1.x Parser Package", "homepage": "https://github.com/fuel/parser", + "support": { + "issues": "https://github.com/fuel/parser/issues", + "source": "https://github.com/fuel/parser/tree/1.9/develop" + }, "time": "2023-01-31T00:03:36+00:00" }, { @@ -510,6 +553,10 @@ "file uploads", "upload" ], + "support": { + "issues": "https://github.com/fuelphp/upload/issues", + "source": "https://github.com/fuelphp/upload/tree/2.0.7" + }, "time": "2022-05-10T20:42:04+00:00" }, { @@ -607,6 +654,10 @@ "rest", "web service" ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/6.5.8" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -625,16 +676,16 @@ }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { @@ -644,11 +695,6 @@ "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -687,6 +733,10 @@ "keywords": [ "promise" ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.5.3" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -701,20 +751,20 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", - "version": "1.9.0", + "version": "1.9.1", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318" + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", - "reference": "e98e3e6d4f86621a9b75f623996e6bbdeb4b9318", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/e4490cabc77465aaee90b20cfc9a770f8c04be6b", + "reference": "e4490cabc77465aaee90b20cfc9a770f8c04be6b", "shasum": "" }, "require": { @@ -733,11 +783,6 @@ "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -793,6 +838,10 @@ "uri", "url" ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.9.1" + }, "funding": [ { "url": "https://github.com/GrahamCampbell", @@ -807,7 +856,7 @@ "type": "tidelift" } ], - "time": "2022-06-20T21:43:03+00:00" + "time": "2023-04-17T16:00:37+00:00" }, { "name": "iturgeon/qasset", @@ -854,6 +903,10 @@ "javascript", "qasset" ], + "support": { + "issues": "https://github.com/iturgeon/qAsset/issues", + "source": "https://github.com/iturgeon/qAsset/tree/master" + }, "time": "2017-07-17T03:18:14+00:00" }, { @@ -903,6 +956,10 @@ "keywords": [ "markdown" ], + "support": { + "issues": "https://github.com/michelf/php-markdown/issues", + "source": "https://github.com/michelf/php-markdown/tree/1.9.1" + }, "time": "2021-11-24T02:52:38+00:00" }, { @@ -981,29 +1038,33 @@ "logging", "psr-3" ], + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/1.18.2" + }, "time": "2016-04-02T13:12:58+00:00" }, { "name": "mtdowling/jmespath.php", - "version": "2.6.1", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/jmespath/jmespath.php.git", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb" + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/9b87907a81b87bc76d19a7fb2d61e61486ee9edb", - "reference": "9b87907a81b87bc76d19a7fb2d61e61486ee9edb", + "url": "https://api.github.com/repos/jmespath/jmespath.php/zipball/bbb69a935c2cbb0c03d7f481a238027430f6440b", + "reference": "bbb69a935c2cbb0c03d7f481a238027430f6440b", "shasum": "" }, "require": { - "php": "^5.4 || ^7.0 || ^8.0", + "php": "^7.2.5 || ^8.0", "symfony/polyfill-mbstring": "^1.17" }, "require-dev": { - "composer/xdebug-handler": "^1.4 || ^2.0", - "phpunit/phpunit": "^4.8.36 || ^7.5.15" + "composer/xdebug-handler": "^3.0.3", + "phpunit/phpunit": "^8.5.33" }, "bin": [ "bin/jp.php" @@ -1011,7 +1072,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev" + "dev-master": "2.7-dev" } }, "autoload": { @@ -1027,6 +1088,11 @@ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", @@ -1038,7 +1104,11 @@ "json", "jsonpath" ], - "time": "2021-06-14T00:11:39+00:00" + "support": { + "issues": "https://github.com/jmespath/jmespath.php/issues", + "source": "https://github.com/jmespath/jmespath.php/tree/2.7.0" + }, + "time": "2023-08-25T10:54:48+00:00" }, { "name": "paragonie/random_compat", @@ -1083,20 +1153,25 @@ "pseudorandom", "random" ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, "time": "2020-10-15T08:29:30+00:00" }, { "name": "paragonie/sodium_compat", - "version": "v1.19.0", + "version": "v1.20.0", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933" + "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/cb15e403ecbe6a6cc515f855c310eb6b1872a933", - "reference": "cb15e403ecbe6a6cc515f855c310eb6b1872a933", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/e592a3e06d1fa0d43988c7c7d9948ca836f644b6", + "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6", "shasum": "" }, "require": { @@ -1165,7 +1240,11 @@ "secret-key cryptography", "side-channel resistant" ], - "time": "2022-09-26T03:40:35+00:00" + "support": { + "issues": "https://github.com/paragonie/sodium_compat/issues", + "source": "https://github.com/paragonie/sodium_compat/tree/v1.20.0" + }, + "time": "2023-04-30T00:54:53+00:00" }, { "name": "phpseclib/phpseclib", @@ -1256,6 +1335,10 @@ "x.509", "x509" ], + "support": { + "issues": "https://github.com/phpseclib/phpseclib/issues", + "source": "https://github.com/phpseclib/phpseclib/tree/2.0.31" + }, "funding": [ { "url": "https://github.com/terrafrost", @@ -1274,25 +1357,25 @@ }, { "name": "psr/http-message", - "version": "1.0.1", + "version": "1.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", - "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -1320,7 +1403,10 @@ "request", "response" ], - "time": "2016-08-06T14:39:51+00:00" + "support": { + "source": "https://github.com/php-fig/http-message/tree/1.1" + }, + "time": "2023-04-04T09:50:52+00:00" }, { "name": "psr/log", @@ -1367,6 +1453,9 @@ "psr", "psr-3" ], + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, "time": "2021-05-03T11:20:27+00:00" }, { @@ -1407,20 +1496,24 @@ } ], "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, "time": "2019-03-08T08:55:37+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.1", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e" + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", - "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", + "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", "shasum": "" }, "require": { @@ -1429,7 +1522,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.3-dev" + "dev-main": "3.4-dev" }, "thanks": { "name": "symfony/contracts", @@ -1457,6 +1550,9 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.3.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -1471,20 +1567,20 @@ "type": "tidelift" } ], - "time": "2023-03-01T10:25:55+00:00" + "time": "2023-05-23T14:45:45+00:00" }, { "name": "symfony/dotenv", - "version": "v5.4.21", + "version": "v5.4.22", "source": { "type": "git", "url": "https://github.com/symfony/dotenv.git", - "reference": "c45210b1c43d2d24e263eefe72e8162754dd4c9f" + "reference": "77b7660bfcb85e8f28287d557d7af0046bcd2ca3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dotenv/zipball/c45210b1c43d2d24e263eefe72e8162754dd4c9f", - "reference": "c45210b1c43d2d24e263eefe72e8162754dd4c9f", + "url": "https://api.github.com/repos/symfony/dotenv/zipball/77b7660bfcb85e8f28287d557d7af0046bcd2ca3", + "reference": "77b7660bfcb85e8f28287d557d7af0046bcd2ca3", "shasum": "" }, "require": { @@ -1525,6 +1621,9 @@ "env", "environment" ], + "support": { + "source": "https://github.com/symfony/dotenv/tree/v5.4.22" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -1539,20 +1638,20 @@ "type": "tidelift" } ], - "time": "2023-02-14T08:03:56+00:00" + "time": "2023-03-09T20:36:58+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da" + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", - "reference": "639084e360537a19f9ee352433b84ce831f3d2da", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d", + "reference": "ecaafce9f77234a6a449d29e49267ba10499116d", "shasum": "" }, "require": { @@ -1566,7 +1665,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1609,6 +1708,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -1623,20 +1725,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:30:37+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", - "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", + "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92", "shasum": "" }, "require": { @@ -1648,7 +1750,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1690,6 +1792,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -1704,20 +1809,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -1732,7 +1837,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1770,6 +1875,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -1784,20 +1892,20 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", - "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179", + "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179", "shasum": "" }, "require": { @@ -1806,7 +1914,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1843,6 +1951,9 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0" + }, "funding": [ { "url": "https://symfony.com/sponsor", @@ -1857,11 +1968,11 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "ucfopen/materia-theme-ucf", - "version": "2.0.0-alpha1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/ucfopen/Materia-Theme-UCF.git", @@ -1869,8 +1980,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.0-alpha1.zip", - "reference": "master" + "url": "https://github.com/ucfopen/Materia-Theme-UCF/archive/refs/tags/v2.0.0.zip" }, "type": "fuel-package" } @@ -1926,6 +2036,10 @@ "constructor", "instantiate" ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.5.0" + }, "funding": [ { "url": "https://www.doctrine-project.org/sponsorship.html", @@ -1988,6 +2102,10 @@ "profile", "slow" ], + "support": { + "issues": "https://github.com/johnkary/phpunit-speedtrap/issues", + "source": "https://github.com/johnkary/phpunit-speedtrap/tree/v4.0.1" + }, "time": "2022-10-17T00:56:56+00:00" }, { @@ -2037,6 +2155,10 @@ "object", "object graph" ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + }, "funding": [ { "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", @@ -2047,16 +2169,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.4", + "version": "v4.17.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", + "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d", "shasum": "" }, "require": { @@ -2095,7 +2217,11 @@ "parser", "php" ], - "time": "2023-03-05T19:49:14+00:00" + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1" + }, + "time": "2023-08-13T19:53:39+00:00" }, { "name": "phar-io/manifest", @@ -2151,6 +2277,10 @@ } ], "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.3" + }, "time": "2021-07-20T11:28:43+00:00" }, { @@ -2198,20 +2328,24 @@ } ], "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.26", + "version": "9.2.29", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1" + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", - "reference": "443bc6912c9bd5b409254a40f4b0f4ced7c80ea1", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76", + "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76", "shasum": "" }, "require": { @@ -2265,13 +2399,18 @@ "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.29" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2023-03-06T12:58:08+00:00" + "time": "2023-09-19T04:57:46+00:00" }, { "name": "phpunit/php-file-iterator", @@ -2321,6 +2460,10 @@ "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", @@ -2380,6 +2523,10 @@ "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", @@ -2435,6 +2582,10 @@ "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", @@ -2490,6 +2641,10 @@ "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", @@ -2580,6 +2735,10 @@ "testing", "xunit" ], + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" + }, "funding": [ { "url": "https://phpunit.de/sponsors.html", @@ -2640,6 +2799,10 @@ ], "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.1" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2692,6 +2855,10 @@ ], "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", @@ -2743,6 +2910,10 @@ ], "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", @@ -2813,6 +2984,10 @@ "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", @@ -2866,6 +3041,10 @@ ], "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.2" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -2876,16 +3055,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.4", + "version": "4.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", - "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", "shasum": "" }, "require": { @@ -2928,13 +3107,17 @@ "unidiff", "unified diff" ], + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2020-10-26T13:10:38+00:00" + "time": "2023-05-07T05:35:17+00:00" }, { "name": "sebastian/environment", @@ -2987,6 +3170,10 @@ "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", @@ -3060,6 +3247,10 @@ "export", "exporter" ], + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -3070,16 +3261,16 @@ }, { "name": "sebastian/global-state", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2" + "reference": "bde739e7565280bda77be70044ac1047bc007e34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/0ca8db5a5fc9c8646244e629625ac486fa286bf2", - "reference": "0ca8db5a5fc9c8646244e629625ac486fa286bf2", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", + "reference": "bde739e7565280bda77be70044ac1047bc007e34", "shasum": "" }, "require": { @@ -3120,13 +3311,17 @@ "keywords": [ "global state" ], + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" } ], - "time": "2022-02-14T08:28:10+00:00" + "time": "2023-08-02T09:26:13+00:00" }, { "name": "sebastian/lines-of-code", @@ -3173,6 +3368,10 @@ ], "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.3" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -3226,6 +3425,10 @@ ], "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", @@ -3277,6 +3480,10 @@ ], "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", @@ -3336,6 +3543,10 @@ ], "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", @@ -3387,6 +3598,10 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + }, "funding": [ { "url": "https://github.com/sebastianbergmann", @@ -3439,6 +3654,10 @@ ], "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", @@ -3488,6 +3707,10 @@ ], "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", @@ -3545,6 +3768,11 @@ "phpcs", "standards" ], + "support": { + "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues", + "source": "https://github.com/squizlabs/PHP_CodeSniffer", + "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki" + }, "time": "2020-01-30T22:20:29+00:00" }, { @@ -3585,6 +3813,10 @@ } ], "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.1" + }, "funding": [ { "url": "https://github.com/theseer", @@ -3603,8 +3835,7 @@ }, "dist": { "type": "zip", - "url": "https://github.com/ucfcdl/fuelphp-phpcs/archive/v3.0.1.zip", - "reference": "v3.0.1" + "url": "https://github.com/ucfcdl/fuelphp-phpcs/archive/v3.0.1.zip" }, "type": "library" } @@ -3628,5 +3859,5 @@ "ext-mbstring": "*" }, "platform-dev": [], - "plugin-api-version": "1.1.0" + "plugin-api-version": "2.3.0" } diff --git a/docker/docker-compose.override.test.yml b/docker/docker-compose.override.test.yml index abd42b3f1..2115b1a11 100644 --- a/docker/docker-compose.override.test.yml +++ b/docker/docker-compose.override.test.yml @@ -30,7 +30,7 @@ services: - MYSQL_ROOT_PASSWORD - MYSQL_USER - MYSQL_PASSWORD - - MYSQL_DATABASE=test + - MYSQL_DATABASE # this makes the unit tests much faster but it's a little weird jumping # back and forth between running the server and testing # tmpfs: diff --git a/docker/run_tests.sh b/docker/run_tests.sh index 63b5a5087..3e6660317 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -15,4 +15,4 @@ DCTEST="docker-compose -f docker-compose.yml -f docker-compose.override.test.yml set -e set -o xtrace -$DCTEST run --rm app /wait-for-it.sh mysql:3306 -t 20 -- composer run testci -- "$@" +$DCTEST run -T --rm app /wait-for-it.sh mysql:3306 -t 20 -- composer run testci -- "$@" diff --git a/docker/run_tests_ci.sh b/docker/run_tests_ci.sh index fbc330fb6..f65fa05d9 100755 --- a/docker/run_tests_ci.sh +++ b/docker/run_tests_ci.sh @@ -19,7 +19,7 @@ $DCTEST pull --ignore-pull-failures app fakes3 docker run --rm -v $(pwd)/../:/source alpine:latest chown -R 1000 /source # install php deps -$DCTEST run --rm --no-deps app composer install --no-progress +$DCTEST run -T --rm --no-deps app composer install --no-progress # run linter source run_tests_lint.sh diff --git a/docker/run_tests_coverage.sh b/docker/run_tests_coverage.sh index cc39fe45e..5b3d9c511 100755 --- a/docker/run_tests_coverage.sh +++ b/docker/run_tests_coverage.sh @@ -20,4 +20,4 @@ echo "If you have an issue with a broken widget, clear the widgets with:" echo "$DCTEST run --rm app bash -c -e 'rm /var/www/html/fuel/packages/materia/vendor/widget/test/*'" # store the docker compose command to shorten the following commands -$DCTEST run --rm app /wait-for-it.sh mysql:3306 -t 20 -- composer run coverageci -- "$@" +$DCTEST run -T --rm app /wait-for-it.sh mysql:3306 -t 20 -- composer run coverageci -- "$@" diff --git a/docker/run_tests_lint.sh b/docker/run_tests_lint.sh index 12117fd47..945ec6bb0 100755 --- a/docker/run_tests_lint.sh +++ b/docker/run_tests_lint.sh @@ -10,4 +10,4 @@ DCTEST="docker-compose -f docker-compose.yml -f docker-compose.override.test.yml set -e set -o xtrace -$DCTEST run --rm --no-deps app composer sniff-ci +$DCTEST run -T --rm --no-deps app composer sniff-ci diff --git a/fuel/app/classes/materia/perm/manager.php b/fuel/app/classes/materia/perm/manager.php index cea1f78e2..bf3e703da 100644 --- a/fuel/app/classes/materia/perm/manager.php +++ b/fuel/app/classes/materia/perm/manager.php @@ -34,16 +34,11 @@ static public function create_role($role_name = '') */ static public function is_super_user() { - $login_hash = \Session::get('login_hash'); - $key = 'is_super_user_'.$login_hash; - $has_role = (\Fuel::$is_cli === true && ! \Fuel::$is_test) || \Session::get($key, false); - - if ( ! $has_role) - { - $has_role = self::does_user_have_role([\Materia\Perm_Role::SU]); - \Session::set($key, $has_role); - } - return $has_role; + // @TODO this was previously creating a local session object storing the value returned from this + // The session caching has been removed due to issues related to the cache when the role is added or revoked + // Ideally we can still find a way to cache this and make it more performant!! + return (\Fuel::$is_cli === true && ! \Fuel::$is_test) || self::does_user_have_role([\Materia\Perm_Role::SU]); + } /** @@ -53,16 +48,10 @@ static public function is_super_user() */ static public function is_support_user(): bool { - $login_hash = \Session::get('login_hash'); - $key = 'is_support_user_'.$login_hash; - $has_role = (\Fuel::$is_cli === true && ! \Fuel::$is_test) || \Session::get($key, false); - - if ( ! $has_role) - { - $has_role = self::does_user_have_role([\Materia\Perm_Role::SUPPORT]); - \Session::set($key, $has_role); - } - return $has_role; + // @TODO this was previously creating a local session object storing the value returned from this + // The session caching has been removed due to issues related to the cache when the role is added or revoked + // Ideally we can still find a way to cache this and make it more performant!! + return (\Fuel::$is_cli === true && ! \Fuel::$is_test) || self::does_user_have_role([\Materia\Perm_Role::SUPPORT]); } /** diff --git a/src/components/my-widgets-collaborate-dialog.scss b/src/components/my-widgets-collaborate-dialog.scss index 8074e2969..1b1356d3c 100644 --- a/src/components/my-widgets-collaborate-dialog.scss +++ b/src/components/my-widgets-collaborate-dialog.scss @@ -21,12 +21,13 @@ } .search-container { - margin-bottom: 20px; + position: relative; display: flex; - text-align: left; + align-items: center; justify-content: center; width: 100%; - align-items: center; + margin-bottom: 20px; + text-align: left; .collab-input-label { font-size: 19px; @@ -60,26 +61,30 @@ } .collab-search-list { - width: 447px; - position: absolute; - background-color: #ffffff; - border: #bfbfbf 1px solid; - padding-bottom: 5px; - overflow: auto; z-index: 3; - text-align: left; - left: 114px; + position: absolute; display: flex; flex-wrap: wrap; align-items: flex-start; + top: 32px; + right: 0px; + width: 447px; + padding-bottom: 5px; + overflow: auto; + + background-color: #ffffff; + border: #bfbfbf 1px solid; + + text-align: left; + .collab-search-match { - width: 200px; - height: 56px; + display: flex; + flex-basis: 45%; + align-items: flex-start; margin: 5px 5px 0 5px; padding: 0 5px 5px 0; border-radius: 3px; - display: inline-block; background-color: #ffffff; .collab-match-avatar { @@ -88,17 +93,16 @@ -moz-border-radius: 3px; border-radius: 3px; display: inline-block; - float: left; margin-right: 10px; margin: 5px; } .collab-match-name { + margin: 5px 0 0 5px; font-size: 14px; text-align: left; - height: 40px; + font-family: 'Lucida Grande', sans-serif; - overflow: auto; } } @@ -108,7 +112,7 @@ .collab-match-student:after { content: 'Student'; position: absolute; - bottom: 5px; + bottom: -15px; left: 0; font-size: 10px; } diff --git a/src/components/my-widgets-scores.jsx b/src/components/my-widgets-scores.jsx index a68c5215d..c13e6429b 100644 --- a/src/components/my-widgets-scores.jsx +++ b/src/components/my-widgets-scores.jsx @@ -41,7 +41,7 @@ const MyWidgetsScores = ({inst, beardMode}) => { }, [currScores, state.isShowingAll]) const openExport = () => { - setState({...state, showExport: true}) + if (!inst.is_draft) setState({...state, showExport: true}) } const closeExport = () => { setState({...state, showExport: false}) @@ -62,7 +62,7 @@ const MyWidgetsScores = ({inst, beardMode}) => { let contentRender = if (isFetched) { - contentRender = + contentRender = if (state.hasScores || containsStorage()) { const semesterElements = displayedSemesters.map(semester => ( {

Student Activity

Export Options diff --git a/src/components/my-widgets-settings-dialog.jsx b/src/components/my-widgets-settings-dialog.jsx index a82f7987c..db5fe6733 100644 --- a/src/components/my-widgets-settings-dialog.jsx +++ b/src/components/my-widgets-settings-dialog.jsx @@ -489,11 +489,13 @@ const MyWidgetsSettingsDialog = ({ onClose, inst, currentUser, otherUserPerms, o { periodSelectElements }

  • Access

    -
      +
        + {currentUser.is_student && !inst.is_student_made ?
      • Access settings are currently disabled because of your student status.
        • : ''}
      • accessChange('normal')} /> @@ -507,6 +509,7 @@ const MyWidgetsSettingsDialog = ({ onClose, inst, currentUser, otherUserPerms, o accessChange('guest')} /> diff --git a/src/components/my-widgets-settings-dialog.scss b/src/components/my-widgets-settings-dialog.scss index 542bdfe49..419709eef 100644 --- a/src/components/my-widgets-settings-dialog.scss +++ b/src/components/my-widgets-settings-dialog.scss @@ -276,6 +276,19 @@ } } + &.limited-because-student { + + li.normal.show, li.guest-mode { + filter: blur(3px); + user-select: none; + pointer-events: none; + } + + li.studentWarningListItem { + margin: 0 0 15px 0; + } + } + .input-desc { padding: 10px; margin-bottom: 0; diff --git a/src/components/my-widgets-warning-dialog.jsx b/src/components/my-widgets-warning-dialog.jsx index eaae220ea..2e5a470f9 100644 --- a/src/components/my-widgets-warning-dialog.jsx +++ b/src/components/my-widgets-warning-dialog.jsx @@ -6,7 +6,7 @@ const MyWidgetsWarningDialog = ({onClose, onEdit}) => (
        - Warning About Editing Published Widgets: + Before Editing Published Widgets:

        diff --git a/src/components/my-widgets-warning-dialog.scss b/src/components/my-widgets-warning-dialog.scss index 4848783c8..5e993e3ce 100644 --- a/src/components/my-widgets-warning-dialog.scss +++ b/src/components/my-widgets-warning-dialog.scss @@ -5,9 +5,11 @@ height: 320px; .title { + width: 450px; + margin: 4px auto; + font-weight: bold; font-size: 24px; - margin: 4px; } .content { diff --git a/src/components/no-score-content.jsx b/src/components/no-score-content.jsx index 387db2529..8092e9c4f 100644 --- a/src/components/no-score-content.jsx +++ b/src/components/no-score-content.jsx @@ -1,7 +1,7 @@ import React from 'react' import './no-content-icon.scss' -const NoScoreContent = ({scorable, beardMode}) => { +const NoScoreContent = ({scorable, isDraft, beardMode}) => { const notScorableRender =

        @@ -11,8 +11,8 @@ const NoScoreContent = ({scorable, beardMode}) => { const noScoreContentRender =
        -

        Your widget hasn't recorded any scores yet!

        -

        Once students play it, score information will be displayed here.

        + { isDraft ?

        Draft widgets cannot collect scores.

        :

        Your widget hasn't recorded any scores yet!

        } + { isDraft ?

        Publish your widget to enable score collection.

        :

        Once students play it, score information will be displayed here.

        }
        return scorable == 1 ? noScoreContentRender : notScorableRender diff --git a/src/components/score-page.jsx b/src/components/score-page.jsx index 87cff992a..65a0d5bea 100644 --- a/src/components/score-page.jsx +++ b/src/components/score-page.jsx @@ -17,13 +17,16 @@ const ScorePage = () => { // this is only actually set to something when coming from the profile page const play_id = window.location.hash.split('play-')[1] + const pathIsPreview = window.location.pathname.includes('/preview/') + const pathIsEmbedded = window.location.pathname.includes('/embed/') + const [state, setState] = useState({ instanceID: undefined, playID: undefined, singleID: undefined, sendToken: undefined, - isEmbedded: null, - isPreview: null + isEmbedded: pathIsEmbedded, + isPreview: pathIsPreview }) // Waits for window values to load from server then sets them @@ -31,16 +34,14 @@ const ScorePage = () => { waitForWindow() .then(() => { if (window.IS_EMBEDDED) document.body.classList.add('embedded') - const isPreview = window.location.pathname.includes('/preview/') - const isEmbedded = window.location.pathname.includes('/embed/') setState({ instanceID: (inst_id ? inst_id : null), playID: play_id ? play_id : null, singleID: single_id ? single_id : null, sendToken: typeof window.LAUNCH_TOKEN !== 'undefined' && window.LAUNCH_TOKEN !== null ? window.LAUNCH_TOKEN : play_id, - isEmbedded: window.IS_EMBEDDED === 'true' || window.IS_EMBEDDED === true || isEmbedded ? true : false, - isPreview: window.IS_PREVIEW === 'true' || window.IS_PREVIEW === true || isPreview ? true : false, + isEmbedded: window.IS_EMBEDDED == 'true' || window.IS_EMBEDDED == true || pathIsEmbedded ? true : false, + isPreview: window.IS_PREVIEW == 'true' || window.IS_PREVIEW == true || pathIsPreview ? true : false, }) }) }, [])