From bcf0110249978c8fc705916d5a4f94216bb98b07 Mon Sep 17 00:00:00 2001 From: romanb Date: Mon, 5 Jan 2009 17:25:56 +0000 Subject: [PATCH] replaced code driver with annotation driver using addendum. --- lib/Doctrine/Common/ClassMetadata.php | 139 ----- lib/Doctrine/Common/ClassMetadataFactory.php | 59 -- lib/Doctrine/Common/Events/Event.php | 2 +- lib/Doctrine/ORM/EntityManager.php | 2 +- .../ORM/Mapping/AssociationMapping.php | 2 +- lib/Doctrine/ORM/Mapping/ClassMetadata.php | 115 ++-- .../ORM/Mapping/ClassMetadataFactory.php | 29 +- .../ORM/Mapping/Driver/CodeDriver.php | 65 --- .../ORM/Mapping/Driver/addendum/LICENSE | 502 ++++++++++++++++++ .../Mapping/Driver/addendum/annotations.php | 335 ++++++++++++ .../annotations/annotation_parser.php | 335 ++++++++++++ .../addendum/annotations/doc_comment.php | 130 +++++ .../Persisters/AbstractEntityPersister.php | 4 +- lib/Doctrine/ORM/UnitOfWork.php | 1 + tests/models/cms/CmsArticle.php | 68 +-- tests/models/cms/CmsComment.php | 58 +- tests/models/cms/CmsPhonenumber.php | 43 +- tests/models/cms/CmsUser.php | 88 +-- tests/models/forum/ForumAdministrator.php | 15 +- tests/models/forum/ForumAvatar.php | 23 +- tests/models/forum/ForumBoard.php | 39 +- tests/models/forum/ForumCategory.php | 40 +- tests/models/forum/ForumEntry.php | 33 +- tests/models/forum/ForumUser.php | 66 +-- 24 files changed, 1530 insertions(+), 663 deletions(-) delete mode 100644 lib/Doctrine/Common/ClassMetadata.php delete mode 100644 lib/Doctrine/Common/ClassMetadataFactory.php delete mode 100644 lib/Doctrine/ORM/Mapping/Driver/CodeDriver.php create mode 100755 lib/Doctrine/ORM/Mapping/Driver/addendum/LICENSE create mode 100755 lib/Doctrine/ORM/Mapping/Driver/addendum/annotations.php create mode 100755 lib/Doctrine/ORM/Mapping/Driver/addendum/annotations/annotation_parser.php create mode 100755 lib/Doctrine/ORM/Mapping/Driver/addendum/annotations/doc_comment.php diff --git a/lib/Doctrine/Common/ClassMetadata.php b/lib/Doctrine/Common/ClassMetadata.php deleted file mode 100644 index 11fd5bae2..000000000 --- a/lib/Doctrine/Common/ClassMetadata.php +++ /dev/null @@ -1,139 +0,0 @@ - $className - */ - public function __construct($className) - { - $this->_entityName = $className; - } - - /** - * Adds metadata to a property of the class. - * - * @param string $fieldName - * @param array $fieldMetadata - */ - public function addFieldMetadata($fieldName, array $fieldMetadata) - { - $this->_fieldMetadata[$fieldName] = array_merge( - isset($this->_fieldMetadata[$fieldName]) ? $this->_fieldMetadata[$fieldName] : array(), - $fieldMetadata); - } - - /** - * - * - * @param $fieldName - * @param $metadata - */ - public function setFieldMetadata($fieldName, array $metadata) - { - $this->_fieldMetadata[$fieldName] = $metadata; - } - - /** - * - * @param $fieldName - * @param $metadataKey - * @param $value - */ - public function setFieldMetadataEntry($fieldName, $metadataKey, $value) - { - $this->_fieldMetadata[$fieldName][$metadataKey] = $value; - } - - /** - * Gets metadata of a property of the class. - * - * @param string $fieldName - * @param string $metadataKey - * @return mixed - */ - public function getFieldMetadata($fieldName) - { - return $this->_fieldMetadata[$fieldName]; - } - - /** - * - * @param $fieldName - * @param $metadataKey - * @return - */ - public function getFieldMetadataEntry($fieldName, $metadataKey) - { - return isset($this->_fieldMetadata[$fieldName][$metadataKey]) ? - $this->_fieldMetadata[$fieldName][$metadataKey] : null; - } - - /** - * Gets metadata of the class. - * - * @param string $metadataKey - * @return mixed - */ - public function getClassMetadata() - { - return $this->_classMetadata; - } - - /** - * - * - * @param $metadataKey - */ - public function getClassMetadataEntry($metadataKey) - { - return isset($this->_classMetadata[$metadataKey]) ? - $this->_classMetadata[$metadataKey] : null; - } - - /** - * Adds metadata to the class. - * - * @param array $classMetadata - */ - public function addClassMetadata(array $classMetadata) - { - $this->_classMetadata = array_merge($this->_classMetadata, $classMetadata); - } - - /** - * - * - * @param $metadata - */ - public function setClassMetadata(array $metadata) - { - $this->_classMetadata = $metadata; - } - - /** - * - * @param $metadataKey - * @param $value - */ - public function setClassMetadataEntry($metadataKey, $value) - { - $this->_classMetadata[$metadataKey] = $value; - } -} -?> diff --git a/lib/Doctrine/Common/ClassMetadataFactory.php b/lib/Doctrine/Common/ClassMetadataFactory.php deleted file mode 100644 index b714042e4..000000000 --- a/lib/Doctrine/Common/ClassMetadataFactory.php +++ /dev/null @@ -1,59 +0,0 @@ -_driver = $driver; - } - - /** - * Returns the metadata object for a class. - * - * @param string $className The name of the class. - * @return Doctrine_Metadata - */ - public function getMetadataFor($className) - { - if ( ! isset($this->_loadedMetadata[$className])) { - $this->_loadMetadata($className); - $this->_validateAndCompleteMetadata($className); - } - return $this->_loadedMetadata[$className]; - } - - /** - * Loads the metadata for the given class. - * - * @param $className - * @return - */ - protected function _loadMetadata($className) - { - $classMetadata = new Doctrine_Common_ClassMetadata(); - $this->_driver->loadMetadataForClass($className, $classMetadata); - return $classMetadata; - } - - /** Template method for subclasses */ - protected function _validateAndCompleteMetadata($className) - { /*empty*/ } -} -?> diff --git a/lib/Doctrine/Common/Events/Event.php b/lib/Doctrine/Common/Events/Event.php index 22a33ffa7..796f4a23d 100644 --- a/lib/Doctrine/Common/Events/Event.php +++ b/lib/Doctrine/Common/Events/Event.php @@ -19,7 +19,7 @@ * . */ -#namespace Doctrine::Common::Events; +#namespace Doctrine\Common\Events; /** * Doctrine_Event diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php index f0c22702e..ff15057e3 100644 --- a/lib/Doctrine/ORM/EntityManager.php +++ b/lib/Doctrine/ORM/EntityManager.php @@ -160,7 +160,7 @@ class Doctrine_ORM_EntityManager $this->_config = $config; $this->_eventManager = $eventManager; $this->_metadataFactory = new Doctrine_ORM_Mapping_ClassMetadataFactory( - new Doctrine_ORM_Mapping_Driver_CodeDriver(), + new Doctrine_ORM_Mapping_Driver_AnnotationDriver(), $this->_conn->getDatabasePlatform()); $this->_unitOfWork = new Doctrine_ORM_UnitOfWork($this); $this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE; diff --git a/lib/Doctrine/ORM/Mapping/AssociationMapping.php b/lib/Doctrine/ORM/Mapping/AssociationMapping.php index 27859e54f..624f68fdb 100644 --- a/lib/Doctrine/ORM/Mapping/AssociationMapping.php +++ b/lib/Doctrine/ORM/Mapping/AssociationMapping.php @@ -177,7 +177,7 @@ abstract class Doctrine_ORM_Mapping_AssociationMapping implements Serializable $this->_sourceEntityName = $mapping['sourceEntity']; if ( ! isset($mapping['targetEntity'])) { - throw Doctrine_MappingException::missingTargetEntity($mapping['fieldName']); + throw Doctrine_ORM_Exceptions_MappingException::missingTargetEntity($mapping['fieldName']); } $this->_targetEntityName = $mapping['targetEntity']; diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php index f910b9f9b..5b6a694d4 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php @@ -32,7 +32,7 @@ * @author Roman Borschel * @since 2.0 */ -class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata implements Serializable +class Doctrine_ORM_Mapping_ClassMetadata implements Serializable { /* The inheritance mapping types */ /** @@ -101,6 +101,9 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i */ const ENTITY_TYPE_MAPPED_SUPERCLASS = 'mappedSuperclass'; + /** The name of the entity class. */ + protected $_entityName; + /** * The name of the entity class that is at the root of the entity inheritance * hierarchy. If the entity is not part of an inheritance hierarchy this is the same @@ -243,10 +246,10 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i * Inheritance options. */ protected $_inheritanceOptions = array( - // JOINED & TABLE_PER_CLASS options + // JOINED & TABLE_PER_CLASS options 'discriminatorColumn' => null, 'discriminatorMap' => array(), - // JOINED options + // JOINED options 'joinSubclasses' => true ); @@ -321,7 +324,7 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i */ public function __construct($entityName) { - parent::__construct($entityName); + $this->_entityName = $entityName; $this->_rootEntityName = $entityName; $this->_reflectionClass = new ReflectionClass($entityName); $reflectionProps = $this->_reflectionClass->getProperties(); @@ -362,6 +365,10 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i return $this->_reflectionProperties[$name]; } + /** + * + * @return + */ public function getSingleIdReflectionProperty() { if ($this->_isIdentifierComposite) { @@ -451,38 +458,6 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i return false; } - /** - * Sets a table option. - */ - public function setTableOption($name, $value) - { - if ( ! array_key_exists($name, $this->_tableOptions)) { - throw new Doctrine_ClassMetadata_Exception("Unknown table option: '$name'."); - } - $this->_tableOptions[$name] = $value; - } - - /** - * Gets a table option. - */ - public function getTableOption($name) - { - if ( ! array_key_exists($name, $this->_tableOptions)) { - throw new Doctrine_ClassMetadata_Exception("Unknown table option: '$name'."); - } - return $this->_tableOptions[$name]; - } - - /** - * returns all table options. - * - * @return array all options and their values - */ - public function getTableOptions() - { - return $this->_tableOptions; - } - /** * Gets a column name for a field name. * If the column name for the field cannot be found, the given field name @@ -610,27 +585,13 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i return isset($this->_lcColumnToFieldNames[$lcColumnName]); } - /** - * Adds a field mapping. - * - * @param array $mapping - */ - public function mapField(array $mapping) - { - $mapping = $this->_validateAndCompleteFieldMapping($mapping); - if (isset($this->_fieldMappings[$mapping['fieldName']])) { - throw Doctrine_MappingException::duplicateFieldMapping(); - } - $this->_fieldMappings[$mapping['fieldName']] = $mapping; - } - /** * Validates & completes the field mapping. * * @param array $mapping The field mapping to validated & complete. * @return array The validated and completed field mapping. */ - private function _validateAndCompleteFieldMapping(array $mapping) + private function _validateAndCompleteFieldMapping(array &$mapping) { // Check mandatory fields if ( ! isset($mapping['fieldName'])) { @@ -658,7 +619,7 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i if (isset($mapping['idGenerator'])) { if ( ! $this->_isIdGeneratorType($mapping['idGenerator'])) { //TODO: check if the idGenerator specifies an existing generator by name - throw Doctrine_MappingException::invalidGeneratorType($mapping['generatorType']); + throw Doctrine_MappingException::invalidGeneratorType($mapping['idGenerator']); } else if (count($this->_identifier) > 1) { throw Doctrine_MappingException::generatorNotAllowedWithCompositeId(); } @@ -671,8 +632,11 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i $this->_isIdentifierComposite = true; } } + } + + private function _validateAndCompleteClassMapping(array &$mapping) + { - return $mapping; } /** @@ -761,10 +725,11 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i * Gets all field mappings. * * @return array + * @deprecated */ public function getFieldMappings() { - return $this->_fieldMappings; + return $this->_fieldMetadata; } /** @@ -953,7 +918,7 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i */ public function getTableName() { - return $this->getTableOption('tableName'); + return $this->_tableOptions['tableName']; } public function getInheritedFields() @@ -1085,13 +1050,13 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i */ private function _checkRequiredDiscriminatorOptions(array $options) { - if ( ! isset($options['discriminatorColumn'])) { - throw new Doctrine_ClassMetadata_Exception("Missing option 'discriminatorColumn'." + /*if ( ! isset($options['discriminatorColumn'])) { + throw new Doctrine_Exception("Missing option 'discriminatorColumn'." . " Inheritance types JOINED and SINGLE_TABLE require this option."); } else if ( ! isset($options['discriminatorMap'])) { throw new Doctrine_ClassMetadata_Exception("Missing option 'discriminatorMap'." . " Inheritance types JOINED and SINGLE_TABLE require this option."); - } + }*/ } /** @@ -1296,7 +1261,7 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i */ public function setTableName($tableName) { - $this->setTableOption('tableName', $tableName); + $this->_tableOptions['tableName'] = $tableName; } /** @@ -1380,6 +1345,20 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i $mapping['sourceEntity'] = $this->_entityName; return $mapping; } + + /** + * Adds a field mapping. + * + * @param array $mapping + */ + public function mapField(array $mapping) + { + $this->_validateAndCompleteFieldMapping($mapping); + if (isset($this->_fieldMappings[$mapping['fieldName']])) { + throw Doctrine_MappingException::duplicateFieldMapping(); + } + $this->_fieldMappings[$mapping['fieldName']] = $mapping; + } /** * Adds a one-to-one mapping. @@ -1464,10 +1443,6 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i */ public function setCustomRepositoryClass($repositoryClassName) { - if ( ! is_subclass_of($repositoryClassName, 'Doctrine\ORM\EntityRepository')) { - throw new Doctrine_ClassMetadata_Exception("The custom repository must be a subclass" - . " of Doctrine_EntityRepository."); - } $this->_customRepositoryClassName = $repositoryClassName; } @@ -1499,10 +1474,10 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i * Binding an Entity to a specific EntityManager in 2.0 is the same as binding * it to a Connection in 1.0. */ - public function bindToEntityManager($emName) + /*public function bindToEntityManager($emName) { - } + }*/ /** * Dispatches the lifecycle event of the given Entity to the registered @@ -1594,6 +1569,16 @@ class Doctrine_ORM_Mapping_ClassMetadata extends Doctrine_Common_ClassMetadata i return false; } + public function setDiscriminatorColumn($columnDef) + { + $this->_inheritanceOptions['discriminatorColumn'] = $columnDef; + } + + public function setDiscriminatorMap(array $map) + { + $this->_inheritanceOptions['discriminatorMap'] = $map; + } + public function isDiscriminatorColumn($columnName) { return $columnName === $this->_inheritanceOptions['discriminatorColumn']; diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 2532d155b..a09f53012 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -32,14 +32,14 @@ * @author Roman Borschel * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @version $Revision$ - * @link www.phpdoctrine.org + * @link www.doctrine-project.org * @since 2.0 - * @todo Rename to ClassDescriptorFactory. */ -class Doctrine_ORM_Mapping_ClassMetadataFactory extends Doctrine_Common_ClassMetadataFactory +class Doctrine_ORM_Mapping_ClassMetadataFactory { /** The targeted database platform. */ private $_targetPlatform; + private $_driver; /** * Constructor. @@ -49,9 +49,23 @@ class Doctrine_ORM_Mapping_ClassMetadataFactory extends Doctrine_Common_ClassMet */ public function __construct($driver, Doctrine_DBAL_Platforms_AbstractPlatform $targetPlatform) { - parent::__construct($driver); + $this->_driver = $driver; $this->_targetPlatform = $targetPlatform; } + + /** + * Returns the metadata object for a class. + * + * @param string $className The name of the class. + * @return Doctrine_Metadata + */ + public function getMetadataFor($className) + { + if ( ! isset($this->_loadedMetadata[$className])) { + $this->_loadMetadata($className); + } + return $this->_loadedMetadata[$className]; + } /** * Loads the metadata of the class in question and all it's ancestors whose metadata @@ -59,11 +73,9 @@ class Doctrine_ORM_Mapping_ClassMetadataFactory extends Doctrine_Common_ClassMet * * @param string $name The name of the class for which the metadata should get loaded. * @param array $tables The metadata collection to which the loaded metadata is added. - * @override */ protected function _loadMetadata($name) { - $parentClass = $name; $parentClasses = array(); $loadedParentClass = false; @@ -114,7 +126,6 @@ class Doctrine_ORM_Mapping_ClassMetadataFactory extends Doctrine_Common_ClassMet * * @param Doctrine::ORM::Mapping::ClassMetadata $subClass * @param Doctrine::ORM::Mapping::ClassMetadata $parentClass - * @return void */ private function _addInheritedFields($subClass, $parentClass) { @@ -162,10 +173,6 @@ class Doctrine_ORM_Mapping_ClassMetadataFactory extends Doctrine_Common_ClassMet $names[] = $className; } while ($className = get_parent_class($className)); - /*if ($className === false) { - throw new Doctrine_Exception("Unknown component '$className'."); - }*/ - // save parents $class->setParentClasses($names); diff --git a/lib/Doctrine/ORM/Mapping/Driver/CodeDriver.php b/lib/Doctrine/ORM/Mapping/Driver/CodeDriver.php deleted file mode 100644 index a57654955..000000000 --- a/lib/Doctrine/ORM/Mapping/Driver/CodeDriver.php +++ /dev/null @@ -1,65 +0,0 @@ -. - */ - -#namespace Doctrine\ORM\Mapping\Driver; - -/** - * The code metadata driver loads the metadata of the classes through invoking - * a static callback method that needs to be implemented when using this driver. - * - * @author Konsta Vesterinen - * @author Roman Borschel - * @license http://www.opensource.org/licenses/lgpl-license.php LGPL - * @version $Revision$ - * @link www.phpdoctrine.org - * @since 2.0 - */ -class Doctrine_ORM_Mapping_Driver_CodeDriver -{ - /** - * Name of the callback method. - * - * @todo We could make the name of the callback methods customizable for users. - */ - private $_callback = 'initMetadata'; - - public function setCallback($callback) - { - $this->_callback = $callback; - } - - public function getCallback() - { - return $this->_callback; - } - - /** - * Loads the metadata for the specified class into the provided container. - */ - public function loadMetadataForClass($className, Doctrine_ORM_Mapping_ClassMetadata $metadata) - { - if ( ! method_exists($className, $this->_callback)) { - throw new Doctrine_Exception("Unable to load metadata for class" - . " '$className'. Callback method 'initMetadata' not found."); - } - call_user_func_array(array($className, $this->_callback), array($metadata)); - } -} \ No newline at end of file diff --git a/lib/Doctrine/ORM/Mapping/Driver/addendum/LICENSE b/lib/Doctrine/ORM/Mapping/Driver/addendum/LICENSE new file mode 100755 index 000000000..4a1f72014 --- /dev/null +++ b/lib/Doctrine/ORM/Mapping/Driver/addendum/LICENSE @@ -0,0 +1,502 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! diff --git a/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations.php b/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations.php new file mode 100755 index 000000000..3c41474d2 --- /dev/null +++ b/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations.php @@ -0,0 +1,335 @@ + + + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + **/ + + require_once(dirname(__FILE__).'/annotations/annotation_parser.php'); + + class Annotation { + public $value; + + public final function __construct($data, $target) { + $reflection = new ReflectionClass($this); + foreach($data as $key => $value) { + if($reflection->hasProperty($key)) { + $this->$key = $value; + } else { + $class = $reflection->getName(); + trigger_error("Property '$key' not defined for annotation '$class'"); + } + } + $this->checkTargetConstraints($target); + $this->checkConstraints($target); + } + + private function checkTargetConstraints($target) { + $reflection = new ReflectionAnnotatedClass($this); + if($reflection->hasAnnotation('Target')) { + $value = $reflection->getAnnotation('Target')->value; + $values = is_array($value) ? $value : array($value); + foreach($values as $value) { + if($value == 'class' && $target instanceof ReflectionClass) return; + if($value == 'method' && $target instanceof ReflectionMethod) return; + if($value == 'property' && $target instanceof ReflectionProperty) return; + } + trigger_error("Annotation '".get_class($this)."' not allowed on ".$this->createName($target), E_USER_ERROR); + } + } + + private function createName($target) { + if($target instanceof ReflectionMethod) { + return $target->getDeclaringClass()->getName().'::'.$target->getName(); + } elseif($target instanceof ReflectionProperty) { + return $target->getDeclaringClass()->getName().'::$'.$target->getName(); + } else { + return $target->getName(); + } + } + + protected function checkConstraints($target) {} + } + + class Target extends Annotation {} + + class AnnotationsBuilder { + private static $cache = array(); + + public function build($targetReflection) { + $data = $this->parse($targetReflection); + $annotations = array(); + foreach($data as $class => $parameters) { + if(Addendum::parses($class)) { + foreach($parameters as $params) { + $annotationReflection = new ReflectionClass($class); + $annotations[$class][] = $annotationReflection->newInstance($params, $targetReflection); + } + } + } + return $annotations; + } + + private function parse($reflection) { + $key = $this->createName($reflection); + if(!isset(self::$cache[$key])) { + $parser = new AnnotationsMatcher; + $parser->matches($this->getDocComment($reflection), $data); + self::$cache[$key] = $data; + } + return self::$cache[$key]; + } + + private function createName($target) { + if($target instanceof ReflectionMethod) { + return $target->getDeclaringClass()->getName().'::'.$target->getName(); + } elseif($target instanceof ReflectionProperty) { + return $target->getDeclaringClass()->getName().'::$'.$target->getName(); + } else { + return $target->getName(); + } + } + + protected function getDocComment($reflection) { + return Addendum::getDocComment($reflection); + } + + public static function clearCache() { + self::$cache = array(); + } + } + + class ReflectionAnnotatedClass extends ReflectionClass { + private $annotations; + + public function __construct($class) { + parent::__construct($class); + $this->annotations = $this->createAnnotationBuilder()->build($this); + } + + public function hasAnnotation($annotation) { + return isset($this->annotations[$annotation]); + } + + public function getAnnotation($annotation) { + return $this->hasAnnotation($annotation) ? end($this->annotations[$annotation]) : false; + } + + public function getAnnotations() { + $result = array(); + foreach($this->annotations as $instances) { + $result[] = end($instances); + } + return $result; + } + + public function getAllAnnotations($restriction = false) { + $result = array(); + foreach($this->annotations as $class => $instances) { + if(!$restriction || $restriction == $class) { + $result = array_merge($result, $instances); + } + } + return $result; + } + + public function getConstructor() { + return $this->createReflectionAnnotatedMethod(parent::getConstructor()); + } + + public function getMethod($name) { + return $this->createReflectionAnnotatedMethod(parent::getMethod($name)); + } + + public function getMethods($filter = -1) { + $result = array(); + foreach(parent::getMethods($filter) as $method) { + $result[] = $this->createReflectionAnnotatedMethod($method); + } + return $result; + } + + public function getProperty($name) { + return $this->createReflectionAnnotatedProperty(parent::getProperty($name)); + } + + public function getProperties($filter = -1) { + $result = array(); + foreach(parent::getProperties($filter) as $property) { + $result[] = $this->createReflectionAnnotatedProperty($property); + } + return $result; + } + + public function getInterfaces() { + $result = array(); + foreach(parent::getInterfaces() as $interface) { + $result[] = $this->createReflectionAnnotatedClass($interface); + } + return $result; + } + + public function getParentClass() { + $class = parent::getParentClass(); + return $this->createReflectionAnnotatedClass($class); + } + + protected function createAnnotationBuilder() { + return new AnnotationsBuilder(); + } + + private function createReflectionAnnotatedClass($class) { + return ($class !== false) ? new ReflectionAnnotatedClass($class->getName()) : false; + } + + private function createReflectionAnnotatedMethod($method) { + return ($method !== null) ? new ReflectionAnnotatedMethod($this->getName(), $method->getName()) : null; + } + + private function createReflectionAnnotatedProperty($property) { + return ($property !== null) ? new ReflectionAnnotatedProperty($this->getName(), $property->getName()) : null; + } + } + + class ReflectionAnnotatedMethod extends ReflectionMethod { + private $annotations; + + public function __construct($class, $name) { + parent::__construct($class, $name); + $this->annotations = $this->createAnnotationBuilder()->build($this); + } + + public function hasAnnotation($annotation) { + return isset($this->annotations[$annotation]); + } + + public function getAnnotation($annotation) { + return ($this->hasAnnotation($annotation)) ? end($this->annotations[$annotation]) : false; + } + + public function getAnnotations() { + $result = array(); + foreach($this->annotations as $instances) { + $result[] = end($instances); + } + return $result; + } + + public function getAllAnnotations($restriction = false) { + $result = array(); + foreach($this->annotations as $class => $instances) { + if(!$restriction || $restriction == $class) { + $result = array_merge($result, $instances); + } + } + return $result; + } + + public function getDeclaringClass() { + $class = parent::getDeclaringClass(); + return new ReflectionAnnotatedClass($class->getName()); + } + + protected function createAnnotationBuilder() { + return new AnnotationsBuilder(); + } + } + + class ReflectionAnnotatedProperty extends ReflectionProperty { + private $annotations; + + public function __construct($class, $name) { + parent::__construct($class, $name); + $this->annotations = $this->createAnnotationBuilder()->build($this); + } + + public function hasAnnotation($annotation) { + return isset($this->annotations[$annotation]); + } + + public function getAnnotation($annotation) { + return ($this->hasAnnotation($annotation)) ? end($this->annotations[$annotation]) : false; + } + + public function getAnnotations() { + $result = array(); + foreach($this->annotations as $instances) { + $result[] = end($instances); + } + return $result; + } + + public function getAllAnnotations($restriction = false) { + $result = array(); + foreach($this->annotations as $class => $instances) { + if(!$restriction || $restriction == $class) { + $result = array_merge($result, $instances); + } + } + return $result; + } + + public function getDeclaringClass() { + $class = parent::getDeclaringClass(); + return new ReflectionAnnotatedClass($class->getName()); + } + + protected function createAnnotationBuilder() { + return new AnnotationsBuilder(); + } + } + + class Addendum { + private static $rawMode; + private static $parsedAnnotations; + + public static function getDocComment($reflection) { + if(self::checkRawDocCommentParsingNeeded()) { + $docComment = new DocComment(); + return $docComment->get($reflection); + } else { + return $reflection->getDocComment(); + } + } + + /** Raw mode test */ + private static function checkRawDocCommentParsingNeeded() { + if(self::$rawMode === null) { + $reflection = new ReflectionClass('Addendum'); + $method = $reflection->getMethod('checkRawDocCommentParsingNeeded'); + self::setRawMode($method->getDocComment() === false); + } + return self::$rawMode; + } + + public static function setRawMode($enabled = true) { + if($enabled) { + require_once(dirname(__FILE__).'/annotations/doc_comment.php'); + } + self::$rawMode = $enabled; + } + + public static function setParsedAnnotations(array $annotations) { + self::$parsedAnnotations = array_combine($annotations, array_fill(0, count($annotations), true)); + } + + public static function parses($annotation) { + return isset(self::$parsedAnnotations[$annotation]); + } + } + diff --git a/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations/annotation_parser.php b/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations/annotation_parser.php new file mode 100755 index 000000000..a951ceaff --- /dev/null +++ b/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations/annotation_parser.php @@ -0,0 +1,335 @@ + + + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + **/ + + class CompositeMatcher { + protected $matchers = array(); + private $wasConstructed = false; + + public function add($matcher) { + $this->matchers[] = $matcher; + } + + public function matches($string, &$value) { + if(!$this->wasConstructed) { + $this->build(); + $this->wasConstructed = true; + } + return $this->match($string, $value); + } + + protected function build() {} + } + + class ParallelMatcher extends CompositeMatcher { + protected function match($string, &$value) { + $maxLength = false; + $result = null; + foreach($this->matchers as $matcher) { + $length = $matcher->matches($string, $subvalue); + if($maxLength === false || $length > $maxLength) { + $maxLength = $length; + $result = $subvalue; + } + } + $value = $this->process($result); + return $maxLength; + } + + protected function process($value) { + return $value; + } + } + + class SerialMatcher extends CompositeMatcher { + protected function match($string, &$value) { + $results = array(); + $total_length = 0; + foreach($this->matchers as $matcher) { + if(($length = $matcher->matches($string, $result)) === false) return false; + $total_length += $length; + $results[] = $result; + $string = substr($string, $length); + } + $value = $this->process($results); + return $total_length; + } + + protected function process($results) { + return implode('', $results); + } + } + + class SimpleSerialMatcher extends SerialMatcher { + private $return_part_index; + + public function __construct($return_part_index = 0) { + $this->return_part_index = $return_part_index; + } + + public function process($parts) { + return $parts[$this->return_part_index]; + } + } + + class RegexMatcher { + private $regex; + + public function __construct($regex) { + $this->regex = $regex; + } + + public function matches($string, &$value) { + if(preg_match("/^{$this->regex}/", $string, $matches)) { + $value = $this->process($matches); + return strlen($matches[0]); + } + $value = false; + return false; + } + + protected function process($matches) { + return $matches[0]; + } + } + + class AnnotationsMatcher { + public function matches($string, &$annotations) { + $annotations = array(); + $annotation_matcher = new AnnotationMatcher; + while(true) { + if(preg_match('/\s(?=@)/', $string, $matches, PREG_OFFSET_CAPTURE)) { + $offset = $matches[0][1] + 1; + $string = substr($string, $offset); + } else { + return; // no more annotations + } + if(($length = $annotation_matcher->matches($string, $data)) !== false) { + $string = substr($string, $length); + list($name, $params) = $data; + $annotations[$name][] = $params; + } + } + } + } + + class AnnotationMatcher extends SerialMatcher { + protected function build() { + $this->add(new RegexMatcher('@')); + $this->add(new RegexMatcher('[A-Z][a-zA-Z0-9_]+')); + $this->add(new AnnotationParametersMatcher); + } + + protected function process($results) { + return array($results[1], $results[2]); + } + } + + class ConstantMatcher extends RegexMatcher { + private $constant; + + public function __construct($regex, $constant) { + parent::__construct($regex); + $this->constant = $constant; + } + + protected function process($matches) { + return $this->constant; + } + } + + class AnnotationParametersMatcher extends ParallelMatcher { + protected function build() { + $this->add(new ConstantMatcher('', array())); + $this->add(new ConstantMatcher('\(\)', array())); + $params_matcher = new SimpleSerialMatcher(1); + $params_matcher->add(new RegexMatcher('\(\s*')); + $params_matcher->add(new AnnotationValuesMatcher); + $params_matcher->add(new RegexMatcher('\s*\)')); + $this->add($params_matcher); + } + } + + class AnnotationValuesMatcher extends ParallelMatcher { + protected function build() { + $this->add(new AnnotationTopValueMatcher); + $this->add(new AnnotationHashMatcher); + } + } + + class AnnotationTopValueMatcher extends AnnotationValueMatcher { + protected function process($value) { + return array('value' => $value); + } + } + + class AnnotationValueMatcher extends ParallelMatcher { + protected function build() { + $this->add(new ConstantMatcher('true', true)); + $this->add(new ConstantMatcher('false', false)); + $this->add(new ConstantMatcher('TRUE', true)); + $this->add(new ConstantMatcher('FALSE', false)); + $this->add(new AnnotationStringMatcher); + $this->add(new AnnotationNumberMatcher); + $this->add(new AnnotationArrayMatcher); + } + } + + class AnnotationKeyMatcher extends ParallelMatcher { + protected function build() { + $this->add(new RegexMatcher('[a-zA-Z][a-zA-Z0-9_]*')); + $this->add(new AnnotationStringMatcher); + $this->add(new AnnotationIntegerMatcher); + } + } + + class AnnotationPairMatcher extends SerialMatcher { + protected function build() { + $this->add(new AnnotationKeyMatcher); + $this->add(new RegexMatcher('\s*=\s*')); + $this->add(new AnnotationValueMatcher); + } + + protected function process($parts) { + return array($parts[0] => $parts[2]); + } + } + + class AnnotationHashMatcher extends ParallelMatcher { + protected function build() { + $this->add(new AnnotationPairMatcher); + $this->add(new AnnotationMorePairsMatcher); + } + } + + class AnnotationMorePairsMatcher extends SerialMatcher { + protected function build() { + $this->add(new AnnotationPairMatcher); + $this->add(new RegexMatcher('\s*,\s*')); + $this->add(new AnnotationHashMatcher); + } + + protected function match($string, &$value) { + $result = parent::match($string, $value); + return $result; + } + + public function process($parts) { + return array_merge($parts[0], $parts[2]); + } + } + + class AnnotationArrayMatcher extends ParallelMatcher { + protected function build() { + $this->add(new ConstantMatcher('{}', array())); + $values_matcher = new SimpleSerialMatcher(1); + $values_matcher->add(new RegexMatcher('\s*{\s*')); + $values_matcher->add(new AnnotationArrayValuesMatcher); + $values_matcher->add(new RegexMatcher('\s*}\s*')); + $this->add($values_matcher); + } + } + + class AnnotationArrayValuesMatcher extends ParallelMatcher { + protected function build() { + $this->add(new AnnotationArrayValueMatcher); + $this->add(new AnnotationMoreValuesMatcher); + } + } + + class AnnotationMoreValuesMatcher extends SimpleSerialMatcher { + protected function build() { + $this->add(new AnnotationArrayValueMatcher); + $this->add(new RegexMatcher('\s*,\s*')); + $this->add(new AnnotationArrayValuesMatcher); + } + + protected function match($string, &$value) { + $result = parent::match($string, $value); + return $result; + } + + public function process($parts) { + return array_merge($parts[0], $parts[2]); + } + } + + class AnnotationArrayValueMatcher extends ParallelMatcher { + protected function build() { + $this->add(new AnnotationValueInArrayMatcher); + $this->add(new AnnotationPairMatcher); + } + } + + class AnnotationValueInArrayMatcher extends AnnotationValueMatcher { + public function process($value) { + return array($value); + } + } + + class AnnotationStringMatcher extends ParallelMatcher { + protected function build() { + $this->add(new AnnotationSingleQuotedStringMatcher); + $this->add(new AnnotationDoubleQuotedStringMatcher); + } + } + + class AnnotationNumberMatcher extends RegexMatcher { + public function __construct() { + parent::__construct("-?[0-9]*\.?[0-9]*"); + } + + protected function process($matches) { + $isFloat = strpos($matches[0], '.') !== false; + return $isFloat ? (float) $matches[0] : (int) $matches[0]; + } + } + + class AnnotationIntegerMatcher extends RegexMatcher { + public function __construct() { + parent::__construct("-?[0-9]*"); + } + + protected function process($matches) { + return (int) $matches[0]; + } + } + + class AnnotationSingleQuotedStringMatcher extends RegexMatcher { + public function __construct() { + parent::__construct("'([^']*)'"); + } + + protected function process($matches) { + return $matches[1]; + } + } + + class AnnotationDoubleQuotedStringMatcher extends RegexMatcher { + public function __construct() { + parent::__construct('"([^"]*)"'); + } + + protected function process($matches) { + return $matches[1]; + } + } +?> diff --git a/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations/doc_comment.php b/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations/doc_comment.php new file mode 100755 index 000000000..169c9b038 --- /dev/null +++ b/lib/Doctrine/ORM/Mapping/Driver/addendum/annotations/doc_comment.php @@ -0,0 +1,130 @@ +forClass($reflection); + } elseif($reflection instanceof ReflectionMethod) { + return $this->forMethod($reflection); + } elseif($reflection instanceof ReflectionProperty) { + return $this->forProperty($reflection); + } + } + + public function forClass($reflection) { + $this->process($reflection->getFileName()); + $name = $reflection->getName(); + return isset(self::$classes[$name]) ? self::$classes[$name] : false; + } + + public function forMethod($reflection) { + $this->process($reflection->getDeclaringClass()->getFileName()); + $class = $reflection->getDeclaringClass()->getName(); + $method = $reflection->getName(); + return isset(self::$methods[$class][$method]) ? self::$methods[$class][$method] : false; + } + + public function forProperty($reflection) { + $this->process($reflection->getDeclaringClass()->getFileName()); + $class = $reflection->getDeclaringClass()->getName(); + $field = $reflection->getName(); + return isset(self::$fields[$class][$field]) ? self::$fields[$class][$field] : false; + } + + private function process($file) { + if(!isset(self::$parsedFiles[$file])) { + $this->parse($file); + self::$parsedFiles[$file] = true; + } + } + + protected function parse($file) { + $tokens = $this->getTokens($file); + $currentClass = false; + $currentBlock = false; + $max = count($tokens); + $i = 0; + while($i < $max) { + $token = $tokens[$i]; + if(is_array($token)) { + list($code, $value) = $token; + switch($code) { + case T_DOC_COMMENT: + $comment = $value; + break; + + case T_CLASS: + $class = $this->getString($tokens, $i, $max); + if($comment !== false) { + self::$classes[$class] = $comment; + $comment = false; + } + break; + + case T_VARIABLE: + if($comment !== false) { + $field = substr($token[1], 1); + self::$fields[$class][$field] = $comment; + $comment = false; + } + break; + + case T_FUNCTION: + if($comment !== false) { + $function = $this->getString($tokens, $i, $max); + self::$methods[$class][$function] = $comment; + $comment = false; + } + + break; + + // ignore + case T_WHITESPACE: + case T_PUBLIC: + case T_PROTECTED: + case T_PRIVATE: + case T_ABSTRACT: + case T_FINAL: + case T_VAR: + break; + + default: + $comment = false; + break; + } + } else { + $comment = false; + } + $i++; + } + } + + private function getString($tokens, &$i, $max) { + do { + $token = $tokens[$i]; + $i++; + if(is_array($token)) { + if($token[0] == T_STRING) { + return $token[1]; + } + } + } while($i <= $max); + return false; + } + + private function getTokens($file) { + return token_get_all(file_get_contents($file)); + } + } +?> \ No newline at end of file diff --git a/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php b/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php index f029832a7..9a92ae55a 100644 --- a/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/AbstractEntityPersister.php @@ -82,7 +82,6 @@ abstract class Doctrine_ORM_Persisters_AbstractEntityPersister $this->_entityName = $classMetadata->getClassName(); $this->_conn = $em->getConnection(); $this->_classMetadata = $classMetadata; - //$this->_nullObject = Doctrine_ORM_Internal_Null::$INSTANCE; } /** @@ -251,7 +250,6 @@ abstract class Doctrine_ORM_Persisters_AbstractEntityPersister //echo "NOT TO-ONE OR INVERSE!"; continue; } - foreach ($assocMapping->getSourceToTargetKeyColumns() as $sourceColumn => $targetColumn) { //TODO: What if both join columns (local/foreign) are just db-only // columns (no fields in models) ? Currently we assume the foreign column @@ -281,7 +279,7 @@ abstract class Doctrine_ORM_Persisters_AbstractEntityPersister $newVal, $this->_em->getConnection()->getDatabasePlatform());*/ } - // populates the discriminator column on insert in Single & Class Table Inheritance + // Populate the discriminator column on insert in Single & Class Table Inheritance if ($isInsert && ($this->_classMetadata->isInheritanceTypeJoined() || $this->_classMetadata->isInheritanceTypeSingleTable())) { $discColumn = $this->_classMetadata->getInheritanceOption('discriminatorColumn'); diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 0f468e59a..9266df4c0 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -904,6 +904,7 @@ class Doctrine_ORM_UnitOfWork $class = $this->_em->getClassMetadata(get_class($entity)); foreach ($class->getAssociationMappings() as $assocMapping) { if ( ! $assocMapping->isCascadeSave()) { + echo "NOT cascade " . $assocMapping->getSourceFieldName(); continue; } $relatedEntities = $class->getReflectionProperty($assocMapping->getSourceFieldName()) diff --git a/tests/models/cms/CmsArticle.php b/tests/models/cms/CmsArticle.php index 91d8410c8..7496481e7 100755 --- a/tests/models/cms/CmsArticle.php +++ b/tests/models/cms/CmsArticle.php @@ -1,58 +1,32 @@ mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'id' => true, - 'idGenerator' => 'auto' - )); - $mapping->mapField(array( - 'fieldName' => 'topic', - 'type' => 'string', - 'length' => 255 - )); - $mapping->mapField(array( - 'fieldName' => 'text', - 'type' => 'string' - )); - $mapping->mapField(array( - 'fieldName' => 'user_id', - 'type' => 'integer' - )); - - $mapping->mapOneToMany(array( - 'fieldName' => 'comments', - 'targetEntity' => 'CmsComment', - 'mappedBy' => 'article' - )); - - $mapping->mapManyToOne(array( - 'fieldName' => 'user', - 'targetEntity' => 'CmsUser', - 'joinColumns' => array('user_id' => 'id') - )); - } } diff --git a/tests/models/cms/CmsComment.php b/tests/models/cms/CmsComment.php index f1c5c7db3..2a8863cfc 100755 --- a/tests/models/cms/CmsComment.php +++ b/tests/models/cms/CmsComment.php @@ -1,50 +1,28 @@ mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'id' => true, - 'generatorType' => 'auto' - )); - $mapping->mapField(array( - 'fieldName' => 'topic', - 'type' => 'string', - 'length' => 255 - )); - $mapping->mapField(array( - 'fieldName' => 'text', - 'type' => 'string' - )); - $mapping->mapField(array( - 'fieldName' => 'article_id', - 'type' => 'integer' - )); - - $mapping->mapManyToOne(array( - 'fieldName' => 'article', - 'targetEntity' => 'CmsArticle', - 'joinColumns' => array('article_id' => 'id') - )); - } } diff --git a/tests/models/cms/CmsPhonenumber.php b/tests/models/cms/CmsPhonenumber.php index 62cd707eb..ad8f01eb6 100755 --- a/tests/models/cms/CmsPhonenumber.php +++ b/tests/models/cms/CmsPhonenumber.php @@ -1,32 +1,17 @@ mapField(array( - 'fieldName' => 'user_id', - 'type' => 'integer' - )); - $mapping->mapField(array( - 'fieldName' => 'phonenumber', - 'type' => 'string', - 'length' => 50, - 'id' => true - )); - - $mapping->mapManyToOne(array( - 'fieldName' => 'user', - 'targetEntity' => 'CmsUser', - 'joinColumns' => array('user_id' => 'id') - )); - } +/** + * @DoctrineEntity + */ +class CmsPhonenumber implements Doctrine_ORM_Entity +{ + /** + * @DoctrineColumn(type="string", length=50) + * @DoctrineId + */ + public $phonenumber; + /** + * @DoctrineManyToOne(targetEntity="CmsUser", joinColumns={"user_id" = "id"}) + */ + public $user; } diff --git a/tests/models/cms/CmsUser.php b/tests/models/cms/CmsUser.php index 81ecb44b1..6e0e993cc 100644 --- a/tests/models/cms/CmsUser.php +++ b/tests/models/cms/CmsUser.php @@ -2,77 +2,35 @@ #namespace Doctrine\Tests\ORM\Models\Cms; -#use Doctrine\ORM\Entity; -#use Doctrine\Common\VirtualPropertySystem; - +/** + * @DoctrineEntity + */ class CmsUser { + /** + * @DoctrineId + * @DoctrineColumn(type="integer") + * @DoctrineIdGenerator("auto") + */ public $id; + /** + * @DoctrineColumn(type="string", length=50) + */ public $status; + /** + * @DoctrineColumn(type="string", length=255) + */ public $username; + /** + * @DoctrineColumn(type="string", length=255) + */ public $name; + /** + * @DoctrineOneToMany(targetEntity="CmsPhonenumber", mappedBy="user") + */ public $phonenumbers; + /** + * @DoctrineOneToMany(targetEntity="CmsArticle", mappedBy="user") + */ public $articles; - - /*static function construct() { - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'id', 'int'); - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'status', 'int'); - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'username', 'string'); - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'name', 'string'); - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'phonenumbers', 'CmsPhonenumber'); - Doctrine_Common_VirtualPropertySystem::register(__CLASS__, 'articles', 'CmsArticle'); - }*/ - - public static function initMetadata($mapping) - { - /* NEW - $mapping->addFieldMetadata('id', array( - 'doctrine.id' => true, 'doctrine.idGenerator' => 'auto' - )); - $mapping->addFieldMetadata('status', array( - 'doctrine.length' => 50 - )); - $mapping->addFieldMetadata('phonenumbers', array( - 'doctrine.oneToMany' => array('mappedBy' => 'user') - )); - $mapping->addFieldMetadata('articles', array( - 'doctrine.oneToMany' => array('mappedBy' => 'user') - )); - */ - - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'id' => true, - 'idGenerator' => 'auto' - )); - $mapping->mapField(array( - 'fieldName' => 'status', - 'type' => 'string', - 'length' => 50 - )); - $mapping->mapField(array( - 'fieldName' => 'username', - 'type' => 'string', - 'length' => 255 - )); - $mapping->mapField(array( - 'fieldName' => 'name', - 'type' => 'string', - 'length' => 255 - )); - - $mapping->mapOneToMany(array( - 'fieldName' => 'phonenumbers', - 'targetEntity' => 'CmsPhonenumber', - 'mappedBy' => 'user' - )); - - $mapping->mapOneToMany(array( - 'fieldName' => 'articles', - 'targetEntity' => 'CmsArticle', - 'mappedBy' => 'user' - )); - - } } diff --git a/tests/models/forum/ForumAdministrator.php b/tests/models/forum/ForumAdministrator.php index 3eed11623..9e0d4e22d 100644 --- a/tests/models/forum/ForumAdministrator.php +++ b/tests/models/forum/ForumAdministrator.php @@ -2,16 +2,13 @@ #namespace Doctrine\Tests\Models\Forum; +/** + * @DoctrineEntity + */ class ForumAdministrator extends ForumUser { + /** + * @DoctrineColumn(type="integer", name="access_level") + */ public $accessLevel; - - public static function initMetadata($mapping) - { - $mapping->mapField(array( - 'fieldName' => 'accessLevel', - 'columnName' => 'access_level', - 'type' => 'integer' - )); - } } \ No newline at end of file diff --git a/tests/models/forum/ForumAvatar.php b/tests/models/forum/ForumAvatar.php index 0f3acc8fa..810c8df49 100644 --- a/tests/models/forum/ForumAvatar.php +++ b/tests/models/forum/ForumAvatar.php @@ -2,22 +2,15 @@ #namespace Doctrine\Tests\Models\Forum; -#use Doctrine\ORM\Entity; - +/** + * @DoctrineEntity + */ class ForumAvatar { + /** + * @DoctrineId + * @DoctrineColumn(type="integer") + * @DoctrineIdGenerator("auto") + */ public $id; - - public static function initMetadata($mapping) - { - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'id' => true, - 'idGenerator' => 'auto' - )); - } } - - -?> \ No newline at end of file diff --git a/tests/models/forum/ForumBoard.php b/tests/models/forum/ForumBoard.php index e47e0e367..e450e0635 100755 --- a/tests/models/forum/ForumBoard.php +++ b/tests/models/forum/ForumBoard.php @@ -2,32 +2,25 @@ #namespace Doctrine\Tests\Models\Forum; +/** + * Represents a board in a forum. + * + * @author robo + * @DoctrineEntity + */ class ForumBoard { + /** + * @DoctrineId + * @DoctrineColumn(type="integer") + */ public $id; + /** + * @DoctrineColumn(type="integer") + */ public $position; + /** + * @DoctrineManyToOne(targetEntity="ForumCategory", joinColumns={"category_id" = "id"}) + */ public $category; - - public static function initMetadata($mapping) - { - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'id' => true - )); - $mapping->mapField(array( - 'fieldName' => 'position', - 'type' => 'integer' - )); - $mapping->mapField(array( - 'fieldName' => 'category_id', - 'type' => 'integer' - )); - - $mapping->mapManyToOne(array( - 'fieldName' => 'category', - 'targetEntity' => 'ForumCategory', - 'joinColumns' => array('category_id' => 'id') - )); - } } diff --git a/tests/models/forum/ForumCategory.php b/tests/models/forum/ForumCategory.php index af56ddd5e..c09be4a8f 100755 --- a/tests/models/forum/ForumCategory.php +++ b/tests/models/forum/ForumCategory.php @@ -2,38 +2,30 @@ #namespace Doctrine\Tests\Models\Forum; +/** + * @DoctrineEntity + */ class ForumCategory { + /** + * @DoctrineColumn(type="integer") + * @DoctrineId + */ private $id; + /** + * @DoctrineColumn(type="integer") + */ public $position; + /** + * @DoctrineColumn(type="string", length=255) + */ public $name; + /** + * @DoctrineOneToMany(targetEntity="ForumBoard", mappedBy="category") + */ public $boards; public function getId() { return $this->id; } - - public static function initMetadata($mapping) - { - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'id' => true - )); - $mapping->mapField(array( - 'fieldName' => 'position', - 'type' => 'integer' - )); - $mapping->mapField(array( - 'fieldName' => 'name', - 'type' => 'string', - 'length' => 255 - )); - - $mapping->mapOneToMany(array( - 'fieldName' => 'boards', - 'targetEntity' => 'ForumBoard', - 'mappedBy' => 'category' - )); - } } diff --git a/tests/models/forum/ForumEntry.php b/tests/models/forum/ForumEntry.php index 9bfbf6f35..d0de7596d 100644 --- a/tests/models/forum/ForumEntry.php +++ b/tests/models/forum/ForumEntry.php @@ -2,29 +2,20 @@ #namespace Doctrine\Tests\Models\Forum; -#use Doctrine\ORM\Entity; - -class ForumEntry implements Doctrine_ORM_Entity +/** + * @DoctrineEntity + */ +class ForumEntry { + /** + * @DoctrineId + * @DoctrineColumn(type="integer") + * @DoctrineIdGenerator("auto") + */ public $id; + /** + * @DoctrineColumn(type="string", length=50) + */ public $topic; - - public static function initMetadata($mapping) - { - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'id' => true, - 'idGenerator' => 'auto' - )); - $mapping->mapField(array( - 'fieldName' => 'topic', - 'type' => 'string', - 'length' => 50 - )); - - } - - } diff --git a/tests/models/forum/ForumUser.php b/tests/models/forum/ForumUser.php index 3eda669c6..c97d30941 100644 --- a/tests/models/forum/ForumUser.php +++ b/tests/models/forum/ForumUser.php @@ -4,54 +4,30 @@ #use Doctrine\ORM\Entity; +/** + * @DoctrineEntity + * @DoctrineInheritanceType("joined") + * @DoctrineDiscriminatorColumn(name="dtype", type="string", length=20) + * @DoctrineDiscriminatorMap({"user" = "ForumUser", "admin" = "ForumAdministrator"}) + * @DoctrineSubclasses({"ForumAdministrator"}) + */ class ForumUser { + /** + * @DoctrineColumn(type="integer") + * @DoctrineId + * @DoctrineIdGenerator("auto") + */ public $id; + /** + * @DoctrineColumn(type="string", length=50) + */ public $username; + /** + * @DoctrineOneToOne( + targetEntity="ForumAvatar", + joinColumns={"avatar_id" = "id"}, + cascade={"save"}) + */ public $avatar; - - public static function initMetadata($mapping) - { - /*$mapping->setClassMetadata(array( - 'doctrine.inheritanceType' => 'joined', - 'doctrine.discriminatorColumn' => 'dtype', - 'doctrine.discriminatorMap' => array('user' => 'ForumUser', 'admin' => 'ForumAdministrator'), - 'doctrine.subclasses' => array('ForumAdministrator') - )); - $mapping->setFieldMetadata('id', array( - 'doctrine.type' => 'integer', - 'doctrine.id' => true, - 'doctrine.idGenerator' => 'auto' - ));*/ - - // inheritance mapping - $mapping->setInheritanceType('joined', array( - 'discriminatorColumn' => 'dtype', - 'discriminatorMap' => array( - 'user' => 'ForumUser', - 'admin' => 'ForumAdministrator') - )); - // register subclasses - $mapping->setSubclasses(array('ForumAdministrator')); - - // column-to-field mapping - $mapping->mapField(array( - 'fieldName' => 'id', - 'type' => 'integer', - 'id' => true, - 'idGenerator' => 'auto' - )); - $mapping->mapField(array( - 'fieldName' => 'username', - 'type' => 'string', - 'length' => 50 - )); - - $mapping->mapOneToOne(array( - 'fieldName' => 'avatar', - 'targetEntity' => 'ForumAvatar', - 'joinColumns' => array('avatar_id' => 'id'), - 'cascade' => array('save') - )); - } } \ No newline at end of file