Commit9fb9fa8

committed

Merge remote-tracking branch 'mercury/2.8' into 2.8

* mercury/2.8: (194 commits) fix some issues after merging 2.7 into 2.8 fix another bug due to choosing the wrong branch Update some screenshots to wrap them with a browser window some minor tweaks fix bugs due to choosing the wrong base branch complete component cross references Updated the Global Composer Installation article Removing an index to forms - this seemed to cause big errors in how the index/breadcrumbs were built Switching wrong link order Remove mentions of (cook)book Fix build Remove mentions of cookbook/book making sure the getting started navigation is smooth Add file extension to SOAP article Rename cache/ to http_cache/ Correcting the "next" page to point to creating pages Rewords Tweaking our fake homepage - there isn't a book or cookbook exactly Tweaking our fake index page so that Getting Started doesn't make a huge, deep list Fixing build issues ...

2 parents6a9e519 +ffd7507 commit9fb9fa8Copy full SHA for 9fb9fa8

File tree

540 files changed

+15850

-17533

lines changed

.github
- CONTRIBUTING.md
.gitignore
.travis.yml
_build
- Makefile
- _theme
  - _exts/symfonycom
    - __init__.py
    - sphinx
      - __init__.py
  - _templates
- conf.py
- make.bat
- redirection_map
_images
- components
- contributing
- controller/error_pages
  - errors-in-prod-environment.png
  - exceptions-in-dev-environment.png
- deployment/azure-website
- docs-pull-request-change-base.png
- doctrine
- form
- http
- install
  - deprecations-in-profiler.png
- quick_tour
- reference/form
- release-process.jpg
- security
- translation
_includes
- _rewrite_rule_tip.rst.inc
- service_container
  - _my_mailer.rst.inc
assetic.rst
assetic
- _standard_edition_warning.rst.inc
- apply_to_option.rst
- asset_management.rst
- jpeg_optimize.rst
- php.rst
- uglifyjs.rst
- yuicompressor.rst
best_practices
- configuration.rst
- controllers.rst
- creating-the-project.rst
- forms.rst
- security.rst
- web-assets.rst
book
- configuration.rst
- controller.rst
- forms.rst
- http_cache.rst
- http_fundamentals.rst
- index.rst
- installation.rst
- map.rst.inc
- page_creation.rst
- propel.rst
- routing.rst
- service_container.rst
- validation.rst
bundles.rst
bundles
- best_practices.rst
- configuration.rst
- extension.rst
- index.rst
- inheritance.rst
- installation.rst
- override.rst
- prepend_extension.rst
- remove.rst
components
- asset.rst
- asset
  - index.rst
- browser_kit.rst
- browser_kit
  - index.rst
- class_loader.rst
- class_loader
  - cache_class_loader.rst
  - debug_class_loader.rst
  - index.rst
- config.rst
- config
  - index.rst
- console.rst
- console
  - helpers
  - index.rst
  - introduction.rst
  - logger.rst
  - usage.rst
- css_selector.rst
- debug.rst
- debug
  - class_loader.rst
  - index.rst
- dependency_injection.rst
- dependency_injection
  - advanced.rst
  - compilation.rst
  - configurators.rst
  - definitions.rst
  - index.rst
  - parentservices.rst
  - synthetic_services.rst
  - tags.rst
- dom_crawler.rst
- event_dispatcher.rst
- event_dispatcher
  - container_aware_dispatcher.rst
  - index.rst
- expression_language.rst
- expression_language
  - index.rst
- filesystem.rst
- filesystem
  - index.rst
- form.rst
- form
  - index.rst
- http_foundation.rst
- http_foundation
  - index.rst
  - trusting_proxies.rst
- http_kernel.rst
- http_kernel
  - index.rst
- index.rst
- intl.rst
- map.rst.inc
- options_resolver.rst
- phpunit_bridge.rst
- property_access.rst
- property_access
  - index.rst
- property_info.rst
- routing.rst
- routing
  - index.rst
- security.rst
- security
  - authentication.rst
  - index.rst
- serializer.rst
- templating.rst
- templating
  - assetshelper.rst
  - helpers
    - index.rst
    - map.rst.inc
  - index.rst
  - slotshelper.rst
- translation.rst
- translation
  - index.rst
- validator.rst
- var_dumper.rst
- var_dumper
  - index.rst
- yaml.rst
- yaml
  - index.rst
configuration.rst
configuration
- apache_router.rst
- configuration_organization.rst
- environments.rst
- external_parameters.rst
- front_controllers_and_kernel.rst
- micro_kernel_trait.rst
- override_dir_structure.rst
- using_parameters_in_dic.rst
console.rst
console
- calling_commands.rst
- coloring.rst
- command_in_controller.rst
- commands_as_services.rst
- input.rst
- logging.rst
- request_context.rst
- style.rst
- usage.rst
- verbosity.rst
contributing
- code
  - security.rst
  - tests.rst
- community
  - releases.rst
- documentation
  - format.rst
  - overview.rst
controller.rst
controller
- csrf_token_validation.rst
- error_pages.rst
- forwarding.rst
- service.rst
- soap_web_service.rst
- upload_file.rst
cookbook
- assetic
  - index.rst
