Skip to content

Commit dcad834

Browse files
alexandr-parkhomenkovbyndych
alexandr-parkhomenko
authored and
vbyndych
committed
CRM-6108: Install OroCommerce over OroCRM as a package
- Added application 'commerce-crm' - Added 'commerce-crm' to the testing matrix - Added new application `commerce-crm-ee` - Tests for application `commerce-crm-ee` - Updated documentations and configs on new applications - Fixed issue with circular references - Added 'OroBridgeBundle' - Fixed issue with broken command "oro:activity-contact:recalculate" - Fixed broken test in EntityDataControllerTest - Fixed issue with incorrect url in api tests - Fixed issue with 302 status - Fixed exceptions "Serialization of 'Closure' is not allowed" - Added 'web_backend_prefix' to Behat tests - Fixed tests in `SegmentBundle` bundle - Fixed bug with "Can't install package 'oro/crm' on commerce application through Package manager" ( CRM-6151 ) - Moved behat tests that use enterprise components to package 'crm-enterprise' - Fix issues with "Can't get single identifier" ( CRM-6156 ) - Fix Oro\Bundle\DataAudit\Tests\Functional\ControllersTest::testAuditHistory test ( CRM-6158 ) - Fix issue with killing process on Travis ( testsuite: "functional tests on php 5.x" ) ( CRM-6153 ) - Fix test Oro\Bundle\WorkflowBundle\Tests\Functional\Controller\ProcessDefinitionControllerTest::testIndexAction ( CRM-6161 ) - Fix test Oro\Bundle\WorkflowBundle\Tests\Functional\Controller\ProcessDefinitionControllerTest::testIndexAction ( CRM-6161 ) - Fixed for Oro\Bundle\SoapBundle\Tests\Functional\Routing\FixRestAnnotationsTest::testRestApiRoutes ( CRM-6160 ) - Fixed issue with "Call to undefined method Oro\Component\MessageQueue\Client\TraceableMessageProducer::enable()" ( CRM-6191 ) - Fix issue with killing process on Travis ( testsuite: "functional tests on php 5.x" ) ( CRM-6153 ) - Fix problem with Oro\Bundle\WarehouseBundle\Tests\Functional\Api\WarehouseInventoryLevelApiTest ( CRM-6157 ) - Fixed for Oro\Bundle\SoapBundle\Tests\Functional\Routing\FixRestAnnotationsTest::testRestApiRoutes ( CRM-6160 ) - Fixed functional test Oro\Bundle\UserBundle\Tests\Functional\API\RestRolesTest::testGetRoleById ( CRM-6162 ) - Fix Failed asserting that 401 matches expected 200 ( CRM-6159 ) - Fixed issue with ( "Unable to see content on 'General' tab on config page on CRM+Commerce application" ) ( CRM-6150 ) - Fixed issue with ( Failed asserting that null matches expected 1 (Commerce upgrade specific bug)" ) ( CRM-6188 ) - Fixed issue with "Failed asserting that actual size 0 matches expected size 1" ( CRM-6186 ) - Added build on `commerce-crm-ee` with update from commerce_beta_3 - Fixed issue with broken installer - Added tests upgrade on application/commerce-enterprise - Fix issue with "LogicException: Can't read file entity_export_template_to_csv" ( CRM-6210 ) - Removed unneeded code from Behat contexts - Worked on fixing behat tests ( CRM-6213 ) - Fixed issue with failed command ( CRM-6212 ) - Fix issue with "LogicException: Can't read file entity_export_template_to_csv" ( CRM-6210 ) - Fixed broken authentication on page api/doc ( CRM-6207 ) - Increase execute timeout for sub-commands of `oro:platform:update` ( CRM-6212 ) - Fix issue with failed test `Oro\Bundle\DistributionBundle\Tests\Functional\Script\RunnerTest::testShouldRunUpdatePlatformCommandWithoutErrors` ( CRM-6212 ) - Added parameter 'web_backend_prefix' to CRM and CRM-enterprise - Rename `Sales Manager` to `Sales Assistent` in Commerce - Rename all tabs and entities that relate to commerce 'Account' to 'Customer' ( CRM-6270 ) - Fixed broken tests in Oro\Bundle\ApiBundle\Tests\Functional\RestJsonApiFormValidationTest ( CRM-6268 )
0 parents  commit dcad834

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+17373
-0
lines changed

‎.gitignore

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/.settings
2+
/.buildpath
3+
/.project
4+
/.idea
5+
/node_modules
6+
/composer.phar
7+
composer.lock
8+
behat.yml
9+
/build/logs/*
10+
/vendor
11+
node_modules/
12+
/cov
13+
/web/bundles
14+
/web/css
15+
/web/images
16+
/web/js
17+
/web/uploads/users/*
18+
/web/media/cache
19+
/web/build.js
20+
/app/phpunit.xml
21+
/app/karma.conf.js
22+
/app/config/parameters.yml
23+
/app/config/parameters_test.yml
24+
behat.yml
25+
*~
26+
27+
/app/SymfonyRequirements.php

‎CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Initial Code Release
2+
====================
3+
This is the initial code release. The changes made in the next releases will be described in this file.

‎LICENSE

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
OroCommerce
2+
3+
The Open Software License version 3.0
4+
5+
Copyright (c) 2015, Oro, Inc.
6+
7+
Full license is at: http://opensource.org/licenses/OSL-3.0

‎README.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
OroCommerce+OroCRM Sample Application
2+
==============================
3+
4+
## Requirements
5+
6+
OroCommerce+OroCRM is a Symfony 2 based application with the following requirements:
7+
8+
* PHP 5.5.9 or above
9+
* PHP 5.5.9 or above with command line interface
10+
* PHP Extensions
11+
* GD
12+
* Mcrypt
13+
* JSON
14+
* ctype
15+
* Tokenizer
16+
* SimpleXML
17+
* PCRE
18+
* ICU
19+
* MySQL 5.1 or above
20+
* PostgreSQL 9.1 or above

‎app/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/bootstrap.php.cache
2+
/phpunit.xml
3+
/karma.conf.js
4+
/attachment/*.*

‎app/.htaccess

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
deny from all

‎app/AppCache.php

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?php
2+
3+
require_once __DIR__.'/AppKernel.php';
4+
5+
use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
6+
7+
class AppCache extends HttpCache
8+
{
9+
}

‎app/AppKernel.php

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?php
2+
3+
use Symfony\Component\Config\Loader\LoaderInterface;
4+
5+
use Oro\Bundle\DistributionBundle\OroKernel;
6+
7+
class AppKernel extends OroKernel
8+
{
9+
public function registerBundles()
10+
{
11+
$bundles = array(
12+
// bundles
13+
);
14+
15+
if ('dev' === $this->getEnvironment()) {
16+
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
17+
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
18+
if (class_exists('Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle')) {
19+
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
20+
}
21+
}
22+
23+
if ('test' === $this->getEnvironment()) {
24+
$bundles[] = new Oro\Bundle\TestFrameworkBundle\OroTestFrameworkBundle();
25+
$bundles[] = new Oro\Bundle\FrontendTestFrameworkBundle\OroFrontendTestFrameworkBundle();
26+
}
27+
28+
return array_merge(parent::registerBundles(), $bundles);
29+
}
30+
31+
public function registerContainerConfiguration(LoaderInterface $loader)
32+
{
33+
$loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
34+
}
35+
36+
protected function initializeContainer()
37+
{
38+
static $first = true;
39+
40+
if ('test' !== $this->getEnvironment()) {
41+
parent::initializeContainer();
42+
return;
43+
}
44+
45+
$debug = $this->debug;
46+
47+
if (!$first) {
48+
// disable debug mode on all but the first initialization
49+
$this->debug = false;
50+
}
51+
52+
// will not work with --process-isolation
53+
$first = false;
54+
55+
try {
56+
parent::initializeContainer();
57+
} catch (\Exception $e) {
58+
$this->debug = $debug;
59+
throw $e;
60+
}
61+
62+
$this->debug = $debug;
63+
}
64+
}

‎app/DistributionKernel.php

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
<?php
2+
3+
use Symfony\Component\Config\Loader\LoaderInterface;
4+
use Symfony\Component\HttpKernel\Kernel;
5+
6+
class DistributionKernel extends Kernel
7+
{
8+
/**
9+
* {@inheritdoc}
10+
*/
11+
public function registerBundles()
12+
{
13+
$bundles = array(
14+
new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
15+
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
16+
new Symfony\Bundle\TwigBundle\TwigBundle(),
17+
new Symfony\Bundle\AsseticBundle\AsseticBundle(),
18+
new Symfony\Bundle\MonologBundle\MonologBundle(),
19+
new Oro\Bundle\DistributionBundle\OroDistributionBundle(),
20+
new Symfony\Bundle\SecurityBundle\SecurityBundle(),
21+
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
22+
new Oro\Bundle\HelpBundle\OroHelpBundle(),
23+
new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
24+
new Oro\Bundle\PlatformBundle\OroPlatformBundle(),
25+
new Oro\Bundle\InstallerBundle\OroInstallerBundle(),
26+
);
27+
28+
if ('dev' === $this->getEnvironment()) {
29+
$bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
30+
$bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
31+
if (class_exists('Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle')) {
32+
$bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
33+
}
34+
}
35+
36+
return $bundles;
37+
}
38+
39+
/**
40+
* {@inheritdoc}
41+
*/
42+
public function getCacheDir()
43+
{
44+
return $this->rootDir . '/cache/dist/' . $this->environment;
45+
}
46+
47+
/**
48+
* {@inheritdoc}
49+
*
50+
* @api
51+
*/
52+
public function getLogDir()
53+
{
54+
return $this->rootDir . '/logs/dist';
55+
}
56+
57+
58+
/**
59+
* {@inheritdoc}
60+
*/
61+
public function registerContainerConfiguration(LoaderInterface $loader)
62+
{
63+
$loader->load(__DIR__ . '/config/dist/config_' . $this->getEnvironment().'.yml');
64+
}
65+
}

0 commit comments

Comments
 (0)