Browse files

Moved vendors/ into system/vendors along with codeigniter and sparks

  • Loading branch information...
1 parent 175ae9d commit 8b78e72234311518fccb9963d383bf199209fbdc @philsturgeon philsturgeon committed Dec 28, 2013
Showing with 19 additions and 16 deletions.
  1. +1 −1 .gitignore
  2. +1 −1 .htaccess
  3. +0 −1 build.xml
  4. +14 −10 composer.json
  5. +1 −1 index.php
  6. +2 −2 installer/index.php
View
2 .gitignore
@@ -15,9 +15,9 @@ assets/page_types/default/*
system/cms/cache/*
system/cms/config/database.php
system/cms/logs/log-*.php
+system/vendor/*
nbproject/
uploads/*
-vendor/*
addons/*
!addons/shared_addons
View
2 .htaccess
@@ -39,7 +39,7 @@
#RewriteRule ^(.*)$ http://www.%1/$1 [R=301,L]
# Keep people out of codeigniter directory and Git/Mercurial data
- RedirectMatch 403 ^/.*/(/vendor|composer\.json|composer\.lock|system/cms/cache|system/codeigniter|system/cms/config|system/cms/logs|\.git|\.hg).*$
+ RedirectMatch 403 ^/.*/(composer\.json|composer\.lock|system/cms/cache|system/codeigniter|system/vendor|system/cms/config|system/cms/logs|\.git|\.hg).*$
# Send request via index.php (again, not if its a real file or folder)
RewriteCond %{REQUEST_FILENAME} !-f
View
1 build.xml
@@ -19,7 +19,6 @@
<include name="installer/**" />
<include name="system/**" />
<include name="uploads/**" />
- <include name="vendor/**" />
<include name=".htaccess" />
<include name="index.php" />
<include name="LICENSE" />
View
24 composer.json
@@ -1,9 +1,22 @@
{
+ "autoload": {
+ "classmap": [
+ "system/cms/controllers",
+ "system/cms/libraries"
+ ],
+ "psr-0": {
+ "Pyro": "system/cms/src/"
+ }
+ },
+
"minimum-stability": "dev",
-
"prefer-stable": true,
"preferred-install": "dist",
+ "config": {
+ "vendor-dir": "system/vendor"
+ },
+
"require": {
"pyrocms/lex": "2.2.*",
"doctrine/dbal": "2.4.x",
@@ -25,14 +38,5 @@
"illuminate/encryption": "4.0.*",
"illuminate/redis": "4.0.*",
"phing/phing": "2.6.*"
- },
- "autoload": {
- "classmap": [
- "system/cms/controllers",
- "system/cms/libraries"
- ],
- "psr-0": {
- "Pyro": "system/cms/src/"
- }
}
}
View
2 index.php
@@ -222,7 +222,7 @@
* ...and it will take care of our classes
*
*/
-require_once FCPATH.'vendor/autoload.php';
+require_once FCPATH.'system/vendor/autoload.php';
/*
* --------------------------------------------------------------------------
View
4 installer/index.php
@@ -223,11 +223,11 @@
* ...and it will take care of our classes
*
*/
-if (!file_exists('../vendor/autoload.php')) {
+if (!file_exists('../system/vendor/autoload.php')) {
echo "It seems composer hasn't been installed yet. Please reload this page after running the following commands in a terminal:";
exit("<pre>cd ".realpath('..')."\nphp composer.phar install</pre>");
}
-require_once '../vendor/autoload.php';
+require_once '../system/vendor/autoload.php';
/*
* --------------------------------------------------------------------

0 comments on commit 8b78e72

Please sign in to comment.