- cache
  - index.rst
- composer.rst
- configuration
  - index.rst
- console
  - console_command.rst
  - index.rst
- controller
  - index.rst
- deployment
  - index.rst
- doctrine
  - index.rst
- email
  - index.rst
- event_dispatcher
  - index.rst
- expression
  - index.rst
- form
  - index.rst
- frontend
  - index.rst
- index.rst
- install
  - index.rst
- logging
  - index.rst
  - monolog.rst
- map.rst.inc
- profiler
  - index.rst
- request
  - index.rst
- routing
  - index.rst
  - method_parameters.rst
- security
  - index.rst
- service_container
  - index.rst
- session
  - index.rst
- templating
  - index.rst
- testing
  - index.rst
- upgrade
  - index.rst
- validation
  - index.rst
- web_server
  - index.rst
- web_services
  - index.rst
- workflow
  - index.rst
create_framework
- front_controller.rst
- http_foundation.rst
- http_kernel_controller_resolver.rst
- http_kernel_httpkernelinterface.rst
- introduction.rst
- routing.rst
debug.rst
debug
- debugging.rst
deployment.rst
deployment
- azure-website.rst
- fortrabbit.rst
- heroku.rst
- platformsh.rst
- tools.rst
doctrine.rst
doctrine
- associations.rst
- common_extensions.rst
- console.rst
- custom_dql_functions.rst
- dbal.rst
- event_listeners_subscribers.rst
- lifecycle_callbacks.rst
- mapping_model_classes.rst
- mongodb_session_storage.rst
- multiple_entity_managers.rst
- pdo_session_storage.rst
- registration_form.rst
- repository.rst
- resolve_target_entity.rst
- reverse_engineering.rst
email.rst
email
- cloud.rst
- dev_environment.rst
- gmail.rst
- spool.rst
- testing.rst
event_dispatcher.rst
event_dispatcher
- before_after_filters.rst
- class_extension.rst
- method_behavior.rst
expressions.rst
forms.rst
form
- action_method.rst
- button_based_validation.rst
- create_custom_field_type.rst
- create_form_type_extension.rst
- csrf_protection.rst
- data_based_validation.rst
- data_transformers.rst
- direct_submit.rst
- disabling_validation.rst
- dynamic_form_modification.rst
- embedded.rst
- events.rst
- form_collections.rst
- form_customization.rst
- form_dependencies.rst
- form_themes.rst
- inherit_data_option.rst
- multiple_buttons.rst
- rendering.rst
- type_guesser.rst
- unit_testing.rst
- use_empty_data.rst
- use_virtuals_forms.rst
- validation_groups.rst
- without_class.rst
frontend.rst
frontend
- bower.rst
getting_started
- index.rst
http_cache.rst
http_cache
- cache_invalidation.rst
- cache_vary.rst
- esi.rst
- expiration.rst
- form_csrf_caching.rst
- validation.rst
- varnish.rst
index.rst
introduction
- from_flat_php_to_symfony2.rst
- http_fundamentals.rst
- symfony1.rst
logging.rst
logging
- channels_handlers.rst
- disable_microsecond_precision.md
- formatter.rst
- monolog_console.rst
- monolog_email.rst
- monolog_regex_based_excludes.rst
- processors.rst
page_creation.rst
performance.rst
profiler.rst
profiler
- data_collector.rst
- matchers.rst
- profiling_data.rst
- storage.rst
quick_tour
- the_architecture.rst
- the_big_picture.rst
- the_view.rst
redirection_map
reference
- configuration
- constraints
- dic_tags.rst
- events.rst
- forms/types
- twig_reference.rst
request.rst
request
- load_balancer_reverse_proxy.rst
- mime_type.rst
- psr7.rst
routing.rst
routing
- conditions.rst
- custom_route_loader.rst
- debug.rst
- external_resources.rst
- extra_information.rst
- generate_url_javascript.rst
- hostname_pattern.rst
- optional_placeholders.rst
- redirect_in_config.rst
- redirect_trailing_slash.rst
- requirements.rst
- routing_from_database.rst
- scheme.rst
- service_container_parameters.rst
- slash_in_parameter.rst
security.rst
security
- _ircmaxwell_password-compat.rst.inc
- _supportsToken.rst.inc
- access_control.rst
- acl.rst
- acl_advanced.rst
- api_key_authentication.rst
- csrf_in_login_form.rst
- custom_authentication_provider.rst
- custom_password_authenticator.rst
- custom_provider.rst
- entity_provider.rst
- firewall_restriction.rst
- force_https.rst
- form_login.rst
- form_login_setup.rst
- guard_authentication.rst
- host_restriction.rst
- impersonating_user.rst
- ldap.rst
- multiple_guard_authenticators.rst
- multiple_user_providers.rst
- named_encoders.rst
- password_encoding.rst
- pre_authenticated.rst
- remember_me.rst
- securing_services.rst
- security_checker.rst
- target_path.rst
- user_checkers.rst
- voters.rst
serializer.rst
service_container.rst
service_container
- alias_private.rst
- compiler_passes.rst
- configurators.rst
- debug.rst
- definitions.rst
- expression_language.rst
- factories.rst
- import.rst
- injection_types.rst
- lazy_services.rst
- optional_dependencies.rst
- parameters.rst
- parent_services.rst
- request.rst
- scopes.rst
- service_decoration.rst
- shared.rst
- synthetic_services.rst
- tags.rst
- third_party.rst
session.rst
session
- avoid_session_start.rst
- limit_metadata_writes.rst
- locale_sticky_session.rst
- php_bridge.rst
- proxy_examples.rst
- sessions_directory.rst
setup.rst
setup
- _update_all_packages.rst.inc
- _update_dep_errors.rst.inc
- _vendor_deps.rst.inc
- built_in_web_server.rst
- bundles.rst
- composer.rst
- file_permissions.rst
- homestead.rst
- new_project_git.rst
- new_project_svn.rst
- unstable_versions.rst
- upgrade_major.rst
- upgrade_minor.rst
- upgrade_patch.rst
- web_server_configuration.rst
templating.rst
templating
- PHP.rst
- app_variable.rst
- debug.rst
- embedding_controllers.rst
- escaping.rst
- formats.rst
- global_variables.rst
- hinclude.rst
- inheritance.rst
- namespaced_paths.rst
- overriding.rst
- render_without_controller.rst
- syntax.rst
- templating_service.rst
- twig_extension.rst
testing.rst
testing
- bootstrap.rst
- database.rst
- doctrine.rst
- http_authentication.rst
- insulating_clients.rst
- profiling.rst
- simulating_authentication.rst
translation.rst
translation
- debug.rst
- locale.rst
validation.rst
validation
- custom_constraint.rst
- group_service_resolver.rst
- groups.rst
- raw_values.rst
- sequence_provider.rst
- severity.rst
- translations.rst

