Update Sylius plugin skeleton

BitBagCommerce · Feb 2, 2018 · 5540c0a · 5540c0a
1 parent e1171cd
commit 5540c0a
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 44 deletions.
diff --git a/tests/Application/.gitignore b/tests/Application/.gitignore
@@ -1,21 +1,10 @@
 /node_modules/
 
-<<<<<<< HEAD
-/var/
-!/var/.gitkeep
-
-/web/assets
-/web/media
-=======
 /var/*
 !/var/.gitkeep
 
-<<<<<<< HEAD
-/web/
-=======
 /web/*
->>>>>>> 1.0
+
 !/web/app.php
 !/web/app_dev.php
 !/web/app_test.php
->>>>>>> a234fcdaa31aaea4c11ba6ce577f4f225747cdd2
diff --git a/tests/Application/Gulpfile.js b/tests/Application/Gulpfile.js
@@ -6,13 +6,9 @@ config = [
     '--rootPath',
     argv.rootPath || '../../../../../../../tests/Application/web/assets/',
     '--nodeModulesPath',
-<<<<<<< HEAD
     argv.nodeModulesPath || '../../../../../../../tests/Application/node_modules/',
     '--vendorPath',
     argv.vendorPath || '../../../../../../../vendor/'
-=======
-    argv.nodeModulesPath || '../../../../../../../tests/Application/node_modules/'
->>>>>>> a234fcdaa31aaea4c11ba6ce577f4f225747cdd2
 ];
 
 gulp.task('admin', function() {

diff --git a/tests/Application/app/config/config.yml b/tests/Application/app/config/config.yml
@@ -8,17 +8,12 @@ imports:
     - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" }
     - { resource: "@SyliusAdminApiBundle/Resources/config/app/config.yml" }
 
-<<<<<<< HEAD
     - { resource: "@ShippingExportPlugin/Resources/config/config.yml" }
 
     - { resource: "../../../../vendor/sylius/sylius/app/config/security.yml" }
 
     - { resource: "services.yml" }
 
-=======
-    - { resource: "../../../../vendor/sylius/sylius/app/config/security.yml" }
-
->>>>>>> a234fcdaa31aaea4c11ba6ce577f4f225747cdd2
 framework:
     translator: { fallbacks: ["%locale%", "en"] }
     secret: "%secret"
@@ -45,11 +40,7 @@ swiftmailer:
 doctrine:
     dbal:
         driver: "pdo_sqlite"
-<<<<<<< HEAD
-        path: "%kernel.cache_dir%/db.sql"
-=======
         path: "%kernel.root_dir%/../var/db.sql"
->>>>>>> a234fcdaa31aaea4c11ba6ce577f4f225747cdd2
         charset: UTF8
 
 fos_rest:

diff --git a/tests/Application/app/config/routing.yml b/tests/Application/app/config/routing.yml
@@ -1,13 +1,6 @@
 sylius:
     resource: "../../../../vendor/sylius/sylius/app/config/routing.yml"
 
-<<<<<<< HEAD
 bitbag_shipping_export_plugin:
     resource: "@ShippingExportPlugin/Resources/config/routing.yml"
     prefix: /admin
-=======
-# Put your own routes here
-
-acme_sylius_example_shop:
-    resource: "@AcmeSyliusExamplePlugin/Resources/config/app/shop_routing.yml"
->>>>>>> a234fcdaa31aaea4c11ba6ce577f4f225747cdd2
diff --git a/tests/Application/bin/console b/tests/Application/bin/console
@@ -12,12 +12,7 @@ use Symfony\Component\Debug\Debug;
 
 set_time_limit(0);
 
-<<<<<<< HEAD
-/** @var Composer\Autoload\ClassLoader $loader */
-$loader = require __DIR__.'/../app/autoload.php';
-=======
 require __DIR__ . '/../../../vendor/autoload.php';
->>>>>>> a234fcdaa31aaea4c11ba6ce577f4f225747cdd2
 
 $input = new ArgvInput();
 $env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');

diff --git a/tests/Application/package.json b/tests/Application/package.json
@@ -1,10 +1,6 @@
 {
   "dependencies": {
-<<<<<<< HEAD
-    "jquery": "^2.2.0",
-=======
     "jquery": "^3.2.0",
->>>>>>> a234fcdaa31aaea4c11ba6ce577f4f225747cdd2
     "lightbox2": "^2.9.0",
     "semantic-ui-css": "^2.2.0"
   },
@@ -21,10 +17,7 @@
     "gulp-uglify": "^1.5.1",
     "gulp-uglifycss": "^1.0.5",
     "merge-stream": "^1.0.0",
-<<<<<<< HEAD
-=======
     "node-sass": "^4.5.3",
->>>>>>> a234fcdaa31aaea4c11ba6ce577f4f225747cdd2
     "yargs": "^6.4.0"
   },
   "scripts": {