Merge pull request #808 from FabioBatSilva/slc

Second level cache

.travis.yml

@@ -7,9 +7,12 @@ php:
   - hhvm
 
 env:
-  - DB=mysql
-  - DB=pgsql
-  - DB=sqlite
+  - DB=mysql ENABLE_SECOND_LEVEL_CACHE=1
+  - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=1
+  - DB=sqlite ENABLE_SECOND_LEVEL_CACHE=1
+  - DB=mysql ENABLE_SECOND_LEVEL_CACHE=0
+  - DB=pgsql ENABLE_SECOND_LEVEL_CACHE=0
+  - DB=sqlite ENABLE_SECOND_LEVEL_CACHE=0
 
 before_script:
   - sh -c "if [ '$DB' = 'pgsql' ]; then psql -c 'DROP DATABASE IF EXISTS doctrine_tests;' -U postgres; fi"
@@ -19,7 +22,7 @@ before_script:
   - sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS doctrine_tests_tmp;create database IF NOT EXISTS doctrine_tests;'; fi"
   - composer install --prefer-dist --dev
 
-script: phpunit --configuration tests/travis/$DB.travis.xml
+script: phpunit -v --configuration tests/travis/$DB.travis.xml
 
 after_script:
   - php vendor/bin/coveralls -v

docs/en/index.rst

@@ -79,6 +79,7 @@ Advanced Topics
 * :doc:`Best Practices <reference/best-practices>`
 * :doc:`Metadata Drivers <reference/metadata-drivers>`
 * :doc:`Batch Processing <reference/batch-processing>`
+* :doc:`Second Level Cache <reference/second-level-cache>`
 
 Tutorials
 ---------

docs/en/reference/annotations-reference.rst

@@ -35,6 +35,7 @@ Index
 
 -  :ref:`@Column <annref_column>`
 -  :ref:`@ColumnResult <annref_column_result>`
+-  :ref:`@Cache <annref_cache>`
 -  :ref:`@ChangeTrackingPolicy <annref_changetrackingpolicy>`
 -  :ref:`@DiscriminatorColumn <annref_discriminatorcolumn>`
 -  :ref:`@DiscriminatorMap <annref_discriminatormap>`
@@ -152,6 +153,17 @@ Required attributes:
 
 -  **name**: The name of a column in the SELECT clause of a SQL query
 
+.. _annref_cache:
+
+@Cache
+~~~~~~~~~~~~~~
+Add caching strategy to a root entity or a collection.
+
+Optional attributes:
+
+-  **usage**: One of ``READ_ONLY``, ``READ_READ_WRITE`` or ``NONSTRICT_READ_WRITE``, By default this is ``READ_ONLY``.
+-  **region**: An specific region name
+
 .. _annref_changetrackingpolicy:
 
 @ChangeTrackingPolicy