Permalink
Browse files

Merge branch '1.3'

* 1.3:
  Reverted default value that causes BC break
  Removed leftover Symfony3 references
  Update template.rst
  [Docs] Update year in copyright
  Update disabling-localised-urls.rst
  Update disabling-localised-urls.rst
  Update installation.rst
  Correct grammar mistake in README
  • Loading branch information...
pamil committed Oct 9, 2018
2 parents 52833ef + 6292042 commit 77a1fe07bfd13d187fa96ff0ad20fa54ded834e0
View
@@ -44,7 +44,7 @@ Official plugins
This is the list of officially supported Sylius plugins:
- [Admin Order Creation Plugin](https://github.com/Sylius/AdminOrderCreationPlugin) -
allows to create orders directly from the administrator panel
allows creating orders directly from the administrator panel
- [Customer Order Cancellation Plugin](https://github.com/Sylius/CustomerOrderCancellationPlugin) -
allows customer to cancel a placed order which has not been processed yet
- [Customer Reorder Plugin](https://github.com/Sylius/CustomerReorderPlugin) -
@@ -32,7 +32,7 @@ To create a new project using Sylius Standard Edition, run this command:
.. note::
Make sure to use PHP ^7.1. Using an older PHP version will result in installing an older version of Sylius.
Make sure to use PHP ^7.2. Using an older PHP version will result in installing an older version of Sylius.
This will create a new Symfony project in ``acme`` directory. When all the dependencies are installed,
you should create `.env` file basing on provides `.env.dist` files. The most important parameter that need to be set,
View
@@ -7,7 +7,7 @@
source_suffix = '.rst'
master_doc = 'index'
project = 'Sylius'
copyright = u'2011-2017, Paweł Jędrzejewski'
copyright = u'2011-2018, Paweł Jędrzejewski'
version = ''
release = ''
exclude_patterns = ['_includes/*.rst']
@@ -73,8 +73,8 @@ Add this VirtualHost configuration:
RewriteEngine On
DocumentRoot /var/www/sylius/web
<Directory /var/www/sylius/web>
DocumentRoot /var/www/sylius/public
<Directory /var/www/sylius/public>
Options Indexes FollowSymLinks MultiViews
AllowOverride None
Order allow,deny
@@ -7,20 +7,23 @@ look like that ``localhost:8000/en_US/``.
If you do not need localised URLs, this guide will help you to disable this feature.
**1.** Customise the application routing in the ``config/routes.yaml``.
**1.** Customise the application routing in the ``config/routes/sylius_shop.yaml``.
Replace:
.. code-block:: yaml
# config/routes.yaml
# config/routes/sylius_shop.yaml
sylius_shop:
resource: "@SyliusShopBundle/Resources/config/routing.yml"
prefix: /{_locale}
requirements:
_locale: ^[a-z]{2}(?:_[A-Z]{2})?$
sylius_shop_payum:
resource: "@SyliusShopBundle/Resources/config/routing/payum.yml"
sylius_shop_default_locale:
path: /
methods: [GET]
@@ -31,38 +34,54 @@ With:
.. code-block:: yaml
# config/routes.yaml
# config/routes/sylius_shop.yaml
sylius_shop:
resource: "@SyliusShopBundle/Resources/config/routing.yml"
**2.** Customise the security settings in the ``app/config/security.yml``.
sylius_shop_payum:
resource: "@SyliusShopBundle/Resources/config/routing/payum.yml"
**2.** Customise the security settings in the ``config/packages/security.yml``.
Replace:
.. code-block:: yaml
# app/config/security.yml
# config/packages/security.yml
parameters:
# ...
sylius.security.shop_regex: "^/(?!admin|api)[^/]++"
sylius.security.shop_regex: "^/(?!admin|api/.*|api$|media/.*)[^/]++""
With:
.. code-block:: yaml
# app/config/security.yml
# config/packages/security.yml
parameters:
# ...
sylius.security.shop_regex: "^"
**3.** Customise SyliusShopBundle to use storage-based locale switching by adding the following lines at the end of the ``app/config/config.yml``.
**3.** Customise SyliusShopBundle to use storage-based locale switching in the ``config/packages/_sylius.yml``.
Replace :
.. code-block:: yaml
# config/packages/_sylius.yml
sylius_shop:
product_grid:
include_all_descendants: true
With:
.. code-block:: yaml
# app/config/config.yml
# config/packages/_sylius.yml
sylius_shop:
product_grid:
include_all_descendants: true
locale_switcher: storage
@@ -20,7 +20,7 @@ Methods of templates customizing
There are three ways of customizing templates of Sylius:
The first one is simple **templates overriding** inside of the ``templates/bundle`` directory of your project. Using
The first one is simple **templates overriding** inside of the ``templates/bundles`` directory of your project. Using
this method you can completely change the content of templates.
The second method is **templates customization via events**. You are able to listen on these template events,
@@ -84,14 +84,9 @@ protected function execute(InputInterface $input, OutputInterface $output): void
}
}
$frontControllerPath = 'prod' === $this->getEnvironment() ? '/' : sprintf('/app_%s.php', $this->getEnvironment());
$outputStyle->newLine(2);
$outputStyle->success($this->getProperFinalMessage($errored));
$outputStyle->writeln(sprintf(
'You can now open your store at the following path under the website root: <info>%s.</info>',
$frontControllerPath
));
$outputStyle->writeln('You can now open your store at the following path under the website root: /');
}
/**
@@ -75,20 +75,20 @@ private function getHelpMessage(): string
{
return <<<EOT
The <info>%command.name%</info> command installs theme assets into a given
directory (e.g. the <comment>web</comment> directory).
directory (e.g. the <comment>public</comment> directory).
<info>php %command.full_name% web</info>
<info>php %command.full_name% public</info>
A "themes" directory will be created inside the target directory.
To create a symlink to each theme instead of copying its assets, use the
<info>--symlink</info> option (will fall back to hard copies when symbolic links aren't possible):
<info>php %command.full_name% web --symlink</info>
<info>php %command.full_name% public --symlink</info>
To make symlink relative, add the <info>--relative</info> option:
<info>php %command.full_name% web --symlink --relative</info>
<info>php %command.full_name% public --symlink --relative</info>
EOT;
}

0 comments on commit 77a1fe0

Please sign in to comment.