Skip to content

Commit

Permalink
Merge pull request #28 from trivago-timmo/develop
Browse files Browse the repository at this point in the history
I need an updated version of microsoft-graph ;-)
  • Loading branch information
kschroeder committed Aug 10, 2018
2 parents 8a91dbf + d88ef7c commit 2cb3fd2
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .gitignore
@@ -0,0 +1,3 @@
.idea/
vendor/
composer.lock
12 changes: 8 additions & 4 deletions composer.json
Expand Up @@ -11,21 +11,25 @@
],
"autoload": {
"psr-4": {
"Magium\\ActiveDirectory\\": "src",
"Magium\\ActiveDirectory\\Tests\\": "tests"
"Magium\\ActiveDirectory\\": "src"
},
"files": [
"registration.php"
]
},
"autoload-dev": {
"psr-4": {
"Magium\\ActiveDirectory\\Tests\\": "tests"
}
},
"require-dev": {
"phpunit/phpunit": "~5.7",
"phpunit/phpunit": "^6.0 | ^7.0",
"magium/magium": "~1.1"
},
"require": {
"magium/configuration-manager": "^1.0.1",
"league/oauth2-client": "^1.4",
"microsoft/microsoft-graph": "^0.1",
"microsoft/microsoft-graph": "^1.0",
"zendframework/zend-psr7bridge": "^0.2"
}
}
1 change: 0 additions & 1 deletion src/ActiveDirectory.php
Expand Up @@ -9,7 +9,6 @@
use Magium\Configuration\Config\Repository\ConfigInterface;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Zend\Http\Header\Location;
use Zend\Http\PhpEnvironment\Response;
use Zend\Psr7Bridge\Psr7Response;
use Zend\Uri\Uri;
Expand Down

0 comments on commit 2cb3fd2

Please sign in to comment.