merged changes from upstream

RedBean/Adapter.php

@@ -4,10 +4,10 @@
  *
  * @file 			RedBean/Adapter.php
  * @description		Describes the API for a RedBean Database Adapter.
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * (c) G.J.G.T. (Gabor) de Mooij
+ * (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community.
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  *

RedBean/Adapter/DBAdapter.php

@@ -3,11 +3,11 @@
  * DBAdapter		(Database Adapter)
  * @file			RedBean/Adapter/DBAdapter.php
  * @description		An adapter class to connect various database systems to RedBean
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community. 
+ * @license			BSD/GPLv2
  *
  *
- * (c) G.J.G.T. (Gabor) de Mooij
+ * (c) copyright G.J.G.T. (Gabor) de Mooij and the RedBeanPHP community.
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */
@@ -23,7 +23,7 @@ class RedBean_Adapter_DBAdapter extends RedBean_Observable implements RedBean_Ad
 	 * Contains SQL snippet
 	 * @var string
 	 */
-	private $sql = "";
+	private $sql = '';
 
 
 	/**

RedBean/AssociationManager.php

@@ -5,10 +5,10 @@
  * @file			RedBean/AssociationManager.php
  * @description		Manages simple bean associations.
  *
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * (c) G.J.G.T. (Gabor) de Mooij
+ * (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community.
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */
@@ -158,7 +158,7 @@ public function related( $bean, $type, $getLinks=false, $sql=false) {
 		else $cross=0;
 		if (!$getLinks) $targetproperty = $type.'_id'; else $targetproperty='id';
 
-		$property = $bean->getMeta('type')."_id";
+		$property = $bean->getMeta('type').'_id';
 		try {
 				$sqlFetchKeys = $this->writer->selectRecord(
 					  $table,

RedBean/BeanCan.php

@@ -4,14 +4,14 @@
  *  
  * @file			RedBean/BeanCan.php
  * @description		A Server Interface for RedBean and Fuse.
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  * 
  * The BeanCan Server is a lightweight, minimalistic server interface for
  * RedBean that can perfectly act as an ORM middleware solution or a backend
  * for an AJAX application.
  * 
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * (c) copyright G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community.
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */
@@ -118,7 +118,7 @@ public function handleJSONRequest( $jsonString ) {
 			}
 		}
 		catch(Exception $exception) {
-			return $this->resp(null, $id, -32099,$exception->getCode()."-".$exception->getMessage());
+			return $this->resp(null, $id, -32099,$exception->getCode().'-'.$exception->getMessage());
 		}
 	}
 

RedBean/BeanHelperFacade.php

@@ -3,10 +3,10 @@
  * RedBean Bean Helper
  * @file			RedBean/BeanHelperFacade.php
  * @description		Finds the toolbox for the bean.
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * copyright(c) G.J.G.T. (Gabor) de Mooij
+ * (c) copyright G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */

RedBean/Cooker.php

@@ -3,14 +3,14 @@
  * RedBean Cooker
  * @file			RedBean/Cooker.php
  * @description		Turns arrays into bean collections for easy persistence.
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
  * The Cooker is a little candy to make it easier to read-in an HTML form.
  * This class turns a form into a collection of beans plus an array
  * describing the desired associations.
  *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * (c) copyright G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community.
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */

RedBean/DependencyInjector.php

@@ -6,10 +6,10 @@
  * @description		A default dependency injector that can be subclassed to
  *					suit your needs.
  * 		
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * copyright (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  *

RedBean/Driver.php

@@ -6,11 +6,11 @@
  * @description		Describes the API for database classes
  *					The Driver API conforms to the ADODB pseudo standard
  *					for database drivers.
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
  *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * copyright (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */

RedBean/Driver/PDO.php

@@ -4,12 +4,11 @@
  * @file			RedBean/PDO.php
  * @description		PDO Driver
  *					This Driver implements the RedBean Driver API
- * @author			Desfrenes
- * @author			G.J.G.T. de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community, Desfrenes
+ * @license			BSD/GPLv2
  *
  *
- * (c) Desfrenes & Gabor de Mooij
+ * (c) copyright Desfrenes & Gabor de Mooij and the RedBeanPHP community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  *
@@ -103,7 +102,7 @@ public function __construct($dsn, $user = null, $pass = null) {
 			$this->dsn = $this->getDatabaseType();
 		} else {
 			$this->dsn = $dsn;
-			$this->connectInfo = array( "pass"=>$pass, "user"=>$user );
+			$this->connectInfo = array( 'pass'=>$pass, 'user'=>$user );
 		}
 	}
 
@@ -118,8 +117,8 @@ public function __construct($dsn, $user = null, $pass = null) {
 	 */
 	public function connect() {
 		if ($this->isConnected) return;
-		$user = $this->connectInfo["user"];
-		$pass = $this->connectInfo["pass"];
+		$user = $this->connectInfo['user'];
+		$pass = $this->connectInfo['pass'];
 		//PDO::MYSQL_ATTR_INIT_COMMAND
 		$this->pdo = new PDO(
 				  $this->dsn,
@@ -193,7 +192,7 @@ protected function runQuery($sql,$aValues) {
 			$this->logger->log($sql, $aValues);
 		}
 		try {
-			if (strpos("pgsql",$this->dsn)===0) {
+			if (strpos('pgsql',$this->dsn)===0) {
 				$s = $this->pdo->prepare($sql, array(PDO::PGSQL_ATTR_DISABLE_NATIVE_PREPARED_STATEMENT => true));
 			}
 			else {

RedBean/Exception.php

@@ -2,14 +2,14 @@
 /**
  * RedBean Exception Base
  *
- * @file				RedBean/Exception.php
- * @description	Represents the base class
+ * @file			RedBean/Exception.php
+ * @description		Represents the base class
  * 					for RedBean Exceptions
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
  *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * copyright (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */

RedBean/Exception/SQL.php

@@ -5,11 +5,11 @@
  * @file			RedBean/Exception/SQL.php
  * @description		Represents a generic database exception independent of the
  *					underlying driver.
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
  *
- * (c) G.J.G.T. (Gabor) de Mooij
+ * (c) copyright G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community.
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */

RedBean/Exception/Security.php

@@ -5,11 +5,11 @@
  *
  * @file			RedBean/Exception
  * @description		Represents a subtype in the RedBean Exception System.
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
  *
- * (c) G.J.G.T. (Gabor) de Mooij
+ * (c) copyright G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community.
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */

RedBean/ExtAssociationManager.php

@@ -1,13 +1,13 @@
 <?php
 /**
  * RedBean Extended Association
+ * 
  * @file			RedBean/ExtAssociationManager.php
  * @description		Manages complex bean associations.
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * @author			Gabor de Mooij
- * @license			BSD
- *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * copyright (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */

RedBean/Facade.php

@@ -6,11 +6,10 @@
  *					This class hides the object landscape of
  *					RedBeanPHP behind a single letter class providing
  *					almost all functionality with simple static calls.
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * @author			Gabor de Mooij
- * @license			BSD
- *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * copyright (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  *
@@ -74,7 +73,7 @@ class RedBean_Facade {
 	 * Holds the Key of the current database.
 	 * @var string
 	 */
-	public static $currentDB = "";
+	public static $currentDB = '';
 
 	/**
 	 * Holds reference to SQL Helper

RedBean/IBeanHelper.php

@@ -6,10 +6,10 @@
  * @description		Interface for Bean Helper.
  *					A little bolt that glues the whole machinery together.
  * 		
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * copyright (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  *

RedBean/IModelFormatter.php

@@ -2,13 +2,14 @@
 /**
  * RedBean interface for Model Formatting - Part of FUSE
  * 
- * @name 		RedBean IModelFormatter
- * @file 		RedBean/ModelFormatter.php
- * @author 		Gabor de Mooij
- * @license 	BSD
+ * @file			RedBean/ModelFormatter.php
+ * @description 	RedBean IModelFormatter
  *
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ *
+ * copyright (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  */

RedBean/ModelHelper.php

@@ -6,10 +6,10 @@
  * @description		Connects beans to models, in essence 
  *					this is the core of so-called FUSE.
  * 		
- * @author			Gabor de Mooij
- * @license			BSD
+ * @author			Gabor de Mooij and the RedBeanPHP Community
+ * @license			BSD/GPLv2
  *
- * copyright (c) G.J.G.T. (Gabor) de Mooij
+ * copyright (c) G.J.G.T. (Gabor) de Mooij and the RedBeanPHP Community
  * This source file is subject to the BSD/GPLv2 License that is bundled
  * with this source code in the file license.txt.
  *