[MediaWiki-commits] [Gerrit] Convert autoloader to PSR-4 - change (wikimedia/wikimania-scholarships)

2015-11-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Convert autoloader to PSR-4
..


Convert autoloader to PSR-4

Change-Id: If74ba93656c1ef2000d909783b2cd5fd6a3bc19f
---
M composer.json
R src/App.php
R src/Auth/AuthManager.php
R src/Auth/UserData.php
R src/Communities.php
R src/Controllers/Admin/Settings.php
R src/Controllers/Admin/User.php
R src/Controllers/Admin/Users.php
R src/Controllers/Login.php
R src/Controllers/RevalidateCsrf.php
R src/Controllers/Review/Application.php
R src/Controllers/Review/Communities.php
R src/Controllers/Review/Countries.php
R src/Controllers/Review/Phase1List.php
R src/Controllers/Review/Phase2List.php
R src/Controllers/Review/PhaseGrid.php
R src/Controllers/Review/Regions.php
R src/Controllers/Review/Scores.php
R src/Controllers/Review/Search.php
R src/Controllers/ScholarshipApplication.php
R src/Controllers/User/ChangePassword.php
R src/Countries.php
R src/Dao/Apply.php
R src/Dao/Settings.php
R src/Dao/User.php
R src/Forms/Apply.php
R src/Wikis.php
R tests/CountriesTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_namespaces.php
M vendor/composer/autoload_psr4.php
31 files changed, 34 insertions(+), 28 deletions(-)

Approvals:
  Niharika29: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/composer.json b/composer.json
