update composer + fix build

mikespub-org · Mar 24, 2023 · e1b7182 · e1b7182
1 parent 5853aaa
commit e1b7182
Show file tree

Hide file tree

Showing 6 changed files with 129 additions and 103 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -6,8 +6,8 @@ test/
 vendor/
 # remove docker files
 docker/
-compose.yaml
-compose-dev.yaml
+docker-compose.yaml
+docker-compose-dev.yaml
 # remove development files
 .vscode/
 .yarn/

diff --git a/base.php b/base.php
@@ -348,7 +348,7 @@ function addURLParameter($urlParams, $paramName, $paramValue)
     $params = [];
     parse_str($urlParams, $params);
     // @checkme changing this removes ?db=0 from the URL
-    if (empty($paramValue) && $paramValue != 0) {
+    if (empty($paramValue) && $paramValue !== 0) {
         unset($params[$paramName]);
     } else {
         $params[$paramName] = $paramValue;

diff --git a/build.xml b/build.xml
@@ -34,19 +34,56 @@
                 <exclude name="test/**" />
                 <exclude name=".hg*/**" />
                 <exclude name=".git/**" />
+                <exclude name="docker/**" />
+                <exclude name="docker-*.yaml" />
+                <exclude name=".vscode/**" />
+                <exclude name=".yarn/**" />
+                <exclude name=".pnp.*" />
                 <exclude name="tools/**" />
                 <exclude name="coverage/**" />
                 <exclude name="saucetest/**" />
                 <exclude name="resources/epub-loader/**" />
+                <exclude name="resources/tbszip/stuffs/**" />
+                <exclude name="resources/php-epub-meta/assets/**" />
+                <exclude name="resources/php-epub-meta/test/**" />
+                <exclude name="vendor/appium/**" />
+                <exclude name="vendor/bin/**" />
+                <exclude name="vendor/brianium/**" />
+                <exclude name="vendor/bower-asset/dot/benchmarks/**" />
+                <exclude name="vendor/bower-asset/dot/bin/**" />
+                <exclude name="vendor/bower-asset/dot/examples/**" />
+                <exclude name="vendor/bower-asset/dot/test/**" />
+                <exclude name="vendor/bower-asset/jquery-cookie/test/**" />
+                <exclude name="vendor/bower-asset/jquery/external/**" />
+                <exclude name="vendor/bower-asset/jquery/src/**" />
+                <exclude name="vendor/dimsemenov/magnific-popup/libs/**" />
+                <exclude name="vendor/dimsemenov/magnific-popup/src/**" />
+                <exclude name="vendor/dimsemenov/magnific-popup/website/**" />
+                <exclude name="vendor/doctrine/**" />
+                <exclude name="vendor/fidry/**" />
+                <exclude name="vendor/jean85/**" />
+                <exclude name="vendor/myclabs/**" />
+                <exclude name="vendor/nikic/**" />
+                <exclude name="vendor/phar-io/**" />
+                <exclude name="vendor/phing/**" />
+                <exclude name="vendor/phpunit/**" />
+                <exclude name="vendor/psr/**" />
+                <exclude name="vendor/sauce/**" />
+                <exclude name="vendor/sebastian/**" />
+                <exclude name="vendor/seblucas/php-epub-meta/assets/**" />
+                <exclude name="vendor/seblucas/php-epub-meta/test/**" />
+                <exclude name="vendor/seblucas/tbszip/stuffs/**" />
+                <exclude name="vendor/symfony/**" />
+                <exclude name="vendor/theseer/**" />
                 <exclude name="vendor/twbs/bootstrap/docs/**" />
                 <exclude name="vendor/twbs/bootstrap/fonts/**" />
+                <exclude name="vendor/twbs/bootstrap/grunt/**" />
                 <exclude name="vendor/twbs/bootstrap/js/**" />
                 <exclude name="vendor/twbs/bootstrap/less/**" />
-                <exclude name="vendor/seblucas/tbszip/stuffs/**" />
-                <exclude name="vendor/seblucas/php-epub-meta/assets/**" />
-                <exclude name="vendor/seblucas/php-epub-meta/test/**" />
-                <exclude name="vendor/dimsemenov/magnific-popup/libs/**" />
-                <exclude name="vendor/dimsemenov/magnific-popup/website/**" />
+                <exclude name="vendor/twbs/bootstrap/nuget/**" />
+                <exclude name="vendor/twitter/typeahead.js/doc/**" />
+                <exclude name="vendor/twitter/typeahead.js/src/**" />
+                <exclude name="vendor/twitter/typeahead.js/test/**" />
                 <exclude name="*.phar" />
                 <exclude name="*.zip" />
                 <exclude name="*.xml" />

diff --git a/composer.json b/composer.json
@@ -10,21 +10,21 @@
         "ext-json": "*",
         "ext-pdo_sqlite": "*",
         "ext-mbstring": "*",
-        "dimsemenov/magnific-popup": "~1.0",
-        "phpmailer/phpmailer": "~5.2",
-        "twbs/bootstrap": "~3.3",
+        "dimsemenov/magnific-popup": "~1.1",
+        "phpmailer/phpmailer": "~6.8",
+        "twbs/bootstrap": "~3.4",
         "bower-asset/jquery": "~1.12",
         "bower-asset/jquery-cookie": "~1.4",
         "bower-asset/normalize.css": "~7.0",
-        "twitter/typeahead.js": "~0.10.5",
+        "twitter/typeahead.js": "~0.11",
         "simonpioli/sortelements": "dev-master",
-        "bower-asset/dot": "~1.0.1",
+        "bower-asset/dot": "~1.1",
         "rsms/js-lru": "dev-v2"
     },
     "require-dev": {
-        "phpunit/phpunit": "9.5.*",
-        "sauce/sausage": ">=0.12.0",
-        "phing/phing": "2.*"
+        "phpunit/phpunit": "~9.5",
+        "sauce/sausage": "~0.18",
+        "phing/phing": "~2.17"
     },
     "autoload": {
         "classmap": ["lib/", "resources/"]