Merge pull request #72 from jakzal/revert-deprecated-page-object-aware

Revert PageObjectAware deprecation
sensiolabs · Jun 12, 2016 · b07ebd6 · b07ebd6
2 parents 2e6b379 + 19d481a
commit b07ebd6
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 25 deletions.
diff --git a/doc/guide/working_with_page_objects.rst b/doc/guide/working_with_page_objects.rst
@@ -59,12 +59,6 @@ with a type hint:
 Using the page object factory
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    .. note::
-
-        ``PageObjectContext`` described here is deprecated in favour of
-        injecting page objects directly into context's constructor (described in the previous section).
-        ``PageObjectContext`` will be removed in future versions of this extension.
-
 Pages are created with a built in factory. One of the ways to use them in your
 context is to call the ``getPage`` method provided by the
 ``SensioLabs\Behat\PageObjectExtension\Context\PageObjectContext``:

diff --git a/features/changing_page_object_namespaces.feature b/features/changing_page_object_namespaces.feature
@@ -1,4 +1,3 @@
-@deprecated
 Feature: Changing page object namespaces
   In order to organise my code better
   As a Developer

diff --git a/features/injecting_the_page_object_factory.feature b/features/injecting_the_page_object_factory.feature
@@ -1,4 +1,3 @@
-@deprecated
 Feature: Injecting a page object factory
   In order to avoid extending third-party contexts
   As a Developer

diff --git a/features/providing_a_custom_class_name_resolver_for_the_default_page_object_factory.feature b/features/providing_a_custom_class_name_resolver_for_the_default_page_object_factory.feature
@@ -1,4 +1,3 @@
-@deprecated
 Feature: Providing a custom class name resolver for the default page object factory
   In order to customise the way page object class names are resolved
   As an Experienced Developer

diff --git a/features/using_page_objects_with_a_factory.feature b/features/using_page_objects_with_a_factory.feature
@@ -1,4 +1,3 @@
-@deprecated
 Feature: Using page objects with a factory
   In order to keep my context files maintainable
   As a Developer

diff --git a/src/SensioLabs/Behat/PageObjectExtension/Context/Initializer/PageObjectAwareInitializer.php b/src/SensioLabs/Behat/PageObjectExtension/Context/Initializer/PageObjectAwareInitializer.php
@@ -2,16 +2,11 @@
 
 namespace SensioLabs\Behat\PageObjectExtension\Context\Initializer;
 
-@trigger_error('The '.__NAMESPACE__.'\PageObjectAwareInitializer class is deprecated since version 2.0 and will be removed in 3.0. Use the argument injection instead.', E_USER_DEPRECATED);
-
 use Behat\Behat\Context\Context;
 use Behat\Behat\Context\Initializer\ContextInitializer;
 use SensioLabs\Behat\PageObjectExtension\Context\PageObjectAware;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Factory as PageObjectFactory;
 
-/**
- * @deprecated in 2.0, to be removed in 3.0. Use the argument resolver instead. See http://behat-page-object-extension.readthedocs.org/en/latest/guide/working_with_page_objects.html#instantiating-a-page-object
- */
 class PageObjectAwareInitializer implements ContextInitializer
 {
     /**

diff --git a/src/SensioLabs/Behat/PageObjectExtension/Context/PageObjectAware.php b/src/SensioLabs/Behat/PageObjectExtension/Context/PageObjectAware.php
@@ -2,13 +2,8 @@
 
 namespace SensioLabs\Behat\PageObjectExtension\Context;
 
-@trigger_error('The '.__NAMESPACE__.'\PageObjectAware interface is deprecated since version 2.0 and will be removed in 3.0. Use the argument injection instead.', E_USER_DEPRECATED);
-
 use SensioLabs\Behat\PageObjectExtension\PageObject\Factory as PageObjectFactory;
 
-/**
- * @deprecated in 2.0, to be removed in 3.0. Use the argument resolver instead. See http://behat-page-object-extension.readthedocs.org/en/latest/guide/working_with_page_objects.html#instantiating-a-page-object
- */
 interface PageObjectAware
 {
     /**

diff --git a/src/SensioLabs/Behat/PageObjectExtension/Context/PageObjectContext.php b/src/SensioLabs/Behat/PageObjectExtension/Context/PageObjectContext.php
@@ -2,16 +2,11 @@
 
 namespace SensioLabs\Behat\PageObjectExtension\Context;
 
-@trigger_error('The '.__NAMESPACE__.'\PageObjectContext class is deprecated since version 2.0 and will be removed in 3.0. Use the argument injection instead.', E_USER_DEPRECATED);
-
 use Behat\Behat\Context\Context;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Factory as PageObjectFactory;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Page;
 use SensioLabs\Behat\PageObjectExtension\PageObject\Element;
 
-/**
- * @deprecated in 2.0, to be removed in 3.0. Use the argument resolver instead. See http://behat-page-object-extension.readthedocs.org/en/latest/guide/working_with_page_objects.html#instantiating-a-page-object
- */
 class PageObjectContext implements Context, PageObjectAware
 {
     /**