From 526a40cfb42690d17f7796a159e7a3ddb5dfddbf Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 25 May 2020 06:28:49 +0000 Subject: [PATCH 1/2] Bump monolog/monolog from 1.25.3 to 1.25.4 Bumps [monolog/monolog](https://github.com/Seldaek/monolog) from 1.25.3 to 1.25.4. - [Release notes](https://github.com/Seldaek/monolog/releases) - [Changelog](https://github.com/Seldaek/monolog/blob/master/CHANGELOG.md) - [Commits](https://github.com/Seldaek/monolog/compare/1.25.3...1.25.4) Signed-off-by: dependabot-preview[bot] --- composer.lock | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/composer.lock b/composer.lock index d1e3cdc..a769db4 100644 --- a/composer.lock +++ b/composer.lock @@ -647,16 +647,16 @@ }, { "name": "monolog/monolog", - "version": "1.25.3", + "version": "1.25.4", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1" + "reference": "3022efff205e2448b560c833c6fbbf91c3139168" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fa82921994db851a8becaf3787a9e73c5976b6f1", - "reference": "fa82921994db851a8becaf3787a9e73c5976b6f1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/3022efff205e2448b560c833c6fbbf91c3139168", + "reference": "3022efff205e2448b560c833c6fbbf91c3139168", "shasum": "" }, "require": { @@ -670,11 +670,10 @@ "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", "php-amqplib/php-amqplib": "~2.4", "php-console/php-console": "^3.1.3", + "php-parallel-lint/php-parallel-lint": "^1.0", "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", "ruflin/elastica": ">=0.90 <3.0", "sentry/sentry": "^0.13", "swiftmailer/swiftmailer": "^5.3|^6.0" @@ -721,7 +720,7 @@ "logging", "psr-3" ], - "time": "2019-12-20T14:15:16+00:00" + "time": "2020-05-22T07:31:27+00:00" }, { "name": "nikic/fast-route", @@ -1440,12 +1439,12 @@ "source": { "type": "git", "url": "https://github.com/propelorm/Propel2.git", - "reference": "297473a6ddf0dcbbd6f88cb852c2c549814f908e" + "reference": "5eb354ef50b65f1f9c58c2f9f1c2523a4378edd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/propelorm/Propel2/zipball/297473a6ddf0dcbbd6f88cb852c2c549814f908e", - "reference": "297473a6ddf0dcbbd6f88cb852c2c549814f908e", + "url": "https://api.github.com/repos/propelorm/Propel2/zipball/5eb354ef50b65f1f9c58c2f9f1c2523a4378edd7", + "reference": "5eb354ef50b65f1f9c58c2f9f1c2523a4378edd7", "shasum": "" }, "require": { @@ -1496,7 +1495,7 @@ "orm", "persistence" ], - "time": "2019-11-08T13:12:55+00:00" + "time": "2020-05-11T07:36:16+00:00" }, { "name": "psr/container", @@ -1700,16 +1699,16 @@ }, { "name": "psr/log", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801" + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/446d54b4cb6bf489fc9d75f55843658e6f25d801", - "reference": "446d54b4cb6bf489fc9d75f55843658e6f25d801", + "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc", + "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc", "shasum": "" }, "require": { @@ -1743,7 +1742,7 @@ "psr", "psr-3" ], - "time": "2019-11-01T11:05:21+00:00" + "time": "2020-03-23T09:12:05+00:00" }, { "name": "ralouphie/getallheaders", From ebf37be9bbae303db3bea17c08fcd576cb968e05 Mon Sep 17 00:00:00 2001 From: Christopher Wilkinson Date: Mon, 25 May 2020 06:29:11 +0000 Subject: [PATCH 2/2] Apply fixes from StyleCI --- generated-classes/TechWilk/Rota/User.php | 4 +- generated-conf/config.php | 44 +++++----- .../PropelMigration_1494860053.php | 8 +- public/api/v1/index.php | 86 +++++++++---------- public/old/createEvent.php | 30 +++---- public/old/editRole.php | 4 +- public/old/editeventtype.php | 16 ++-- public/old/emailEvent.php | 8 +- public/old/emailGroup.php | 8 +- public/old/includes/footer.php | 8 +- public/old/includes/functions.database.php | 8 +- public/old/includes/functions.discussion.php | 4 +- public/old/includes/functions.facebook.php | 8 +- public/old/includes/functions.mail.php | 22 ++--- .../old/includes/functions.notifications.php | 22 ++--- public/old/includes/header.php | 23 +++-- public/old/license.php | 2 +- public/old/linkSocialAuth.php | 14 +-- public/old/overview.php | 6 +- public/old/pendingAccounts.php | 12 +-- .../samples/old/assets/posteddata.php | 6 +- public/old/recordingUpload.php | 17 ++-- public/old/series.php | 4 +- public/old/settings.php | 28 +++--- public/old/swap.php | 34 ++++---- public/old/swaps.php | 16 ++-- .../samples/old/assets/posteddata.php | 6 +- src/classes/Controller/InstallController.php | 5 +- tests/Integration/BaseTestCase.php | 26 +++--- tests/Unit/BaseTestCase.php | 26 +++--- tests/Unit/CryptTest.php | 40 ++++----- tests/Unit/EmailAddressTest.php | 14 +-- 32 files changed, 282 insertions(+), 277 deletions(-) diff --git a/generated-classes/TechWilk/Rota/User.php b/generated-classes/TechWilk/Rota/User.php index 8ec997a..b797483 100644 --- a/generated-classes/TechWilk/Rota/User.php +++ b/generated-classes/TechWilk/Rota/User.php @@ -70,8 +70,8 @@ public function setPassword($v) if (!password_verify($v, $this->password)) { $bcrypt_options = [ - 'cost' => 12, - ]; + 'cost' => 12, + ]; $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options); $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true; diff --git a/generated-conf/config.php b/generated-conf/config.php index 1195e3a..dd115f7 100644 --- a/generated-conf/config.php +++ b/generated-conf/config.php @@ -7,18 +7,18 @@ $serviceContainer->setAdapterClass('default', 'mysql'); $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle(); $manager->setConfiguration([ - 'classname' => 'Propel\\Runtime\\Connection\\ConnectionWrapper', - 'dsn' => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'], - 'user' => $config['db']['user'], - 'password' => $config['db']['pass'], - 'attributes' => [ - 'ATTR_EMULATE_PREPARES' => false, - 'ATTR_TIMEOUT' => 30, - ], - 'model_paths' => [ - 0 => 'src', - 1 => 'vendor', - ], + 'classname' => 'Propel\\Runtime\\Connection\\ConnectionWrapper', + 'dsn' => 'mysql:host='.$config['db']['host'].';dbname='.$config['db']['dbname'], + 'user' => $config['db']['user'], + 'password' => $config['db']['pass'], + 'attributes' => [ + 'ATTR_EMULATE_PREPARES' => false, + 'ATTR_TIMEOUT' => 30, + ], + 'model_paths' => [ + 0 => 'src', + 1 => 'vendor', + ], ]); $manager->setName('default'); $serviceContainer->setConnectionManager('default', $manager); @@ -26,16 +26,16 @@ $serviceContainer->setAdapterClass('test', 'sqlite'); $manager = new \Propel\Runtime\Connection\ConnectionManagerSingle(); $manager->setConfiguration([ - 'classname' => 'Propel\\Runtime\\Connection\\ConnectionWrapper', - 'dsn' => 'sqlite:/var/tmp/test.db', - 'attributes' => [ - 'ATTR_EMULATE_PREPARES' => false, - 'ATTR_TIMEOUT' => 30, - ], - 'model_paths' => [ - 0 => 'src', - 1 => 'vendor', - ], + 'classname' => 'Propel\\Runtime\\Connection\\ConnectionWrapper', + 'dsn' => 'sqlite:/var/tmp/test.db', + 'attributes' => [ + 'ATTR_EMULATE_PREPARES' => false, + 'ATTR_TIMEOUT' => 30, + ], + 'model_paths' => [ + 0 => 'src', + 1 => 'vendor', + ], ]); $manager->setName('test'); $serviceContainer->setConnectionManager('test', $manager); diff --git a/generated-migrations/PropelMigration_1494860053.php b/generated-migrations/PropelMigration_1494860053.php index 468dd15..9bfeb5c 100644 --- a/generated-migrations/PropelMigration_1494860053.php +++ b/generated-migrations/PropelMigration_1494860053.php @@ -40,7 +40,7 @@ public function postDown(MigrationManager $manager) public function getUpSQL() { return [ - 'default' => ' + 'default' => ' # This is a fix for InnoDB in MySQL >= 4.1.x # It "suspends judgement" for fkey relationships until are tables are set. SET FOREIGN_KEY_CHECKS = 0; @@ -160,7 +160,7 @@ public function getUpSQL() # This restores the fkey checks, after having unset them earlier SET FOREIGN_KEY_CHECKS = 1; ', -]; + ]; } /** @@ -172,7 +172,7 @@ public function getUpSQL() public function getDownSQL() { return [ - 'default' => ' + 'default' => ' # This is a fix for InnoDB in MySQL >= 4.1.x # It "suspends judgement" for fkey relationships until are tables are set. SET FOREIGN_KEY_CHECKS = 0; @@ -270,6 +270,6 @@ public function getDownSQL() # This restores the fkey checks, after having unset them earlier SET FOREIGN_KEY_CHECKS = 1; ', -]; + ]; } } diff --git a/public/api/v1/index.php b/public/api/v1/index.php index 5fe8861..72fdeee 100644 --- a/public/api/v1/index.php +++ b/public/api/v1/index.php @@ -17,68 +17,66 @@ function isAdmin() } } -if (isAdmin()): +if (isAdmin()) { // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Start of API -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Start of API + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -require_once __DIR__.'/../../../vendor/autoload.php'; + require_once __DIR__.'/../../../vendor/autoload.php'; -require_once __DIR__.'/../../../generated-conf/config.php'; + require_once __DIR__.'/../../../generated-conf/config.php'; -// Create and configure Slim app -$app = new \Slim\App(['settings' => $config]); + // Create and configure Slim app + $app = new \Slim\App(['settings' => $config]); -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Containers for DI -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Containers for DI + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -$container = $app->getContainer(); + $container = $app->getContainer(); -$container['db'] = function ($c) { - $db_config = $c['settings']['db']; - $db = new Database($db_config); + $container['db'] = function ($c) { + $db_config = $c['settings']['db']; + $db = new Database($db_config); - return $db; -}; + return $db; + }; -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// Define app routes -// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + // Define app routes + // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -// ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~ + // ~~~~~~~~~~~~~~~ Series ~~~~~~~~~~~~~~~ -$app->post('/series', function ($request, $response, $args) { - $postData = $request->getParsedBody(); + $app->post('/series', function ($request, $response, $args) { + $postData = $request->getParsedBody(); - $name = filter_var($postData['name'], FILTER_SANITIZE_STRING); - $description = filter_var($postData['description'], FILTER_SANITIZE_STRING); + $name = filter_var($postData['name'], FILTER_SANITIZE_STRING); + $description = filter_var($postData['description'], FILTER_SANITIZE_STRING); - $series = new EventGroup(); - $series->setName($name); - $series->setDescription($description); - $series->save(); + $series = new EventGroup(); + $series->setName($name); + $series->setDescription($description); + $series->save(); - $data = [ - 'data' => [ - 'id' => $series->getId(), - 'name' => $series->getName(), - 'description' => $series->getDescription(), - ], - ]; + $data = [ + 'data' => [ + 'id' => $series->getId(), + 'name' => $series->getName(), + 'description' => $series->getDescription(), + ], + ]; - return $response->withJson($data); -}); + return $response->withJson($data); + }); -// Run app -$app->run(); + // Run app + $app->run(); // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // End of very very very basic auth // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -else: -http_response_code(401); - -endif; +} else { + http_response_code(401); +} diff --git a/public/old/createEvent.php b/public/old/createEvent.php index 0ed4b2d..a833be0 100755 --- a/public/old/createEvent.php +++ b/public/old/createEvent.php @@ -543,38 +543,38 @@ } $groups = GroupQuery::create()->joinWith('Group.Role')->joinWith('Role.UserRole')->find(); - foreach ($groups as $group): ?> + foreach ($groups as $group) { ?> getName() ?> - getRoles() as $role): ?> + getRoles() as $role) { ?>
- + - + - +
- +
diff --git a/public/old/editeventtype.php b/public/old/editeventtype.php index c86f3b9..8fad016 100755 --- a/public/old/editeventtype.php +++ b/public/old/editeventtype.php @@ -74,7 +74,7 @@ // ~~~~~~~~~~ PRESENTATION ~~~~~~~~~~ include 'includes/header.php'; -?> +?>
@@ -95,7 +95,7 @@
- +

getName() ?>

@@ -117,7 +117,7 @@
- +
@@ -153,9 +153,9 @@
@@ -170,10 +170,10 @@
+ ?> - + } ?> + diff --git a/public/old/emailEvent.php b/public/old/emailEvent.php index e24cce9..52c25c4 100644 --- a/public/old/emailEvent.php +++ b/public/old/emailEvent.php @@ -121,13 +121,13 @@

