Merge pull request #332 from sil-org/update-silorg-deps

Release 8.0.1 -- Update sil-org dependencies

Author: briskt

application/common/components/Emailer.php

@@ -2,7 +2,8 @@
 
 namespace common\components;
 
-use Sil\EmailService\Client\EmailServiceClient;
+use Sil\Idp\IdBroker\Client\EmailServiceClientException;
+use Sil\Idp\IdBroker\Client\IdBrokerClient;
 use yii\base\Component;
 
 class Emailer extends Component
@@ -14,7 +15,7 @@ class Emailer extends Component
      */
     public $emailServiceConfig = [];
 
-    /** @var EmailServiceClient */
+    /** @var IdBrokerClient */
     protected $emailServiceClient = null;
 
     /**
@@ -43,7 +44,7 @@ protected function assertConfigIsValid()
         ];
 
         foreach ($requiredParams as $param) {
-            if (! isset($this->emailServiceConfig[$param])) {
+            if (!isset($this->emailServiceConfig[$param])) {
                 throw new \InvalidArgumentException(
                     'Missing email service configuration for ' . $param,
                     1502311757
@@ -60,7 +61,7 @@ protected function assertConfigIsValid()
      * @param string $htmlBody The email body (as HTML).
      * @param string $textBody The email body (as plain text).
      * @param null|string $ccAddress The cc email address.
-     * @throws \Sil\EmailService\Client\EmailServiceClientException
+     * @throws EmailServiceClientException
      */
     public function email(
         string $toAddress,
@@ -79,18 +80,18 @@ public function email(
     }
 
     /**
-     * @return EmailServiceClient
-     * @throws \Sil\EmailService\Client\EmailServiceClientException
+     * @return IdBrokerClient
+     * @throws EmailServiceClientException
      */
     protected function getEmailServiceClient()
     {
         if ($this->emailServiceClient === null) {
-            $this->emailServiceClient = new EmailServiceClient(
+            $this->emailServiceClient = new IdBrokerClient(
                 $this->emailServiceConfig['baseUrl'],
                 $this->emailServiceConfig['accessToken'],
                 [
-                    EmailServiceClient::ASSERT_VALID_IP_CONFIG => $this->emailServiceConfig['assertValidIp'],
-                    EmailServiceClient::TRUSTED_IPS_CONFIG => $this->emailServiceConfig['validIpRanges'],
+                    IdBrokerClient::ASSERT_VALID_BROKER_IP_CONFIG => $this->emailServiceConfig['assertValidIp'],
+                    IdBrokerClient::TRUSTED_IPS_CONFIG => $this->emailServiceConfig['validIpRanges'],
                 ]
             );
         }

application/common/config/main.php

@@ -145,7 +145,7 @@
                         'yii\web\HttpException:422',
                         'yii\web\HttpException:429',
                         'yii\web\HttpException:502',
-                        'Sil\EmailService\Client\EmailServiceClientException',
+                        'Sil\Idp\IdBroker\Client\EmailServiceClientException',
                     ],
                     'logVars' => [], // Disable logging of _SERVER, _POST, etc.
                     'message' => [

application/common/models/Verification.php

@@ -3,7 +3,6 @@
 namespace common\models;
 
 use common\components\Emailer;
-use Sil\EmailService\Client\EmailServiceClient;
 use yii\base\Model;
 use yii\helpers\ArrayHelper;
 use yii\web\ServerErrorHttpException;

application/composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "silinternational/idp-pw-api",
+  "name": "sil-org/idp-pw-api",
   "description": "Backend API for Identity Provider Password Management",
   "minimum-stability": "stable",
   "repositories": [
@@ -15,12 +15,10 @@
     "yiisoft/yii2": "~2.0.15",
     "yiisoft/yii2-swiftmailer": "*",
     "yiisoft/yii2-gii": "*",
-    "silinternational/email-service-php-client": "^2.0",
-    "silinternational/php-env": "^2.1.1 || ^3.0",
-    "silinternational/yii2-json-log-targets": "^2.0",
-    "silinternational/yii2-email-log-target": "^1.0.1",
-    "silinternational/idp-id-broker-php-client": "^4.3.0",
-    "silinternational/zxcvbn-api-client-php": "^2.0",
+    "sil-org/php-env": "^2.1.1 || ^3.0",
+    "sil-org/yii2-json-log-targets": "^2.0",
+    "sil-org/idp-id-broker-php-client": "^4.3.0",
+    "sil-org/zxcvbn-api-client-php": "^2.0",
     "simplesamlphp/saml2": "^4",
     "google/apiclient": "^2.0",
     "google/recaptcha": "^1.1.2",
@@ -29,7 +27,7 @@
     "codemix/yii2-streamlog": "^1.3",
     "codeception/module-phpbrowser": "^1.0||^2.0||^3.0",
     "friendsofphp/php-cs-fixer": "^3.0",
-    "silinternational/yii2-sentry": "^2.0",
+    "sil-org/yii2-sentry": "^2.0",
     "ext-pdo": "*"
   },
   "require-dev": {
@@ -41,7 +39,7 @@
     "codeception/verify": "0.*",
     "behat/behat": "^3.3",
     "phpunit/phpunit": "^9.0",
-    "silinternational/yii2-codeception": "^1.1.0",
+    "sil-org/yii2-codeception": "^1.1.0",
     "codeception/module-asserts": "^2.0",
     "codeception/module-yii2": "^1.1",
     "codeception/module-rest": "^3.0"