Skip to content

Commit

Permalink
Merge pull request #24 from LM-Commons/revert-22-master
Browse files Browse the repository at this point in the history
Revert "Updated require-dev dependencies for doctrine-module"
  • Loading branch information
visto9259 authored Nov 26, 2021
2 parents 7fc9536 + a3b202d commit 8fce78f
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 10 deletions.
11 changes: 1 addition & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,22 +46,13 @@
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3.5.5",
"php-coveralls/php-coveralls": "^2.2",
"phpspec/prophecy-phpunit": "^2.0",
"doctrine/doctrine-module": "^4.0",
"doctrine/doctrine-orm-module": "^4.0"
"phpspec/prophecy-phpunit": "^2.0"
},
"suggest": {
"laminas/laminas-developer-tools": "if you want to show information about the roles",
"doctrine/doctrine-module": "if you want to use Doctrine role provider"
},
"replace": {
"laminas/laminas-cache-storage-adapter-apc": "*",
"laminas/laminas-cache-storage-adapter-dba": "*",
"laminas/laminas-cache-storage-adapter-memcached": "*",
"laminas/laminas-cache-storage-adapter-mongodb": "*",
"laminas/laminas-cache-storage-adapter-wincache": "*",
"laminas/laminas-cache-storage-adapter-xcache": "*",
"laminas/laminas-cache-storage-adapter-zend-server": "*",
"laminas-commons/lmc-rbac-mvc": "3.0.1"
},
"autoload": {
Expand Down
2 changes: 2 additions & 0 deletions tests/TestConfiguration.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@ return [
'modules' => [
'Laminas\Router',
'LmcRbacMvc',
/*
'DoctrineModule',
'DoctrineORMModule',
*/
],
'module_listener_options' => [
'config_glob_paths' => [
Expand Down
2 changes: 2 additions & 0 deletions tests/testing.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

return [
'lmc_rbac' => [],
/*
'doctrine' => [
'driver' => [
'application_driver' => [
Expand Down Expand Up @@ -48,4 +49,5 @@
],
],
],
*/
];

0 comments on commit 8fce78f

Please sign in to comment.