Skip to content

Commit 2b35ac1

Browse files
committed
deprecate propel support and fix some doc references
1 parent 84484f6 commit 2b35ac1

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

CHANGELOG-4.0.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ in 4.0 versions.
1111
* Introduce InPlacePagerPersister.
1212
* Add new options to populate command: --first-page, last-page, --max-per-page. They work only if you use v5 providers API.
1313
* Deprecate some options of populate command: --batch-size and --offset.
14+
* Deprecate Propel support
1415

1516
### 4.0.1 (2017-08-10)
1617

DependencyInjection/FOSElasticaExtension.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -714,6 +714,10 @@ private function loadDriver(ContainerBuilder $container, $driver)
714714
return;
715715
}
716716

717+
if ('propel' === $driver) {
718+
@trigger_error('Support for Propel is deprecated since version 4.1 and will be removed in 5.0.', E_USER_DEPRECATED);
719+
}
720+
717721
$loader = new XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
718722
$loader->load($driver.'.xml');
719723
$this->loadedDrivers[] = $driver;

Propel/ElasticaToModelTransformer.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
1010

1111
/**
12+
* @deprecated since 4.1 will be removed in 5.x.
13+
*
1214
* Maps Elastica documents with Propel objects.
1315
*
1416
* This mapper assumes an exact match between Elastica document IDs and Propel

Propel/Propel1PagerProvider.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
use Pagerfanta\Adapter\PropelAdapter;
1717
use Pagerfanta\Pagerfanta;
1818

19+
/**
20+
* @deprecated since 4.1 will be removed in 5.x.
21+
*/
1922
final class Propel1PagerProvider implements PagerProviderInterface
2023
{
2124
/**

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Documentation
1616

1717
Documentation for FOSElasticaBundle is in `Resources/doc/index.md`
1818

19-
[Read the documentation for 4.x](https://github.com/FriendsOfSymfony/FOSElasticaBundle/blob/master/Resources/doc/index.md)
19+
[Read the documentation for 4.x](Resources/doc/index.md)
2020

2121
[Read the documentation for 3.2.x](https://github.com/FriendsOfSymfony/FOSElasticaBundle/blob/3.2.x/Resources/doc/index.md)
2222

Resources/doc/cookbook/manual-provider.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Manual pager provider
22
====================
33

4-
Create a service with the tag "fos_elastica.provider" and attributes for the
4+
Create a service with the tag "fos_elastica.pager_provider" and attributes for the
55
index and type for which the service will provide.
66

77
```yaml
@@ -35,10 +35,10 @@ class UserPagerProvider implements PagerProviderInterface
3535

3636
There are some examples:
3737

38-
* [DoctrineORMPagerProvider](https://github.com/FriendsOfSymfony/FOSElasticaBundle/blob/master/Doctrine/DoctrineORMPagerProvider.php)
39-
* [DoctrinePHPCRPagerProvider](https://github.com/FriendsOfSymfony/FOSElasticaBundle/blob/master/Doctrine/DoctrinePHPCRPagerProvider.php)
40-
* [DoctrineMongoDBPagerProvider](https://github.com/FriendsOfSymfony/FOSElasticaBundle/blob/master/Doctrine/DoctrineMongoDBPagerProvider.php)
41-
* [Propel1PagerProvider](https://github.com/FriendsOfSymfony/FOSElasticaBundle/blob/master/Propel/Propel1PagerProvider.php)
38+
* [ORMPagerProvider](../../../Doctrine/ORMPagerProvider.php)
39+
* [PHPCRPagerProvider](../../../Doctrine/PHPCRPagerProvider.php)
40+
* [MongoDBPagerProvider](../../../Doctrine/MongoDBPagerProvider.php)
41+
* [Propel1PagerProvider](../../../Propel/Propel1PagerProvider.php)
4242

4343

4444
Manual Provider (DEPRECATED)

0 commit comments

Comments
 (0)