Merge pull request #1130 from wagnert/1.1

Pre-Initialize LDAP configuration encryption parameter + Add Doctrine…

CHANGELOG.md

@@ -1,3 +1,14 @@
+# Version 1.1.24
+
+## Bugfixes
+
+* Pre-Initialize LDAP configuration encryption parameter
+
+## Features
+
+* Add Doctrine cache factories for APCu and Filesystem
+* Update to appserver-io/description version 13.0.1
+
 # Version 1.1.23
 
 ## Bugfixes
@@ -9,7 +20,7 @@
 * Extend error handling with exception support
 * Add encryption support for LDAP functionality
 * Update to appserver-io/ldap version 3.0.*
-* Update to appserver-io/description version 33.0.*
+* Update to appserver-io/description version 13.0.*
 * Update to appserver-io/provisioning version 2.0.*
 * Update to appserver-io-psr/cli version 2.0.*
 * Update to appserver-io-psr/application-server version 2.0.*

UPGRADE-1.1.24.md

@@ -0,0 +1,3 @@
+# Upgrade from 1.1.23 to 1.1.24
+
+Updating from 1.1.23 to 1.1.24 doesn't have any impacts. Please read the apropriate UPGRADE-1.x.x files for updates from older versions to 1.1.24.

build.default.properties

@@ -8,7 +8,7 @@
 ;--------------------------------------------------------------------------------
 
 ; ---- Module Release Settings --------------------------------------------------
-release.version = 1.1.23
+release.version = 1.1.24
 release.name = Iron Knight
 
 ; ---- PHPCPD Settings ----------------------------------------------------------

src/AppserverIo/Appserver/Doctrine/Utils/ConnectionUtil.php

@@ -98,7 +98,8 @@ public function fromDatabaseNode(DatabaseConfigurationInterface $databaseNode)
 
         // initialize the connection parameters with the mandatory driver
         $connectionParameters = array(
-            'driver' => $databaseNode->getDriver()->getNodeValue()->__toString()
+            'driver' => $databaseNode->getDriver()->getNodeValue()->__toString(),
+            'encryption' => 'none'
         );
 
         // initialize the path/memory to the database when we use sqlite for example

src/AppserverIo/Appserver/PersistenceContainer/Doctrine/V2/CacheFactories/ApcuCacheFactory.php

@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * AppserverIo\Appserver\PersistenceContainer\Doctrine\V2\CacheFactories\ApcuCacheFactory
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ *
+ * PHP version 5
+ *
+ * @author    Tim Wagner <tw@appserver.io>
+ * @copyright 2015 TechDivision GmbH <info@appserver.io>
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      https://github.com/appserver-io/rmi
+ * @link      http://www.appserver.io
+ */
+
+namespace AppserverIo\Appserver\PersistenceContainer\Doctrine\V2\CacheFactories;
+
+use Doctrine\Common\Cache\ApcuCache;
+
+/**
+ * The factory implementation for an ApcuCache cache instance.
+ *
+ * @author    Tim Wagner <tw@appserver.io>
+ * @author    Bernhard Wick <bw@appserver.io>
+ * @copyright 2015 TechDivision GmbH <info@appserver.io>
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      https://github.com/appserver-io/rmi
+ * @link      http://www.appserver.io
+ */
+class ApcuCacheFactory implements CacheFactoryInterface
+{
+
+    /**
+     * Return's the new cache instance.
+     *
+     * @param array $configuration The cache configuration
+     *
+     * @return \Doctrine\Common\Cache\CacheProvider The cache instance
+     */
+    public static function get(array $configuration = array())
+    {
+        if (extension_loaded('apcu')) {
+            return new ApcuCache();
+        }
+    }
+}

src/AppserverIo/Appserver/PersistenceContainer/Doctrine/V2/CacheFactories/CacheKeys.php

@@ -37,4 +37,11 @@ class CacheKeys
      * @var string
      */
     const HOST = 'host';
+
+    /**
+     * The key for the directory value.
+     *
+     * @var string
+     */
+    const DIRECTORY = 'directory';
 }

src/AppserverIo/Appserver/PersistenceContainer/Doctrine/V2/CacheFactories/FilesystemCacheFactory.php

@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * AppserverIo\Appserver\PersistenceContainer\Doctrine\V2\CacheFactories\FilesystemCacheFactory
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ *
+ * PHP version 5
+ *
+ * @author    Tim Wagner <tw@appserver.io>
+ * @copyright 2015 TechDivision GmbH <info@appserver.io>
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      https://github.com/appserver-io/rmi
+ * @link      http://www.appserver.io
+ */
+
+namespace AppserverIo\Appserver\PersistenceContainer\Doctrine\V2\CacheFactories;
+
+use Doctrine\Common\Cache\FilesystemCache;
+
+/**
+ * The factory implementation for a FilesystemCache cache instance.
+ *
+ * @author    Tim Wagner <tw@appserver.io>
+ * @author    Bernhard Wick <bw@appserver.io>
+ * @copyright 2015 TechDivision GmbH <info@appserver.io>
+ * @license   http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @link      https://github.com/appserver-io/rmi
+ * @link      http://www.appserver.io
+ */
+class FilesystemCacheFactory implements CacheFactoryInterface
+{
+
+    /**
+     * Return's the new cache instance.
+     *
+     * @param array $configuration The cache configuration
+     *
+     * @return \Doctrine\Common\Cache\CacheProvider The cache instance
+     */
+    public static function get(array $configuration = array())
+    {
+        return new FilesystemCache($configuration[CacheKeys::DIRECTORY]);
+    }
+}