Merge pull request #859 from cytopia/release/v1.9.3

Release v1.9.3

.devilbox/www/config.php

@@ -13,8 +13,8 @@ error_reporting(-1);
 putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
-$DEVILBOX_VERSION = 'v1.9.2';
-$DEVILBOX_DATE = '2021-06-04';
+$DEVILBOX_VERSION = 'v1.9.3';
+$DEVILBOX_DATE = '2022-01-25';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //
@@ -127,15 +127,27 @@ function loadClass($class) {
 				break;
 
 			case 'Redis':
-
 				// Check if redis is using a password
 				$REDIS_ROOT_PASSWORD = '';
 
 				$_REDIS_ARGS = loadClass('Helper')->getEnv('REDIS_ARGS');
-				$_REDIS_PASS = preg_split("/--requirepass\s+/",  $_REDIS_ARGS);
-				if (is_array($_REDIS_PASS) && count($_REDIS_PASS)) {
-					// In case the option is specified multiple times, use the last effective one.
-					$_REDIS_PASS = $_REDIS_PASS[count($_REDIS_PASS)-1];
+
+				/*
+				 * This pattern will match optional quoted string, 'my password' or "my password"
+				 * or if there aren't any quotes, it will match up until the next space.
+				 */
+				$_REDIS_PASS = array();
+				preg_match_all('/--requirepass\s+("|\')?(?(1)(.*)|([^\s]*))(?(1)\1|)/', $_REDIS_ARGS, $_REDIS_PASS, PREG_SET_ORDER);
+
+				if (! empty($_REDIS_PASS)) {
+					/*
+					 * In case the option is specified multiple times, use the last effective one.
+					 *
+					 * preg_match_all returns a multi-dimensional array, the first level array is in order of which was matched first,
+					 * and the password string is either matched in group 2 or group 3 which is always the end of the sub-array.
+					 */
+					$_REDIS_PASS = end(end($_REDIS_PASS));
+
 					if (strlen($_REDIS_PASS) > 0) {
 						$REDIS_ROOT_PASSWORD = $_REDIS_PASS;
 					}

CHANGELOG.md

@@ -6,6 +6,16 @@ Make sure to have a look at [UPDATING.md](https://github.com/cytopia/devilbox/bl
 ## Unreleased
 
 
+## Release v1.9.3 (2022-01-24)
+
+#### Fixed
+- Updated PHP Docker Images: [#221](https://github.com/devilbox/docker-php-fpm/pull/221)
+- Updated PHP Docker Images: [#222](https://github.com/devilbox/docker-php-fpm/pull/222)
+- Update MySQL Docker Images: [#10](https://github.com/devilbox/docker-mysql/pull/10)
+- Fixed documentation build issues
+- Fixed intranet PHP code to work with legacy versions
+
+
 ## Release v1.9.2 (2021-06-04)
 
 #### Added

README.md

@@ -734,7 +734,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
 | <small>date</small>           |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>dba</small>            |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>dom</small>            |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
-| <small>enchant</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
+| <small>enchant</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |    🗸    |    🗸    |
 | <small>ereg</small>           |         |    ✔    |    ✔    |    ✔    |    ✔    |         |         |         |         |         |         |         |
 | <small>exif</small>           |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>FFI</small>            |         |         |         |         |         |         |         |         |         |    🗸    |    ✔    |    ✔    |
@@ -756,7 +756,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
 | <small>ldap</small>           |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>libxml</small>         |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
 | <small>mbstring</small>       |    ✔    |    🗸    |    🗸    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
-| <small>mcrypt</small>         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
+| <small>mcrypt</small>         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |
 | <small>memcache</small>       |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>memcached</small>      |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>mhash</small>          |         |         |         |         |    ✔    |         |         |         |         |         |         |         |
@@ -804,7 +804,7 @@ The Devilbox is a development stack, so it is made sure that a lot of PHP module
 | <small>sqlsrv</small>         |         |         |         |         |         |    d    |    d    |    d    |    d    |    d    |    d    |         |
 | <small>ssh2</small>           |         |         |         |         |         |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |         |         |
 | <small>standard</small>       |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |    ✔    |
-| <small>swoole</small>         |         |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |         |         |
+| <small>swoole</small>         |         |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |    d    |         |
 | <small>sysvmsg</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>sysvsem</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |
 | <small>sysvshm</small>        |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |    🗸    |

docker-compose.yml

@@ -95,7 +95,7 @@ services:
   # PHP
   # ------------------------------------------------------------
   php:
-    image: devilbox/php-fpm:${PHP_SERVER}-work-0.127
+    image: devilbox/php-fpm:${PHP_SERVER}-work-0.130
     hostname: php
 
     ##
@@ -320,7 +320,7 @@ services:
   # MySQL Database
   # ------------------------------------------------------------
   mysql:
-    image: devilbox/mysql:${MYSQL_SERVER}-0.7
+    image: devilbox/mysql:${MYSQL_SERVER}-0.8
     hostname: mysql
 
     environment:

docs/Makefile

@@ -28,7 +28,7 @@ linkcheck2:
 		--rm \
 		$$(tty -s && echo "-it" || echo) \
 		-v $(PWD):/data \
-		cytopia/linkcheck -l -k -r 60 -t 30 -e rst -c '200,204' _includes/
+		cytopia/linkcheck -l -k -r 60 -t 30 -e rst -c '200,204,403' _includes/
 
 linkcheck:
 	docker run \

docs/_includes/links/documentation.rst

@@ -6,13 +6,13 @@
 
 .. |ext_lnk_doc_bind_ttl| raw:: html
 
-   <a target="_blank" href="http://www.zytrax.com/books/dns/apa/ttl.html">
+   <a target="_blank" href="https://bind9.readthedocs.io/en/latest/reference.html?highlight=ttl#the-ttl-directive">
      BIND TTL <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
    </a>
 
 .. |ext_lnk_doc_bind_soa| raw:: html
 
-   <a target="_blank" href="http://www.zytrax.com/books/dns/ch8/soa.html">
+   <a target="_blank" href="https://bind9.readthedocs.io/en/latest/introduction.html?highlight=soa#secondary-servers">
      BIND SOA <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
    </a>
 

docs/_includes/links/examples.rst

@@ -72,13 +72,13 @@
 
 .. |ext_lnk_example_phalcon_documentation| raw:: html
 
-   <a target="_blank" href="https://docs.phalconphp.com/latest/en/devtools-usage">
+   <a target="_blank" href="https://docs.phalcon.io/4.0/en/environments-devilbox">
      Official Phalcon Documentation  <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
    </a>
 
 .. |ext_lnk_example_photon_cms| raw:: html
 
-   <a target="_blank" href="https://photoncms.com/resources/installing">
+   <a target="_blank" href="https://docs.photoncms.com/">
      Official Photon CMS Documentation <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
    </a>
 

docs/_includes/links/tools.rst

@@ -209,7 +209,7 @@
 
 .. |ext_lnk_tool_photon| raw:: html
 
-   <a target="_blank" href="https://photoncms.com/resources/installing">
+   <a target="_blank" href="https://docs.photoncms.com/">
      Photon CMS cli <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
    </a>
 

docs/getting-started/change-container-versions.rst

@@ -128,7 +128,7 @@ Now save the file and you can start the Devilbox again.
    # Navigate to the Devilbox directory
    host> cd path/to/devilbox
 
-   # Stop all container
+   # Start all container
    host> docker-compose up php httpd bind
 
 .. seealso:: :ref:`start_the_devilbox`
@@ -193,7 +193,7 @@ Now save the file and you can start the Devilbox again.
    # Navigate to the Devilbox directory
    host> cd path/to/devilbox
 
-   # Stop all container
+   # Start all container
    host> docker-compose up php httpd bind
 
 .. seealso:: :ref:`start_the_devilbox`

docs/getting-started/install-the-devilbox.rst

@@ -148,7 +148,7 @@ Ensure to read the links below to understand why this problem exists and how the
 The Docker documentation will also give you alternative caching options to consider.
 
 .. seealso::
-   * https://github.com/cytopia/devilbox/issues/105#issuecomment-426229921
+   * https://github.com/cytopia/devilbox/issues/105
    * https://forums.docker.com/t/file-access-in-mounted-volumes-extremely-slow-cpu-bound/8076/281
    * https://docs.docker.com/docker-for-mac/osxfs/
    * :ref:`env_mount_options`

docs/howto/dns/add-project-dns-entry-on-win.rst

@@ -47,7 +47,7 @@ When using Docker for Windows you can use ``127.0.0.1`` for the IP address.
       127.0.0.1  project-1.loc
       127.0.0.1  www.project-1.loc
 
-3. Safe the file and verify the DNS entries with the ``ping`` command
+3. Save the file and verify the DNS entries with the ``ping`` command
 
    .. code-block:: bash
 

docs/intermediate/setup-auto-dns.rst

@@ -53,7 +53,7 @@ Then you need to ensure that :ref:`env_host_port_bind` is set to ``53``.
    host> vi .env
    HOST_PORT_BIND=53
 
-Before starting up the Devilbox, ensure that port ``53`` is not already used on ``127.0.0.1``.
+Before starting up the Devilbox, ensure that port ``53`` is not already used.
 
 .. code-block:: bash
    :emphasize-lines: 2

docs/support/troubleshooting.rst

@@ -135,7 +135,7 @@ have to get support from the docker/for-mac GitHub repository or forum.
 
 .. seealso::
    * https://github.com/cytopia/devilbox/issues/539
-   * https://github.com/docker/for-mac/issues/371#issuecomment-242047368
+   * https://github.com/docker/for-mac/issues/371
    * https://forums.docker.com/t/no-space-left-on-device-error/10894