#977 Update dependencies for merge

composer.json

@@ -20,16 +20,16 @@
     "ext-fileinfo": "*",
     "ext-readline": "*",
     "ext-sockets": "*",
-    "shardj/zf1-future": "*",
+    "opus4/zf1-future": "1.21.4.x-dev",
     "jpgraph/jpgraph": "dev-master",
-    "opus4-repo/opus4-common": "dev-4.7.2-zf1f",
-    "opus4-repo/framework": "dev-4.7.2-zf1f",
+    "opus4-repo/opus4-common": "4.7.2.x-dev",
+    "opus4-repo/framework": "4.7.2.x-dev",
     "opus4-repo/search": "dev-4.7.2-zf1f",
-    "opus4-repo/opus4-bibtex": "dev-4.7.2-zf1f",
-    "opus4-repo/opus4-import": "dev-4.7.2-zf1f",
-    "opus4-repo/opus4-pdf": "dev-4.7.2-zf1f",
-    "opus4-repo/opus4-job": "dev-4.7.2-zf1f",
-    "opus4-repo/opus4-security": "dev-4.7.2-zf1f",
+    "opus4-repo/opus4-bibtex": "4.7.2.x-dev",
+    "opus4-repo/opus4-import": "4.7.2.x-dev",
+    "opus4-repo/opus4-pdf": "4.7.2.x-dev",
+    "opus4-repo/opus4-job": "dev-main",
+    "opus4-repo/opus4-security": "dev-main",
     "components/jquery": "3.4.*",
     "components/jqueryui": "1.12.*",
     "oomphinc/composer-installers-extender": "^2.0",
@@ -41,7 +41,6 @@
     "phploc/phploc": "*",
     "phpmd/phpmd" : "*",
     "sebastian/phpcpd": "*",
-    "squizlabs/php_codesniffer": "3.7.*",
     "opus4-repo/codesniffer": "dev-laminas",
     "phpmetrics/phpmetrics": "2.7.4"
   },