From 3d242b3a0d3ca563df00e0fed52c471259aa8097 Mon Sep 17 00:00:00 2001 From: inghamn Date: Thu, 3 May 2018 10:32:46 -0400 Subject: [PATCH] Moved namespaced code into explicitly named subdirectory This sets the stage for starting to separate the domain code from the delivery (web) code. --- composer.json | 2 +- composer.lock | 59 ++++++++++--------- .../Controllers/AccountController.php | 0 .../Controllers/DepartmentsController.php | 0 .../Controllers/EventTypesController.php | 0 .../Controllers/EventsController.php | 0 .../Controllers/IndexController.php | 0 .../Controllers/LoginController.php | 0 .../Controllers/PeopleController.php | 0 .../Controllers/SegmentsController.php | 0 .../Controllers/StreetsController.php | 0 .../Controllers/TrafficcastController.php | 0 .../Controllers/UsersController.php | 0 .../Controllers/WazeController.php | 0 .../Models/AddressService.php | 0 src/{ => Application}/Models/Department.php | 0 .../Models/DepartmentsTable.php | 0 src/{ => Application}/Models/Event.php | 0 src/{ => Application}/Models/EventType.php | 0 .../Models/EventTypesTable.php | 0 .../Models/GoogleGateway.php | 0 src/{ => Application}/Models/PeopleTable.php | 0 src/{ => Application}/Models/Person.php | 0 src/{ => Application}/Models/Segment.php | 0 .../Models/SegmentsTable.php | 0 25 files changed, 31 insertions(+), 30 deletions(-) rename src/{ => Application}/Controllers/AccountController.php (100%) rename src/{ => Application}/Controllers/DepartmentsController.php (100%) rename src/{ => Application}/Controllers/EventTypesController.php (100%) rename src/{ => Application}/Controllers/EventsController.php (100%) rename src/{ => Application}/Controllers/IndexController.php (100%) rename src/{ => Application}/Controllers/LoginController.php (100%) rename src/{ => Application}/Controllers/PeopleController.php (100%) rename src/{ => Application}/Controllers/SegmentsController.php (100%) rename src/{ => Application}/Controllers/StreetsController.php (100%) rename src/{ => Application}/Controllers/TrafficcastController.php (100%) rename src/{ => Application}/Controllers/UsersController.php (100%) rename src/{ => Application}/Controllers/WazeController.php (100%) rename src/{ => Application}/Models/AddressService.php (100%) rename src/{ => Application}/Models/Department.php (100%) rename src/{ => Application}/Models/DepartmentsTable.php (100%) rename src/{ => Application}/Models/Event.php (100%) rename src/{ => Application}/Models/EventType.php (100%) rename src/{ => Application}/Models/EventTypesTable.php (100%) rename src/{ => Application}/Models/GoogleGateway.php (100%) rename src/{ => Application}/Models/PeopleTable.php (100%) rename src/{ => Application}/Models/Person.php (100%) rename src/{ => Application}/Models/Segment.php (100%) rename src/{ => Application}/Models/SegmentsTable.php (100%) diff --git a/composer.json b/composer.json index 775f1ae..894aa7e 100644 --- a/composer.json +++ b/composer.json @@ -16,6 +16,6 @@ "zendframework/zend-permissions-acl": "~2.5" }, "autoload": { - "psr-4": {"Application\\": "src"} + "psr-4": {"Application\\": "src/Application"} } } diff --git a/composer.lock b/composer.lock index 58756cf..2d5e9c6 100644 --- a/composer.lock +++ b/composer.lock @@ -342,16 +342,16 @@ }, { "name": "google/apiclient-services", - "version": "v0.56", + "version": "v0.57", "source": { "type": "git", "url": "https://github.com/google/google-api-php-client-services.git", - "reference": "94ae125bd4ac33eec676142f7776c0b137cf7bc7" + "reference": "fc1821419f0e9d060d83a2864e2a40874b91430d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/94ae125bd4ac33eec676142f7776c0b137cf7bc7", - "reference": "94ae125bd4ac33eec676142f7776c0b137cf7bc7", + "url": "https://api.github.com/repos/google/google-api-php-client-services/zipball/fc1821419f0e9d060d83a2864e2a40874b91430d", + "reference": "fc1821419f0e9d060d83a2864e2a40874b91430d", "shasum": "" }, "require": { @@ -375,7 +375,7 @@ "keywords": [ "google" ], - "time": "2018-04-21T00:23:45+00:00" + "time": "2018-04-28T00:23:39+00:00" }, { "name": "google/auth", @@ -1272,24 +1272,24 @@ }, { "name": "zendframework/zend-permissions-acl", - "version": "2.6.0", + "version": "2.7.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-permissions-acl.git", - "reference": "843bbd9c6f6d20b84dd0ce6c815d10397e98082b" + "reference": "c9568f4aee2887e43bf07769973f9686e8f61707" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-permissions-acl/zipball/843bbd9c6f6d20b84dd0ce6c815d10397e98082b", - "reference": "843bbd9c6f6d20b84dd0ce6c815d10397e98082b", + "url": "https://api.github.com/repos/zendframework/zend-permissions-acl/zipball/c9568f4aee2887e43bf07769973f9686e8f61707", + "reference": "c9568f4aee2887e43bf07769973f9686e8f61707", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0" + "php": "^5.6 || ^7.0" }, "require-dev": { - "fabpot/php-cs-fixer": "1.7.*", - "phpunit/phpunit": "~4.0", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5", + "zendframework/zend-coding-standard": "~1.0.0", "zendframework/zend-servicemanager": "^2.7.5 || ^3.0.3" }, "suggest": { @@ -1298,8 +1298,8 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6-dev", - "dev-develop": "2.7-dev" + "dev-master": "2.7.x-dev", + "dev-develop": "2.8.x-dev" } }, "autoload": { @@ -1311,13 +1311,13 @@ "license": [ "BSD-3-Clause" ], - "description": "provides a lightweight and flexible access control list (ACL) implementation for privileges management", - "homepage": "https://github.com/zendframework/zend-permissions-acl", + "description": "Provides a lightweight and flexible access control list (ACL) implementation for privileges management", "keywords": [ + "ZendFramework", "acl", - "zf2" + "zf" ], - "time": "2016-02-03T21:46:45+00:00" + "time": "2018-05-01T21:53:20+00:00" }, { "name": "zendframework/zend-servicemanager", @@ -1389,31 +1389,31 @@ }, { "name": "zendframework/zend-stdlib", - "version": "3.1.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/zendframework/zend-stdlib.git", - "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc" + "reference": "cd164b4a18b5d1aeb69be2c26db035b5ed6925ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/10ef03144902d1955f935fff5346ed52f7d99bcc", - "reference": "10ef03144902d1955f935fff5346ed52f7d99bcc", + "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/cd164b4a18b5d1aeb69be2c26db035b5ed6925ae", + "reference": "cd164b4a18b5d1aeb69be2c26db035b5ed6925ae", "shasum": "" }, "require": { "php": "^5.6 || ^7.0" }, "require-dev": { - "athletic/athletic": "~0.1", - "phpunit/phpunit": "~4.0", + "phpbench/phpbench": "^0.13", + "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2", "zendframework/zend-coding-standard": "~1.0.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev", - "dev-develop": "3.2-dev" + "dev-master": "3.2.x-dev", + "dev-develop": "3.3.x-dev" } }, "autoload": { @@ -1425,12 +1425,13 @@ "license": [ "BSD-3-Clause" ], - "homepage": "https://github.com/zendframework/zend-stdlib", + "description": "SPL extensions, array utilities, error handlers, and more", "keywords": [ + "ZendFramework", "stdlib", - "zf2" + "zf" ], - "time": "2018-04-12T16:05:42+00:00" + "time": "2018-04-30T13:50:40+00:00" } ], "packages-dev": [], diff --git a/src/Controllers/AccountController.php b/src/Application/Controllers/AccountController.php similarity index 100% rename from src/Controllers/AccountController.php rename to src/Application/Controllers/AccountController.php diff --git a/src/Controllers/DepartmentsController.php b/src/Application/Controllers/DepartmentsController.php similarity index 100% rename from src/Controllers/DepartmentsController.php rename to src/Application/Controllers/DepartmentsController.php diff --git a/src/Controllers/EventTypesController.php b/src/Application/Controllers/EventTypesController.php similarity index 100% rename from src/Controllers/EventTypesController.php rename to src/Application/Controllers/EventTypesController.php diff --git a/src/Controllers/EventsController.php b/src/Application/Controllers/EventsController.php similarity index 100% rename from src/Controllers/EventsController.php rename to src/Application/Controllers/EventsController.php diff --git a/src/Controllers/IndexController.php b/src/Application/Controllers/IndexController.php similarity index 100% rename from src/Controllers/IndexController.php rename to src/Application/Controllers/IndexController.php diff --git a/src/Controllers/LoginController.php b/src/Application/Controllers/LoginController.php similarity index 100% rename from src/Controllers/LoginController.php rename to src/Application/Controllers/LoginController.php diff --git a/src/Controllers/PeopleController.php b/src/Application/Controllers/PeopleController.php similarity index 100% rename from src/Controllers/PeopleController.php rename to src/Application/Controllers/PeopleController.php diff --git a/src/Controllers/SegmentsController.php b/src/Application/Controllers/SegmentsController.php similarity index 100% rename from src/Controllers/SegmentsController.php rename to src/Application/Controllers/SegmentsController.php diff --git a/src/Controllers/StreetsController.php b/src/Application/Controllers/StreetsController.php similarity index 100% rename from src/Controllers/StreetsController.php rename to src/Application/Controllers/StreetsController.php diff --git a/src/Controllers/TrafficcastController.php b/src/Application/Controllers/TrafficcastController.php similarity index 100% rename from src/Controllers/TrafficcastController.php rename to src/Application/Controllers/TrafficcastController.php diff --git a/src/Controllers/UsersController.php b/src/Application/Controllers/UsersController.php similarity index 100% rename from src/Controllers/UsersController.php rename to src/Application/Controllers/UsersController.php diff --git a/src/Controllers/WazeController.php b/src/Application/Controllers/WazeController.php similarity index 100% rename from src/Controllers/WazeController.php rename to src/Application/Controllers/WazeController.php diff --git a/src/Models/AddressService.php b/src/Application/Models/AddressService.php similarity index 100% rename from src/Models/AddressService.php rename to src/Application/Models/AddressService.php diff --git a/src/Models/Department.php b/src/Application/Models/Department.php similarity index 100% rename from src/Models/Department.php rename to src/Application/Models/Department.php diff --git a/src/Models/DepartmentsTable.php b/src/Application/Models/DepartmentsTable.php similarity index 100% rename from src/Models/DepartmentsTable.php rename to src/Application/Models/DepartmentsTable.php diff --git a/src/Models/Event.php b/src/Application/Models/Event.php similarity index 100% rename from src/Models/Event.php rename to src/Application/Models/Event.php diff --git a/src/Models/EventType.php b/src/Application/Models/EventType.php similarity index 100% rename from src/Models/EventType.php rename to src/Application/Models/EventType.php diff --git a/src/Models/EventTypesTable.php b/src/Application/Models/EventTypesTable.php similarity index 100% rename from src/Models/EventTypesTable.php rename to src/Application/Models/EventTypesTable.php diff --git a/src/Models/GoogleGateway.php b/src/Application/Models/GoogleGateway.php similarity index 100% rename from src/Models/GoogleGateway.php rename to src/Application/Models/GoogleGateway.php diff --git a/src/Models/PeopleTable.php b/src/Application/Models/PeopleTable.php similarity index 100% rename from src/Models/PeopleTable.php rename to src/Application/Models/PeopleTable.php diff --git a/src/Models/Person.php b/src/Application/Models/Person.php similarity index 100% rename from src/Models/Person.php rename to src/Application/Models/Person.php diff --git a/src/Models/Segment.php b/src/Application/Models/Segment.php similarity index 100% rename from src/Models/Segment.php rename to src/Application/Models/Segment.php diff --git a/src/Models/SegmentsTable.php b/src/Application/Models/SegmentsTable.php similarity index 100% rename from src/Models/SegmentsTable.php rename to src/Application/Models/SegmentsTable.php