index 3a15e9b..aaf6414 100644
--- a/composer.json
+++ b/composer.json
@@ -8,10 +8,15 @@
"wikimedia/slimapp": "0.6.0"
},
"autoload": {
-   "psr-0": {
+   "psr-4": {
"Wikimania\\Scholarship\\": "src/"
}
},
+   "autoload-dev": {
+   "psr-4": {
+   "Wikimania\\Scholarship\\": "tests/"
+   }
+   },
"config": {
"optimize-autoloader": true,
"preferred-install": "dist"
diff --git a/src/Wikimania/Scholarship/App.php b/src/App.php
similarity index 100%
rename from src/Wikimania/Scholarship/App.php
rename to src/App.php
diff --git a/src/Wikimania/Scholarship/Auth/AuthManager.php 
b/src/Auth/AuthManager.php
similarity index 100%
rename from src/Wikimania/Scholarship/Auth/AuthManager.php
rename to src/Auth/AuthManager.php
diff --git a/src/Wikimania/Scholarship/Auth/UserData.php b/src/Auth/UserData.php
similarity index 100%
rename from src/Wikimania/Scholarship/Auth/UserData.php
rename to src/Auth/UserData.php
diff --git a/src/Wikimania/Scholarship/Communities.php b/src/Communities.php
similarity index 100%
rename from src/Wikimania/Scholarship/Communities.php
rename to src/Communities.php
diff --git a/src/Wikimania/Scholarship/Controllers/Admin/Settings.php 
b/src/Controllers/Admin/Settings.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Admin/Settings.php
rename to src/Controllers/Admin/Settings.php
diff --git a/src/Wikimania/Scholarship/Controllers/Admin/User.php 
b/src/Controllers/Admin/User.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Admin/User.php
rename to src/Controllers/Admin/User.php
diff --git a/src/Wikimania/Scholarship/Controllers/Admin/Users.php 
b/src/Controllers/Admin/Users.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Admin/Users.php
rename to src/Controllers/Admin/Users.php
diff --git a/src/Wikimania/Scholarship/Controllers/Login.php 
b/src/Controllers/Login.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Login.php
rename to src/Controllers/Login.php
diff --git a/src/Wikimania/Scholarship/Controllers/RevalidateCsrf.php 
b/src/Controllers/RevalidateCsrf.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/RevalidateCsrf.php
rename to src/Controllers/RevalidateCsrf.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Application.php 
b/src/Controllers/Review/Application.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Review/Application.php
rename to src/Controllers/Review/Application.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Communities.php 
b/src/Controllers/Review/Communities.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Review/Communities.php
rename to src/Controllers/Review/Communities.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Countries.php 
b/src/Controllers/Review/Countries.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Review/Countries.php
rename to src/Controllers/Review/Countries.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Phase1List.php 
b/src/Controllers/Review/Phase1List.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Review/Phase1List.php
rename to src/Controllers/Review/Phase1List.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Phase2List.php 
b/src/Controllers/Review/Phase2List.php
simi

[MediaWiki-commits] [Gerrit] Convert autoloader to PSR-4 - change (wikimedia/wikimania-scholarships)

2015-11-22 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/254781

Change subject: Convert autoloader to PSR-4
..

Convert autoloader to PSR-4

Change-Id: If74ba93656c1ef2000d909783b2cd5fd6a3bc19f
---
M composer.json
R src/App.php
R src/Auth/AuthManager.php
R src/Auth/UserData.php
R src/Communities.php
R src/Controllers/Admin/Settings.php
R src/Controllers/Admin/User.php
R src/Controllers/Admin/Users.php
R src/Controllers/Login.php
R src/Controllers/RevalidateCsrf.php
R src/Controllers/Review/Application.php
R src/Controllers/Review/Communities.php
R src/Controllers/Review/Countries.php
R src/Controllers/Review/Phase1List.php
R src/Controllers/Review/Phase2List.php
R src/Controllers/Review/PhaseGrid.php
R src/Controllers/Review/Regions.php
R src/Controllers/Review/Scores.php
R src/Controllers/Review/Search.php
R src/Controllers/ScholarshipApplication.php
R src/Controllers/User/ChangePassword.php
R src/Countries.php
R src/Dao/Apply.php
R src/Dao/Settings.php
R src/Dao/User.php
R src/Forms/Apply.php
R src/Wikis.php
R tests/CountriesTest.php
M vendor/composer/autoload_classmap.php
M vendor/composer/autoload_namespaces.php
M vendor/composer/autoload_psr4.php
31 files changed, 34 insertions(+), 28 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/81/254781/1

diff --git a/composer.json b/composer.json
index 57a23d7..745db18 100644
--- a/composer.json
+++ b/composer.json
@@ -7,10 +7,15 @@
"wikimedia/slimapp": "0.6.0"
},
"autoload": {
-   "psr-0": {
+   "psr-4": {
"Wikimania\\Scholarship\\": "src/"
}
},
+   "autoload-dev": {
+   "psr-4": {
+   "Wikimania\\Scholarship\\": "tests/"
+   }
+   },
"config": {
"optimize-autoloader": true,
"preferred-install": "dist"
diff --git a/src/Wikimania/Scholarship/App.php b/src/App.php
similarity index 100%
rename from src/Wikimania/Scholarship/App.php
rename to src/App.php
diff --git a/src/Wikimania/Scholarship/Auth/AuthManager.php 
b/src/Auth/AuthManager.php
similarity index 100%
rename from src/Wikimania/Scholarship/Auth/AuthManager.php
rename to src/Auth/AuthManager.php
diff --git a/src/Wikimania/Scholarship/Auth/UserData.php b/src/Auth/UserData.php
similarity index 100%
rename from src/Wikimania/Scholarship/Auth/UserData.php
rename to src/Auth/UserData.php
diff --git a/src/Wikimania/Scholarship/Communities.php b/src/Communities.php
similarity index 100%
rename from src/Wikimania/Scholarship/Communities.php
rename to src/Communities.php
diff --git a/src/Wikimania/Scholarship/Controllers/Admin/Settings.php 
b/src/Controllers/Admin/Settings.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Admin/Settings.php
rename to src/Controllers/Admin/Settings.php
diff --git a/src/Wikimania/Scholarship/Controllers/Admin/User.php 
b/src/Controllers/Admin/User.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Admin/User.php
rename to src/Controllers/Admin/User.php
diff --git a/src/Wikimania/Scholarship/Controllers/Admin/Users.php 
b/src/Controllers/Admin/Users.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Admin/Users.php
rename to src/Controllers/Admin/Users.php
diff --git a/src/Wikimania/Scholarship/Controllers/Login.php 
b/src/Controllers/Login.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Login.php
rename to src/Controllers/Login.php
diff --git a/src/Wikimania/Scholarship/Controllers/RevalidateCsrf.php 
b/src/Controllers/RevalidateCsrf.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/RevalidateCsrf.php
rename to src/Controllers/RevalidateCsrf.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Application.php 
b/src/Controllers/Review/Application.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Review/Application.php
rename to src/Controllers/Review/Application.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Communities.php 
b/src/Controllers/Review/Communities.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Review/Communities.php
rename to src/Controllers/Review/Communities.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Countries.php 
b/src/Controllers/Review/Countries.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Review/Countries.php
rename to src/Controllers/Review/Countries.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Phase1List.php 
b/src/Controllers/Review/Phase1List.php
similarity index 100%
rename from src/Wikimania/Scholarship/Controllers/Review/Phase1List.php
rename to src/Controllers/Review/Phase1List.php
diff --git a/src/Wikimania/Scholarship/Controllers/Review/Ph