Merge remote-tracking branch 'origin/1.x' into 1-to-2

doctrine · Dec 4, 2023 · a1728b1 · a1728b1
2 parents 2619cc0 + 33ee413
commit a1728b1
Show file tree

Hide file tree

Showing 8 changed files with 363 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -380,7 +380,7 @@ maintenance release of the 1.0 family with bugfixes
   - Doctrine\Common\Persistence\Event\LifecycleEventArgs
   Only the MoveEventArgs remain specific to PHPCR-ODM.
 * **2013-09-27**: Removed deprecated legacy handling for the mapping that
-  allowed using "name" instead of "property" to configure PHCPR property in mapping.
+  allowed using "name" instead of "property" to configure PHPCR property in mapping.
 
 * **2013-09-26**: [Model] add HierarchyInterface for objects that resolve to
   nt:HierarchyNode, the method AbstractFile::addChild is

diff --git a/cli-config.doctrine_dbal.php.dist b/cli-config.doctrine_dbal.php.dist
@@ -2,7 +2,7 @@
 /**
  * The config file is responsible to make class loading work and initialize a
  * DocumentManagerHelper that contains the doctrine document manager with a
- * Session of your phcpr implementation.
+ * Session of your phpcr implementation.
  * The array $extraCommands can be used to inject implementation specific commands.
  * Add instances of commands for eventual implementation specific commands to this array.
  */

diff --git a/cli-config.jackrabbit.php.dist b/cli-config.jackrabbit.php.dist
@@ -2,7 +2,7 @@
 /**
  * The config file is responsible to make class loading work and initialize a
  * DocumentManagerHelper that contains the doctrine document manager with a
- * Session of your phcpr implementation.
+ * Session of your phpcr implementation.
  * The array $extraCommands can be used to inject implementation specific commands.
  * Add instances of commands for eventual implementation specific commands to this array.
  */

diff --git a/docs/en/index.rst b/docs/en/index.rst
@@ -36,7 +36,8 @@ Mapping Objects onto a Document Repository
   :doc:`Inheritance <reference/inheritance-mapping>`
 
 * **Mapping Driver References**:
-  :doc:`Docblock Annotations <reference/annotations-mapping>` |
+  :doc:`PHP Attributes <reference/attributes-mapping>` |
+  :doc:`Docblock Annotations (deprecated) <reference/annotations-mapping>` |
   :doc:`XML <reference/xml-mapping>` |
   :doc:`YAML <reference/yml-mapping>` |
   :doc:`Metadata Drivers <reference/metadata-drivers>`

diff --git a/docs/en/reference/installation-configuration.rst b/docs/en/reference/installation-configuration.rst
@@ -39,7 +39,7 @@ storage. You can force one of the available providers in your projects composer.
 Each of the providers requires some additional setup. The following sections will briefly list
 how to set each of them up. Please refer to the documentation of the provider you choose for details.
 
-Install Jackalope-Jackrabbit PHCPR provider
+Install Jackalope-Jackrabbit PHPCR provider
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Jackalope-Jackrabbit uses the Java backend jackrabbit for storage.

diff --git a/docs/en/reference/versioning.rst b/docs/en/reference/versioning.rst
@@ -125,7 +125,7 @@ Note that all fields of a document are automatically versioned, you can not
 exclude anything from being versioned. Referenced documents are not versioned
 at the same time, but it is stored to which document the reference pointed at
 this time. Children and parents are not versioned by default. Children can be
-versioned by defining a PHCPR node type that specifies to cascade versioning.
+versioned by defining a PHPCR node type that specifies to cascade versioning.
 This feature however is untested with PHPCR-ODM, if you have feedback please
 tell us.
 

diff --git a/lib/Doctrine/ODM/PHPCR/Tools/Console/Command/RegisterSystemNodeTypesCommand.php b/lib/Doctrine/ODM/PHPCR/Tools/Console/Command/RegisterSystemNodeTypesCommand.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
- * Command to register the phcpr-odm required node types.
+ * Command to register the phpcr-odm required node types.
  *
  * This command registers the necessary node types to get phpcr odm working
  */