Skip to content

Commit a4da142

Browse files
authored
Merge pull request #28 from wollanup/develop
fix method in bad class
2 parents f853970 + ed13ee4 commit a4da142

File tree

3 files changed

+24
-17
lines changed

3 files changed

+24
-17
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"require": {
2323
"propel/propel": "~2.0@dev",
24-
"wollanup/php-api-rest-interfaces": "^1.1.9",
24+
"wollanup/php-api-rest-interfaces": "^1.1.10",
2525
"wollanup/php-api-rest-propel-behavior": "^1.1",
2626
"wollanup/php-api-rest-service-request": "^1.0.1",
2727
"wollanup/php-api-rest-utils": "^1.1",

src/RouteMap/RouteMapAbstract.php

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ abstract class RouteMapAbstract extends DataIterator implements RouteMapInterfac
3434
* @var ContainerInterface
3535
*/
3636
protected $container;
37-
/**
38-
* @var bool
39-
*/
40-
protected $deprecated = false;
4137
/**
4238
* @var string
4339
*/
@@ -66,16 +62,6 @@ final public function __construct(ContainerInterface $container)
6662
$this->initialize();
6763
}
6864

69-
/**
70-
* @inheritdoc
71-
*/
72-
public function deprecated()
73-
{
74-
$this->deprecated = true;
75-
76-
return $this;
77-
}
78-
7965
/**
8066
* @inheritdoc
8167
*/
@@ -100,6 +86,14 @@ public function getPackage()
10086
return ($this->isSubResourceOfPackage()) ? $this->packageName : $this->resourceName;
10187
}
10288

89+
/**
90+
* @return string
91+
*/
92+
public function getPrefix()
93+
{
94+
return $this->routesPrefix;
95+
}
96+
10397
/**
10498
* @return string
10599
*/
@@ -238,7 +232,6 @@ final protected function put($pattern)
238232
/**
239233
* @param $routeName
240234
*
241-
* @deprecated remove ASAP
242235
* @return string
243236
*/
244237
private function trailingSlash($routeName)

src/Service/Router/Route.php

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ class Route extends \Slim\Route implements RouteInterface
1818
{
1919

2020
protected $collectionFromPks;
21+
/**
22+
* @var bool
23+
*/
24+
protected $deprecated = false;
2125
/**
2226
* @var bool
2327
*/
@@ -138,14 +142,24 @@ public function bindToRouter(RouterInterface $router)
138142
$next,
139143
$route->getNameOfInjectedParam()
140144
);
141-
145+
142146
return $response;
143147
});
144148
}
145149

146150
$router->addResourceRoute($this);
147151
}
148152

153+
/**
154+
* @inheritdoc
155+
*/
156+
public function deprecated()
157+
{
158+
$this->deprecated = true;
159+
160+
return $this;
161+
}
162+
149163
/**
150164
* @return string
151165
*/

0 commit comments

Comments
 (0)