Merge pull request #492 from Geolim4/final

Geolim4 · web-flow · commit 0cbe88663dee · 2017-07-01T15:09:08.000+02:00
Updated setNamespace method
diff --git a/.travis.yml b/.travis.yml
@@ -21,9 +21,9 @@ services:
 before_script:
   - |
     if [[ $TRAVIS_PHP_VERSION = "hhv"* ]]; then
-      cat bin/ci/php-phpfastcache.ini >> /etc/hhvm/php.ini
+      cat bin/ci/php_phpfastcache.ini >> /etc/hhvm/php.ini
     else
-      phpenv config-add bin/ci/php-phpfastcache.ini
+      phpenv config-add bin/ci/php_phpfastcache.ini
     fi
 
 php:
diff --git a/bin/ci/php_phpfastcache.ini b/bin/ci/php_phpfastcache.ini
diff --git a/src/phpFastCache/CacheManager.php b/src/phpFastCache/CacheManager.php
@@ -334,7 +334,7 @@ public static function getNamespacePath()
      */
     public static function setNamespacePath($path)
     {
-        self::$namespacePath = $path;
+        self::$namespacePath = trim($path, "\\") . '\\';
     }
 
     /**
diff --git a/tests/CustomNamespaces.test.php b/tests/CustomNamespaces.test.php
@@ -114,7 +114,7 @@ class Item extends FilesItem
     $testHelper->printPassText('The php classes of driver "Files2" were found');
 }
 
-CacheManager::setNamespacePath(phpFastCache\CustomDriversPath::class . '\\');
+CacheManager::setNamespacePath(phpFastCache\CustomDriversPath::class);
 $cacheInstance = CacheManager::getInstance('Files2', []);
 $cacheKey = 'cacheKey';
 $RandomCacheValue = str_shuffle(uniqid('pfc', true));

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ public static function getNamespacePath()`
`334`	`334`	`*/`
`335`	`335`	`public static function setNamespacePath($path)`
`336`	`336`	`{`
`337`		`- self::$namespacePath = $path;`
	`337`	`+ self::$namespacePath = trim($path, "\\") . '\\';`
`338`	`338`	`}`
`339`	`339`
`340`	`340`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ class Item extends FilesItem`
`114`	`114`	`$testHelper->printPassText('The php classes of driver "Files2" were found');`
`115`	`115`	`}`
`116`	`116`
`117`		`-CacheManager::setNamespacePath(phpFastCache\CustomDriversPath::class . '\\');`
	`117`	`+CacheManager::setNamespacePath(phpFastCache\CustomDriversPath::class);`
`118`	`118`	`$cacheInstance = CacheManager::getInstance('Files2', []);`
`119`	`119`	`$cacheKey = 'cacheKey';`
`120`	`120`	`$RandomCacheValue = str_shuffle(uniqid('pfc', true));`