Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor updates #213

Merged
merged 2 commits into from Apr 7, 2020
Merged

Minor updates #213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daed7fe
delete commented code from test suite
GRyall Apr 6, 2020
4b58d21
Rename function for clarity
GRyall Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions htdocs/PI/write/PIWriteRequest.php
View file
Open in desktop
Expand Up @@ -115,7 +115,7 @@ public function __construct() {
*/
public function processRequest($method, $requestUrl, $requestContents, Site $siteService) {
try {
$this->getAndProcessURL($method, $requestUrl);
$this->processURL($method, $requestUrl);
$this->generateExceptionMessages();
$this->getRequestContent($requestContents);
$this->validateEntityTypePropertyAndPropValue();
Expand Down Expand Up @@ -153,11 +153,11 @@ public function processRequest($method, $requestUrl, $requestContents, Site $sit
* @param string $requestUrl url used to access API, only the last section
* @throws \Exception
*/
private function getAndProcessURL($method, $requestUrl) {
private function processURL($method, $requestUrl) {
#Process URL into array of useful values
$requestArray = $this->processURLtoArray($requestUrl);

#Process request contents
#Process url contents
#API Version
$this->processAPIVersion($requestArray[0]);

Expand Down
3 changes: 0 additions & 3 deletions tests/doctrine/bootstrap.php
View file
Open in desktop
Expand Up @@ -35,7 +35,4 @@
require_once $entitiesPath."/RoleActionRecord.php";
require_once $entitiesPath."/APIAuthentication.php";

//if (!class_exists("Doctrine\Common\Version", false)) {
// require_once dirname(__FILE__)."/bootstrap_doctrine.php";
//}
require __DIR__."/bootstrap_doctrine.php";