[Beeframework-svn] SF.net SVN: beeframework:[300] trunk/framework/Bee
Brought to you by:
b_hartmann,
m_plomer
Menu
▾
▴
[Beeframework-svn] SF.net SVN: beeframework:[300] trunk/framework/Bee
|
From: <m_p...@us...> - 2015-03-12 18:01:15
|
Revision: 300
http://sourceforge.net/p/beeframework/code/300
Author: m_plomer
Date: 2015-03-12 18:01:07 +0000 (Thu, 12 Mar 2015)
Log Message:
-----------
- various bugfixes, fixes for PHP 5.4-5.6 compatibility
Modified Paths:
--------------
trunk/framework/Bee/Context/AbstractContext.php
trunk/framework/Bee/Context/Config/IBeanReference.php
trunk/framework/Bee/Context/Config/IScope.php
trunk/framework/Bee/Context/Config/RuntimeBeanNameReference.php
trunk/framework/Bee/Context/Config/RuntimeBeanReference.php
trunk/framework/Bee/Context/Config/Scope/CacheScope.php
trunk/framework/Bee/Context/Config/Scope/PrototypeScope.php
trunk/framework/Bee/Context/Config/Scope/RequestScope.php
trunk/framework/Bee/MVC/Session/DispatcherAdapter.php
trunk/framework/Bee/Persistence/Doctrine2/GenericDaoBase.php
Modified: trunk/framework/Bee/Context/AbstractContext.php
===================================================================
--- trunk/framework/Bee/Context/AbstractContext.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Context/AbstractContext.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -47,7 +47,9 @@
* @author Michael Plomer <mic...@it...>
*/
abstract class AbstractContext extends BasicBeanDefinitionRegistry implements IContext, IContextAware {
- use TPropertyEditorRegistryHolder;
+ use TPropertyEditorRegistryHolder {
+ TPropertyEditorRegistryHolder::setBeeContext as setPropertyEditorContext;
+ }
/**
* @var IContext[]
@@ -886,6 +888,14 @@
public function getModificationTimestamp() {
return 0;
}
+
+ /**
+ * @param IContext $context
+ */
+ public function setBeeContext(IContext $context) {
+ $this->setPropertyEditorContext($context);
+ $this->setParent($context);
+ }
}
Modified: trunk/framework/Bee/Context/Config/IBeanReference.php
===================================================================
--- trunk/framework/Bee/Context/Config/IBeanReference.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Context/Config/IBeanReference.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -27,7 +27,7 @@
/**
* Return the target bean name that this reference points to (never <code>null</code>).
* @abstract
- * @return string
+ * @return array
*/
function getBeanNames();
}
\ No newline at end of file
Modified: trunk/framework/Bee/Context/Config/IScope.php
===================================================================
--- trunk/framework/Bee/Context/Config/IScope.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Context/Config/IScope.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -31,7 +31,7 @@
* @param IObjectFactory $objectFactory
* @return Object
*/
- public function get($beanName, IObjectFactory $objectFactory);
+ public function &get($beanName, IObjectFactory $objectFactory);
/**
* Enter description here...
Modified: trunk/framework/Bee/Context/Config/RuntimeBeanNameReference.php
===================================================================
--- trunk/framework/Bee/Context/Config/RuntimeBeanNameReference.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Context/Config/RuntimeBeanNameReference.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -44,7 +44,7 @@
/**
* Enter description here...
*
- * @return String
+ * @return array
*/
public function getBeanNames() {
return $this->beanNames;
Modified: trunk/framework/Bee/Context/Config/RuntimeBeanReference.php
===================================================================
--- trunk/framework/Bee/Context/Config/RuntimeBeanReference.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Context/Config/RuntimeBeanReference.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -55,7 +55,7 @@
/**
* Enter description here...
*
- * @return String
+ * @return array
*/
public function getBeanNames() {
return $this->beanNames;
Modified: trunk/framework/Bee/Context/Config/Scope/CacheScope.php
===================================================================
--- trunk/framework/Bee/Context/Config/Scope/CacheScope.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Context/Config/Scope/CacheScope.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -34,7 +34,7 @@
$this->id = $id;
}
- public function get($beanName, IObjectFactory $objectFactory) {
+ public function &get($beanName, IObjectFactory $objectFactory) {
return Manager::retrieveCachable(new CachableConfig($this->getCacheKey($beanName), $objectFactory));
}
Modified: trunk/framework/Bee/Context/Config/Scope/PrototypeScope.php
===================================================================
--- trunk/framework/Bee/Context/Config/Scope/PrototypeScope.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Context/Config/Scope/PrototypeScope.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -38,7 +38,7 @@
* @param IObjectFactory $objectFactory
* @return mixed|Object
*/
- public function get($beanName, IObjectFactory $objectFactory) {
+ public function &get($beanName, IObjectFactory $objectFactory) {
return $objectFactory->getObject();
}
Modified: trunk/framework/Bee/Context/Config/Scope/RequestScope.php
===================================================================
--- trunk/framework/Bee/Context/Config/Scope/RequestScope.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Context/Config/Scope/RequestScope.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -43,7 +43,7 @@
* @param IObjectFactory $objectFactory
* @return mixed|Object
*/
- public function get($beanName, IObjectFactory $objectFactory) {
+ public function &get($beanName, IObjectFactory $objectFactory) {
$scopedObject =& $this->beans[$beanName];
if(is_null($scopedObject)) {
$scopedObject = $objectFactory->getObject();
Modified: trunk/framework/Bee/MVC/Session/DispatcherAdapter.php
===================================================================
--- trunk/framework/Bee/MVC/Session/DispatcherAdapter.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/MVC/Session/DispatcherAdapter.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -19,7 +19,7 @@
use Bee\IContext;
use Exception;
-class DispatcherAdapter {
+class DispatcherAdapter /*implements SessionHandlerInterface*/ {
const SESSION_HANDLER_NAME = '__sessionHandler';
Modified: trunk/framework/Bee/Persistence/Doctrine2/GenericDaoBase.php
===================================================================
--- trunk/framework/Bee/Persistence/Doctrine2/GenericDaoBase.php 2015-03-07 00:52:12 UTC (rev 299)
+++ trunk/framework/Bee/Persistence/Doctrine2/GenericDaoBase.php 2015-03-12 18:01:07 UTC (rev 300)
@@ -396,9 +396,10 @@
* @param string $fieldPath
* @return QueryBuilder for chaining
*/
- protected final function addCategoryRestrictions(QueryBuilder $queryBuilder, $filters, $fieldPath) {
- if (array_key_exists($fieldPath, $filters)) {
- if (!is_array($catIds = $filters[$fieldPath])) {
+ protected final function addCategoryRestrictions(QueryBuilder $queryBuilder, $filters, $fieldPath, $filterName = false) {
+ $filterName = $filterName ?: $fieldPath;
+ if (array_key_exists($filterName, $filters)) {
+ if (!is_array($catIds = $filters[$filterName])) {
$catIds = array_filter(explode(',', $catIds));
}
if (count($catIds) > 0) {
@@ -423,6 +424,24 @@
return $queryBuilder;
}
+ /**
+ * @param QueryBuilder $queryBuilder
+ * @param $filters
+ * @param $fldExpr
+ * @param bool $filterKeyFrom
+ * @param bool $filterKeyUntil
+ */
+ protected function addDateRestriction(QueryBuilder $queryBuilder, $filters, $fldExpr, $filterKeyFrom = false, $filterKeyUntil = false) {
+ $filterKeyFrom = $filterKeyFrom ?: $fldExpr . 'From';
+ if (array_key_exists($filterKeyFrom, $filters) && $date = DateTimeHelper::parseDate($filters[$filterKeyFrom])) {
+ $queryBuilder->andWhere($this->internalizeFieldExpression($fldExpr, $queryBuilder) . ' >= :dateFrom')->setParameter('dateFrom', $date);
+ }
+ $filterKeyUntil = $filterKeyUntil ?: $fldExpr . 'Until';
+ if (array_key_exists($filterKeyUntil, $filters) && $date = DateTimeHelper::parseDate($filters[$filterKeyUntil])) {
+ $queryBuilder->andWhere($this->internalizeFieldExpression($fldExpr, $queryBuilder) . ' <= :dateUntil')->setParameter('dateUntil', $date);
+ }
+ }
+
// =================================================================================================================
// == GETTERS & SETTERS ============================================================================================
// =================================================================================================================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
