rename /install dir

.travis.yml

@@ -15,7 +15,7 @@ before_script:
   - composer install --prefer-dist --dev
   - sh -c "mysql -u$DB_USER -e 'SET FOREIGN_KEY_CHECKS = 0; DROP DATABASE IF EXISTS thelia;SET FOREIGN_KEY_CHECKS = 1;'; fi"
   - php Thelia thelia:install --db_host=localhost --db_username=$DB_USER --db_name=thelia
-  - php install/faker.php
+  - php setup/faker.php
   - php Thelia module:activate Colissimo
   - php Thelia module:activate Cheque
 

core/lib/Thelia/Install/Database.php

@@ -84,8 +84,8 @@ class Database
         if (null === $extraSqlFiles) {
             $sql = array_merge(
                 $sql,
-                $this->prepareSql(file_get_contents(THELIA_ROOT . '/install/thelia.sql')),
+                $this->prepareSql(file_get_contents(THELIA_ROOT . '/setup/thelia.sql')),
-                $this->prepareSql(file_get_contents(THELIA_ROOT . '/install/insert.sql'))
+                $this->prepareSql(file_get_contents(THELIA_ROOT . '/setup/insert.sql'))
             );
         } else {
             foreach ($extraSqlFiles as $fileToInsert) {

core/lib/Thelia/Install/Update.php

@@ -93,9 +93,9 @@ class Update
 
     protected function updateToVersion($version, Database $database,Tlog $logger)
     {
-        if (file_exists(THELIA_ROOT . '/install/update/'.$version.'.sql')) {
+        if (file_exists(THELIA_ROOT . '/setup/update/'.$version.'.sql')) {
             $logger->debug(sprintf('inserting file %s', $version.'$sql'));
-            $database->insertSql(null, array(THELIA_ROOT . '/install/update/'.$version.'.sql'));
+            $database->insertSql(null, array(THELIA_ROOT . '/setup/update/'.$version.'.sql'));
             $logger->debug(sprintf('end inserting file %s', $version.'$sql'));
         }
 

reset_install.bat

@@ -22,16 +22,16 @@ if exist local\config\database.yml (
     ..\..\bin\propel build -v --output-dir=../../core/lib/ --enable-identifier-quoting
 
     echo [INFO] Building SQL CREATE file
-    ..\..\bin\propel sql:build -v --output-dir=..\..\install
+    ..\..\bin\propel sql:build -v --output-dir=..\..\setup
 
 
     echo [INFO] Reloading Thelia2 database
     cd ..\..
-    del install\sqldb.map
+    del setup\sqldb.map
     php Thelia thelia:dev:reloadDB
 
     echo [INFO] Installing fixtures
-    php install\faker.php
+    php setup\faker.php
 
     echo [INFO] Clearing caches
     php Thelia cache:clear

reset_install.sh

@@ -21,15 +21,15 @@ echo -e "\n\033[01;34m[INFO] Building Models file\033[00m\n"
 ../../bin/propel build -v --output-dir=../../core/lib/ --enable-identifier-quoting
 
 echo -e "\n\033[01;34m[INFO] Building SQL CREATE file\033[00m\n"
-../../bin/propel sql:build -v --output-dir=../../install/
+../../bin/propel sql:build -v --output-dir=../../setup/
 
 echo -e "\n\033[01;34m[INFO] Reloading Thelia2 database\033[00m\n"
 cd ../..
-rm install/sqldb.map
+rm setup/sqldb.map
 php Thelia thelia:dev:reloadDB
 
 echo -e "\n\033[01;34m[INFO] Installing fixtures\033[00m\n"
-php install/faker.php
+php setup/faker.php
 
 echo -e "\n\033[01;34m[INFO] Adding admin\033[00m\n"
 php Thelia admin:create --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2

run_casperjs.sh

@@ -9,7 +9,7 @@ echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n"
 ../../bin/propel build -v --output-dir=../../core/lib/
 
 echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n"
-../../bin/propel sql:build -v --output-dir=../../install/
+../../bin/propel sql:build -v --output-dir=../../setup/
 
 echo -e "\n\e[01;34m[INFO] Reloaded Thelia2 database\e[00m\n"
 cd ../..
@@ -17,7 +17,7 @@ rm install/sqldb.map
 php Thelia thelia:dev:reloadDB
 
 echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n"
-php install/faker.php
+php setup/faker.php
 
 echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n"
 php Thelia thelia:create-admin --login_name thelia2 --password thelia2 --last_name thelia2 --first_name thelia2

setup/import.php

@@ -83,7 +83,7 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co
 {
     echo "start creating products\n";
     $fileSystem = new \Symfony\Component\Filesystem\Filesystem();
-    if (($handle = fopen(THELIA_ROOT . '/install/import/products.csv', "r")) !== FALSE) {
+    if (($handle = fopen(THELIA_ROOT . '/setup/import/products.csv', "r")) !== FALSE) {
         $row=0;
         while (($data = fgetcsv($handle, 100000, ";")) !== FALSE) {
             $row++;
@@ -134,7 +134,7 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co
                     ->setProduct($product)
                     ->setFile($image)
                     ->save($con);
-                $fileSystem->copy(THELIA_ROOT . 'install/import/images/'.$image, THELIA_ROOT . 'local/media/images/product/'.$image, true);
+                $fileSystem->copy(THELIA_ROOT . 'setup/import/images/'.$image, THELIA_ROOT . 'local/media/images/product/'.$image, true);
             }
 
             $pses = explode(";", $data[12]);
@@ -199,7 +199,7 @@ function createProduct($faker, $categories, $template, $attribute, $feature, $co
 function createBrand($con)
 {
     echo "start creating brands feature\n";
-    if (($handle = fopen(THELIA_ROOT . '/install/import/brand.csv', "r")) !== FALSE) {
+    if (($handle = fopen(THELIA_ROOT . '/setup/import/brand.csv', "r")) !== FALSE) {
         $row=0;
         $feature = new \Thelia\Model\Feature();
         $feature
@@ -232,7 +232,7 @@ function createCategories($con)
 {
     echo "start creating categories\n";
     $categories = array();
-    if (($handle = fopen(THELIA_ROOT . '/install/import/categories.csv', "r")) !== FALSE) {
+    if (($handle = fopen(THELIA_ROOT . '/setup/import/categories.csv', "r")) !== FALSE) {
         $row=0;
         while (($data = fgetcsv($handle, 1000, ";")) !== FALSE) {
             $row++;
@@ -259,7 +259,7 @@ function createCategories($con)
 function createColors($con)
 {
     echo "start creating colors attributes\n";
-    if (($handle = fopen(THELIA_ROOT . '/install/import/colors.csv', "r")) !== FALSE) {
+    if (($handle = fopen(THELIA_ROOT . '/setup/import/colors.csv', "r")) !== FALSE) {
         $row=0;
         $attribute = new \Thelia\Model\Attribute();
         $attribute