Dont wrap in paginator

[bakura10]

ping @danizord @Ocramius

This PR removes the automatic conversion to Paginator in the router. Instead, the controller now receives exactly what has been matched by the router, so it's up to the user to specify the appropriate type hint (Selectable will be the most useful one I think). Query params filtering can be done directly in the action controller now, this is much more convenient.

Also, the CreateResourceModelListener correctly take into account the return value from the controller. So if you receive a collection, and manually build a paginator from it, the listener will detect the data is not the same (initially a collection, then a paginator), and will therefore create a new resource (reusing the same metadata).

I thing: should we include a utility method in AbstractRestfulController to create a paginator from a collection or is out from our responsibility?

[Ocramius]

@bakura10 👍

I thing: should we include a utility method in AbstractRestfulController to create a paginator from a collection or is out from our responsibility?

Controller helpers to the rescue?

[coveralls]

Coverage increased (+2.32%) when pulling 47cb8d0 on collection into 188c450 on master.

[bakura10]

Good idea for the controller plugin! I'll do that later :). I've also updated the doc.

[coveralls]

Coverage increased (+2.32%) when pulling c756111 on collection into 188c450 on master.

[bakura10]

Done @Ocramius !

I've added a paragraph on cookbook to show usage. Looks good to you?

[coveralls]

Coverage decreased (-1.37%) when pulling 0a08b0c on collection into 188c450 on master.

[danizord]

if ($data instanceof Selectable) {
    return new SelectableAdapter($data, $this->createCriteria($criteria));
}

if ($data instanceof Collection) {
    return new CollectionAdapter($data);
}

// throw exception

[danizord]

You may accept $criteria = null and call createCriteria() only if it is an array.

[bakura10]

No because it should work with Criteria also. Let's keep it simple :).

[danizord]

If it is null or Criteria you can pass directly to SelectableAdapter without calling createCriteria()

[coveralls]

Coverage remained the same when pulling d778526 on collection into 188c450 on master.

[danizord]

Why not create a method setData()?

[bakura10]

I think I had this discussion with @Ocramius and he told me we should not be able to change the resource.

Furthermore you may want to keep the matched resource untouched.

Envoyé de mon iPhone

Le 24 déc. 2013 à 12:11, Daniel Gimenes notifications@github.com a écrit :

In src/ZfrRest/Mvc/CreateResourceModelListener.php:

@@ -65,7 +65,13 @@ public function createResourceModel(MvcEvent $event)
return;
}

•    $model = new ResourceModel($resource);
  

•    // Because we may manipulate the resource data in the controller (for instance wrapping a collection around
  

•    // a paginator), we need to create a new resource from the data
  

  Why not create a method setData()?

—
Reply to this email directly or view it on GitHub.

[Ocramius]

@danizord yep. Don't change the resource :-)

[coveralls]

Coverage remained the same when pulling 18690e0 on collection into 188c450 on master.

[danizord]

If $criteria is a Criteria or null you may pass it directly to the adapter without calling createCriteria()

public function __invoke($data, $criteria = null)
{
    if ($data instanceof Selectable) {
        if (is_array($criteria)) {
            $criteria = $this->createCriteria($criteria);
        }

        // Otherwise, pass $criteria directly to SelectableAdapter        
        return new Paginator(new SelectableAdapter($data, $criteria);
    }
    //...

[danizord]

👍