Commit cce742f4 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'zf-3.x' of https://git.unicaen.fr/lib/unicaen/bjy-authorize into zf-3.x

parents 72a339ad f21c4709
Loading
Loading
Loading
Loading
+9 −9
Changes for composer.json: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -25,15 +25,15 @@
    ],
    "require": {
        "php":                                ">=5.6 || >=7.0",
        "zendframework/zend-permissions-acl": "^2.2 || ^3.0",
        "zendframework/zend-mvc":             "^2.2 || ^3.0",
        "zendframework/zend-eventmanager":    "^2.2 || ^3.0",
        "zendframework/zend-servicemanager":  "^2.2 || ^3.0",
        "zendframework/zend-http":            "^2.2 || ^3.0",
        "zendframework/zend-view":            "^2.2 || ^3.0",
        "zendframework/zend-cache":           "^2.2 || ^3.0",
        "zf-commons/zfc-user":                "^1.0 || 2.x-dev",
        "doctrine/common":                    "^2.7"
        "doctrine/common":                    "^2.7",
        "zendframework/zend-cache":           "^2.8",
        "zendframework/zend-eventmanager":    "^3.2",
        "zendframework/zend-http":            "^2.10",
        "zendframework/zend-mvc":             "^3.1",
        "zendframework/zend-permissions-acl": "^2.7",
        "zendframework/zend-servicemanager":  "^3.4",
        "zendframework/zend-view":            "^2.11",
        "zf-commons/zfc-user":                "^3.0"
    },
    "require-dev": {
        "phpunit/phpunit":                    "^4.0",