Some content is hidden

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

540 files changed

+15850

-17533

lines changed

`‎CONTRIBUTING.md‎renamed to ‎.github/CONTRIBUTING.md‎`

`‎.gitignore‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`		`-/_build`
	`1`	`+/_build/doctrees`
	`2`	`+/_build/html`
`2`	`3`	`*.pyc`

`‎.travis.yml‎`

Lines changed: 3 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,14 @@`
`1`	`1`	`language:python`
`2`	`2`
`3`		`-python:"2.7"`
	`3`	`+python:2.7`
`4`	`4`
`5`	`5`	`sudo:false`
`6`		`-`
`7`	`6`	`cache:`
`8`		`-directories:`
`9`		`- -$HOME/.cache/pip`
`10`		`- -_build`
	`7`	`+directories:[$HOME/.cache/pip]`
`11`	`8`
`12`	`9`	`install:pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git`
`13`	`10`
`14`		`-script:sphinx-build -nW -b html -d _build/doctrees . _build/html`
	`11`	`+script:sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html`
`15`	`12`
`16`	`13`	`branches:`
`17`	`14`	`except:`

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`<divclass=submenu>`
`2`	`2`	`{% set menu = [`
`3`		`- ('The Book', 'book/index'),`
`4`		`- ('The Cookbook', 'cookbook/index'),`
	`3`	`+ ('Home', 'index'),`
`5`	`4`	`('The Components', 'components/index'),`
`6`	`5`	`('The Best Practices', 'best_practices/index'),`
`7`	`6`	`('The Quick Tour', 'quick_tour/index'),`

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@`
`75`	`75`
`76`	`76`	`# List of patterns, relative to source directory, that match files and`
`77`	`77`	`# directories to ignore when looking for source files.`
`78`		`-exclude_patterns= ['_theme']`
	`78`	`+exclude_patterns= ['_build']`
`79`	`79`
`80`	`80`	# The reST default role (used for this markup: `text`) to use for all documents.
`81`	`81`	`#default_role = None`
`@@ -279,4 +279,3 @@`
`279`	`279`
`280`	`280`	`# Use PHP syntax highlighting in code examples by default`
`281`	`281`	`highlight_language='php'`
`282`		`-`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit9fb9fa8

File tree

540 files changed

Some content is hidden

540 files changed

`‎CONTRIBUTING.md‎renamed to ‎.github/CONTRIBUTING.md‎`

`‎.gitignore‎`

`‎.travis.yml‎`

`‎Makefile‎renamed to ‎_build/Makefile‎`

`‎_theme/_exts/symfonycom/init.py‎renamed to ‎_build/_theme/_exts/symfonycom/init.py‎`

`‎_theme/_exts/symfonycom/sphinx/init.py‎renamed to ‎_build/_theme/_exts/symfonycom/sphinx/init.py‎`

`‎_theme/_templates/globaltoc.html‎renamed to ‎_build/_theme/_templates/globaltoc.html‎`

`‎_theme/_templates/layout.html‎renamed to ‎_build/_theme/_templates/layout.html‎`

`‎_theme/_templates/localtoc.html‎renamed to ‎_build/_theme/_templates/localtoc.html‎`

`‎conf.py‎renamed to ‎_build/conf.py‎`

0 commit comments