[Beeframework-svn] SF.net SVN: beeframework:[247] trunk/framework/Bee

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

Revision: 247
          http://sourceforge.net/p/beeframework/code/247
Author:   m_plomer
Date:     2014-10-08 23:22:21 +0000 (Wed, 08 Oct 2014)
Log Message:
-----------
- omissions from previous namespace refactoring

Modified Paths:
--------------
    trunk/framework/Bee/Context/AbstractContext.php
    trunk/framework/Bee/Context/XmlContext.php

Removed Paths:
-------------
    trunk/framework/Bee/MVC/Interceptor/JsonDecoding.php
    trunk/framework/Bee/MVC/Interceptor/StripSlashes.php

Modified: trunk/framework/Bee/Context/AbstractContext.php
===================================================================
--- trunk/framework/Bee/Context/AbstractContext.php	2014-10-08 22:36:57 UTC (rev 246)
+++ trunk/framework/Bee/Context/AbstractContext.php	2014-10-08 23:22:21 UTC (rev 247)
@@ -700,7 +700,7 @@
 
 		// @todo: catch IllegalStateException in case scope is not active (e.g. no session started...)
 		// not needed for session, request, prototype scopes but maybe for fancy new scope implementations...
-		$scopedInstance = $scope->get($beanName, new Bee_Context_Abstract_ObjectFactoryImpl($beanName, $localBeanDefinition, $this));
+		$scopedInstance = $scope->get($beanName, new AbstractContext_ObjectFactoryImpl($beanName, $localBeanDefinition, $this));
 
 		$bean = $this->getObjectForBeanInstance($scopedInstance, $name, $beanName, $localBeanDefinition);
 
@@ -908,7 +908,7 @@
 /**
  * Workaround for an anonymous implementation of IObjectFactory.
  */
-final class Bee_Context_Abstract_ObjectFactoryImpl implements IObjectFactory {
+final class AbstractContext_ObjectFactoryImpl implements IObjectFactory {
 
 	/**
 	 * Enter description here...

Modified: trunk/framework/Bee/Context/XmlContext.php
===================================================================
--- trunk/framework/Bee/Context/XmlContext.php	2014-10-08 22:36:57 UTC (rev 246)
+++ trunk/framework/Bee/Context/XmlContext.php	2014-10-08 23:22:21 UTC (rev 247)
@@ -31,7 +31,7 @@
 class XmlContext extends AbstractContext {
 
     /**
-     * @var Bee_Context_Xml_CachableConfig
+     * @var XmlContext_CachableConfig
      */
     private $configCacheable;
 
@@ -44,7 +44,7 @@
 	 */
 	public function __construct($locations='', $callInitMethod=true) {
 		parent::__construct($locations, false);
-        $this->configCacheable = new Bee_Context_Xml_CachableConfig(explode(",", $locations));
+        $this->configCacheable = new XmlContext_CachableConfig(explode(",", $locations));
 		if ($callInitMethod) {
 			$this->init();
 		}
@@ -60,7 +60,7 @@
     }
 }
 
-class Bee_Context_Xml_CachableConfig implements ICachableResource {
+class XmlContext_CachableConfig implements ICachableResource {
 	
 	/**
 	 * Enter description here...

Deleted: trunk/framework/Bee/MVC/Interceptor/JsonDecoding.php
===================================================================
--- trunk/framework/Bee/MVC/Interceptor/JsonDecoding.php	2014-10-08 22:36:57 UTC (rev 246)
+++ trunk/framework/Bee/MVC/Interceptor/JsonDecoding.php	2014-10-08 23:22:21 UTC (rev 247)
@@ -1,28 +0,0 @@
-<?php
-/*
- * Copyright 2008-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-use Bee\MVC\Interceptor\JsonDecodingInterceptor;
-
-/**
- * Decodes the JSON string from a request parameter ('json' by default) and adds the contents of the decoded structure as request
- * parameters.
- *
- * @author Michael Plomer <mic...@it...>
- *
- * @deprecated replaced by Bee\MVC\Interceptor\JsonDecodingInterceptor
- */
-class Bee_MVC_Interceptor_JsonDecoding extends JsonDecodingInterceptor {
-}
\ No newline at end of file

Deleted: trunk/framework/Bee/MVC/Interceptor/StripSlashes.php
===================================================================
--- trunk/framework/Bee/MVC/Interceptor/StripSlashes.php	2014-10-08 22:36:57 UTC (rev 246)
+++ trunk/framework/Bee/MVC/Interceptor/StripSlashes.php	2014-10-08 23:22:21 UTC (rev 247)
@@ -1,28 +0,0 @@
-<?php
-/*
- * Copyright 2008-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-use Bee\MVC\Interceptor\StripSlashesInterceptor;
-
-/**
- * Enter description here...
- *
- * @author Michael Plomer <mic...@it...>
- * @author Benjamin Hartmann
- *
- * @deprecated replaced by Bee\MVC\Interceptor\StripSlashesInterceptor
- */
-class Bee_MVC_Interceptor_StripSlashes extends StripSlashesInterceptor {
-}
\ No newline at end of file

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