Merge branch 'master' of https://git.mcnd.ca/mcndave/lean
This commit is contained in:
		
						commit
						4404943f8b
					
				| @ -4,12 +4,12 @@ use function DI\autowire, DI\create, DI\get; | ||||
| 
 | ||||
| use TheBugs\Email\EmailConfiguration, | ||||
|     TheBugs\Email\MailerInterface, | ||||
|     TheBugs\Email\SwiftMailer; | ||||
|     TheBugs\Email\SymfonyMailer; | ||||
| 
 | ||||
| return [ | ||||
|     EmailConfiguration::class => function($c) { | ||||
|         $email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP ); | ||||
|         $email->smtpHost = getenv('SMTP_HOST'); | ||||
|         $email->smtpHost = getenv('SMTP_HOSTNAME'); | ||||
|         $email->smtpPort = getenv('SMTP_PORT'); | ||||
|         $email->smtpUsername = getenv('SMTP_USERNAME'); | ||||
|         $email->smtpPassword = getenv('SMTP_PASSWORD'); | ||||
| @ -20,5 +20,5 @@ return [ | ||||
|         return $email; | ||||
|     }, | ||||
| 
 | ||||
|     MailerInterface::class => autowire(SwiftMailer::class), | ||||
|     MailerInterface::class => autowire(SymfonyMailer::class), | ||||
| ]; | ||||
|  | ||||
| @ -17,6 +17,14 @@ return [ | ||||
|         'application_name' => "", | ||||
|     ], | ||||
| 
 | ||||
|     'api' => [ | ||||
|         'auth' => [ | ||||
|             'type' => \CSLSJ\Api\AuthType::AUTH_HEADER_BASIC, | ||||
|             'username' => getenv('CSSLSJ_API_USERNAME'), | ||||
|             'password' => getenv('CSSLSJ_API_PASSWORD'), | ||||
|         ] | ||||
|     ], | ||||
| 
 | ||||
|     'ulmus' => [ | ||||
|         'connections' => [ | ||||
|             'default' => [ | ||||
|  | ||||
| @ -50,9 +50,13 @@ return [ | ||||
|         }; | ||||
|     }, | ||||
| 
 | ||||
|     CSLSJ\Api\Client::class => create(CSLSJ\Api\Client::class)->constructor(get('api.authentication'), getenv('CSSLSJ_API_URL')), | ||||
| 
 | ||||
|     'api.authentication' => function ($c) { return $c->get('config')['api']['auth']; }, | ||||
| 
 | ||||
|     EmailConfiguration::class => function($c) { | ||||
|         $email = new EmailConfiguration( EmailConfiguration::AUTH_TYPE_SMTP ); | ||||
|         $email->smtpHost = getenv('SMTP_HOST'); | ||||
|         $email->smtpHost = getenv('SMTP_HOSTNAME'); | ||||
|         $email->smtpPort = getenv('SMTP_PORT'); | ||||
|         $email->smtpUsername = getenv('SMTP_USERNAME'); | ||||
|         $email->smtpPassword = getenv('SMTP_PASSWORD'); | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user