Send to everyone involved in the event who is in the groups

- 0): ?> - + 0) { ?> +
- - + +
diff --git a/public/old/emailGroup.php b/public/old/emailGroup.php index 58eee33..bb5199d 100644 --- a/public/old/emailGroup.php +++ b/public/old/emailGroup.php @@ -110,13 +110,13 @@

Send to

- 0): ?> - + 0) { ?> +
- - + +
diff --git a/public/old/includes/footer.php b/public/old/includes/footer.php index 621c8d9..9fa5ab2 100755 --- a/public/old/includes/footer.php +++ b/public/old/includes/footer.php @@ -21,7 +21,7 @@ along with Church Rota. If not, see . */ -?> +?>
@@ -118,9 +118,11 @@ - + - + seen == false) { $unseen += 1; } - } - ?> + } ?>
  • @@ -303,21 +302,21 @@
  • View all (comming soon...)
    • @@ -357,7 +356,7 @@ */ - if (isset($_SESSION['userid'])): ?> + if (isset($_SESSION['userid'])) { ?>
    • - +
  • @@ -486,11 +485,11 @@
  • > View All
    • - +
  • > Add Event
    • - + > Settings - +
  • >Login
    • - + diff --git a/public/old/license.php b/public/old/license.php index b024522..389e310 100755 --- a/public/old/license.php +++ b/public/old/license.php @@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License along with Church Rota. If not, see . */ -include 'includes/header.php'; ?> +include 'includes/header.php'; ?>

    License

                        GNU GENERAL PUBLIC LICENSE
    diff --git a/public/old/linkSocialAuth.php b/public/old/linkSocialAuth.php index c97c2dc..ac5face 100644 --- a/public/old/linkSocialAuth.php +++ b/public/old/linkSocialAuth.php @@ -88,37 +88,37 @@
    - +

    Social login has not been enabled.

    Speak with your site administrator if you think this feature should be enabled.

    - + - +

    - +
    - +
    - +
    - +

    - +
    @@ -116,9 +116,9 @@ '.$sentSuccess.'
    '; - endif; + } ?> diff --git a/public/old/pendingAccounts.php b/public/old/pendingAccounts.php index c5f4524..e866c0f 100644 --- a/public/old/pendingAccounts.php +++ b/public/old/pendingAccounts.php @@ -102,7 +102,7 @@

    Source: source ?>

    - +
    @@ -115,10 +115,10 @@
    - + - +

    Merge with existing user

    @@ -132,9 +132,9 @@
    @@ -143,6 +143,6 @@ - + diff --git a/public/old/plugins/ckeditor/samples/old/assets/posteddata.php b/public/old/plugins/ckeditor/samples/old/assets/posteddata.php index 2d7e01f..dfb57de 100755 --- a/public/old/plugins/ckeditor/samples/old/assets/posteddata.php +++ b/public/old/plugins/ckeditor/samples/old/assets/posteddata.php @@ -4,7 +4,7 @@ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -?> +?> @@ -35,7 +35,7 @@ $value = htmlspecialchars(stripslashes((string) $value)); } else { $value = htmlspecialchars((string) $value); - } ?> + } ?>
    @@ -43,7 +43,7 @@ +?> - +

    Error

    - +

    Add Series:

    diff --git a/public/old/settings.php b/public/old/settings.php index feaf241..ce0fbcf 100755 --- a/public/old/settings.php +++ b/public/old/settings.php @@ -342,21 +342,21 @@
    diff --git a/public/old/swap.php b/public/old/swap.php index dfd5338..18923b4 100644 --- a/public/old/swap.php +++ b/public/old/swap.php @@ -165,15 +165,15 @@
    + if (isset($message)) { ?>

    - +

    Error:

    - + getId()); $canDeclineSwap = canDeclineSwap($swap->getId()); @@ -198,21 +198,21 @@

    This swap is awaiting approval

    ' : '' ?>
    - +
    - + Accept - - + + Decline - +
    - + - 0): ?> + 0) { ?> - +
    @@ -248,11 +248,11 @@
    - + - 0): ?> + 0) { ?> - +
    @@ -271,16 +271,16 @@
    - + - +

    There are no roles in the event you are skilled to cover.

    If you need adding to the rota, speak to an admin.

    - + diff --git a/public/old/swaps.php b/public/old/swaps.php index 9426c8d..aca9d19 100644 --- a/public/old/swaps.php +++ b/public/old/swaps.php @@ -79,7 +79,7 @@
    - + getEventPerson()->getEvent() ?>
    @@ -105,20 +105,20 @@ $canAcceptSwap = canAcceptSwap($swap->getId()); $canDeclineSwap = canDeclineSwap($swap->getId()); ?> - +
    - + Accept - - + + Decline - +
    - +
    - +
    diff --git a/public/plugins/ckeditor/samples/old/assets/posteddata.php b/public/plugins/ckeditor/samples/old/assets/posteddata.php index 2d7e01f..dfb57de 100755 --- a/public/plugins/ckeditor/samples/old/assets/posteddata.php +++ b/public/plugins/ckeditor/samples/old/assets/posteddata.php @@ -4,7 +4,7 @@ Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ -?> +?> @@ -35,7 +35,7 @@ $value = htmlspecialchars(stripslashes((string) $value)); } else { $value = htmlspecialchars((string) $value); - } ?> + } ?>
    @@ -43,7 +43,7 @@ +?>