Merge branch 'main' into dependabot/composer/friendsofphp/php-cs-fixer-3.66.2

Author: rossaddison

.env

@@ -37,14 +37,23 @@ SYMFONY_MAILER_PASSWORD=
 # Used in: config\common\params.php to build the oauth2 Clients array of Identity Providers (idP's) e.g Google, Facebook, Github
 # Note: The config\web\di\auth.php does NOT use the yiisoft/yii-auth-client Collection function to build the 'Clients' array above but uses the SettingRepository functions for this purpose.
 
-GOOGLE_PEOPLE_API_V1_CLIENT_ID=test_google_client_id_from_dot_env
-GOOGLE_PEOPLE_API_V1_CLIENT_SECRET=test_google_client_secret_from_dot_env
-GOOGLE_PEOPLE_API_VI_RETURN_URL=test_google_client_secret_from_dot_env
+GOOGLE_API_CLIENT_ID=test_google_client_id_from_dot_env
+GOOGLE_API_CLIENT_SECRET=test_google_client_secret_from_dot_env
+GOOGLE_API_CLIENT_RETURN_URL=test_google_client_secret_from_dot_env
 
 FACEBOOK_API_CLIENT_ID=test_facebook_client_id_from_dot_env
 FACEBOOK_API_CLIENT_SECRET=test_facebook_client_secret_from_dot_env
 FACEBOO_API_CLIENT_RETURN_URL=test_facebook_client_return_url_from_dot_env
 
 GITHUB_API_CLIENT_ID=test_github_client_id_from_dot_env
 GITHUB_API_CLIENT_SECRET=github_client_secret_from_dot_env
-GITHUB_API_CLIENT_RETURN_URL=http://my_website/callbackGithub
+GITHUB_API_CLIENT_RETURN_URL=test_github_client_return_url_from_dot_env
+
+LINKEDIN_API_CLIENT_ID=test_linkedin_client_id_from_dot_env
+LINKEDIN_API_CLIENT_SECRET=test_linkedin_client_secret_from_dot_env
+LINKEDIN_API_CLIENT_RETURN_URL=test_linkedin_client_return_url_from_dot_env
+
+MICROSOFTONLINE_API_CLIENT_ID=test_microsoftonline_client_id_from_dot_env
+MICROSOFTONLINE_API_CLIENT_SECRET=test_microsoftonline_client_secret_from_dot_env
+MICROSOFTONLINE_API_CLIENT_RETURN_URL=test_microsoftonline_client_return_url_from_dot_env
+MICROSOFTONLINE_API_CLIENT_TENANT=test_microsoftonline_client_tenant_from_dot_env

composer.json

@@ -67,7 +67,7 @@
         "stripe/stripe-php": "^16.3",
         "symfony/console": "^6.4||^7.1",
         "vjik/cycle-typecast": "^2.2",
-        "vjik/telegram-bot-api": "^0.4",
+        "vjik/telegram-bot-api": "^0.5",
         "vlucas/phpdotenv": "^5.6",
         "yiisoft/access": "^2.0",
         "yiisoft/aliases": "^3.0",
@@ -140,7 +140,7 @@
         "codeception/module-asserts": "^3.0",
         "codeception/module-cli": "^2.0",
         "codeception/module-phpbrowser": "^3.0",
-        "friendsofphp/php-cs-fixer": "^3.64",
+        "friendsofphp/php-cs-fixer": "^3.66.2",
         "phpunit/phpunit": "^9.6",
         "roave/better-reflection": "^6.26",
         "roave/infection-static-analysis-plugin": "^1.25",