[Beeframework-svn] SF.net SVN: beeframework:[139] trunk

[<m_p...@us...>]

Revision: 139
          http://sourceforge.net/p/beeframework/code/139
Author:   m_plomer
Date:     2014-02-17 11:57:50 +0000 (Mon, 17 Feb 2014)
Log Message:
-----------
- unicode normalizer -> composer compatibility

Modified Paths:
--------------
    trunk/composer.json
    trunk/framework/Bee/Persistence/Doctrine/ManagerAugmenter.php
    trunk/framework/Bee/Text/Normalization/PEARNormalizer.php

Modified: trunk/composer.json
===================================================================
--- trunk/composer.json	2014-02-17 11:30:30 UTC (rev 138)
+++ trunk/composer.json	2014-02-17 11:57:50 UTC (rev 139)
@@ -1,4 +1,14 @@
 {
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://dev.iter8.de/composer/"
+        },
+        {
+            "type": "pear",
+            "url": "pear.php.net"
+        }
+    ],
     "name": "bee-framework/bee-framework",
     "type": "library",
     "description": "Bee Framework - PHP 5 DI/IoC application framework",
@@ -19,7 +29,8 @@
         "doctrine/orm": "~2.4@RC",
         "doctrine/doctrine1": "~1.2@stable",
         "niktux/addendum": "0.4.1",
-        "apache/log4php": "~2.3@stable"
+        "apache/log4php": "~2.3@stable",
+        "pear-pear/I18N_UnicodeNormalizer": "*@stable"
     },
     "require-dev": {
         "smarty/smarty": "~3.1@stable",

Modified: trunk/framework/Bee/Persistence/Doctrine/ManagerAugmenter.php
===================================================================
--- trunk/framework/Bee/Persistence/Doctrine/ManagerAugmenter.php	2014-02-17 11:30:30 UTC (rev 138)
+++ trunk/framework/Bee/Persistence/Doctrine/ManagerAugmenter.php	2014-02-17 11:57:50 UTC (rev 139)
@@ -96,9 +96,9 @@
     }
 
     public function afterPropertiesSet() {
-//		$this->doctrineManager->setAttribute(Doctrine::ATTR_USE_DQL_CALLBACKS, true);
-//		$this->doctrineManager->setAttribute(Doctrine::ATTR_AUTO_FREE_QUERY_OBJECTS, true);
-//		$this->doctrineManager->setAttribute(Doctrine::ATTR_QUOTE_IDENTIFIER, true);
+//		$this->doctrineManager->setAttribute(Doctrine_Core::ATTR_USE_DQL_CALLBACKS, true);
+//		$this->doctrineManager->setAttribute(Doctrine_Core::ATTR_AUTO_FREE_QUERY_OBJECTS, true);
+//		$this->doctrineManager->setAttribute(Doctrine_Core::ATTR_QUOTE_IDENTIFIER, true);
 
 		if($this->queryCacheDriver) {
 			$this->doctrineManager->setAttribute(Doctrine_Core::ATTR_QUERY_CACHE, $this->queryCacheDriver);

Modified: trunk/framework/Bee/Text/Normalization/PEARNormalizer.php
===================================================================
--- trunk/framework/Bee/Text/Normalization/PEARNormalizer.php	2014-02-17 11:30:30 UTC (rev 138)
+++ trunk/framework/Bee/Text/Normalization/PEARNormalizer.php	2014-02-17 11:57:50 UTC (rev 139)
@@ -23,7 +23,16 @@
  
 class Bee_Text_Normalization_PEARNormalizer implements Bee_Text_Normalization_INormalizer {
 
+	private static $pearDataDir;
+
 	/**
+	 * @param mixed $pearDataDir
+	 */
+	public static function setPearDataDir(mixed $pearDataDir) {
+		self::$pearDataDir = $pearDataDir;
+	}
+
+	/**
 	 * @var I18N_UnicodeNormalizer
 	 */
 	private $normalizer;
@@ -38,6 +47,6 @@
 	}
 
 	public function __construct() {
-		$this->normalizer = new I18N_UnicodeNormalizer();
+		$this->normalizer = new I18N_UnicodeNormalizer(self::$pearDataDir);
 	}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.