Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PhpUnitBridge] Remove section about clock mocking #6564

Merged
merged 1 commit into from
May 13, 2016

Conversation

z38
Copy link
Contributor

@z38 z38 commented May 12, 2016

As the feature is not present in Symfony 2.7, the corresponding section is removed. #6563 adds a versionadded directive to versions after 2.7.

Q A
Doc fix? yes
New docs? no
Applies to 2.7
Fixed tickets -

As the feature is not present in Symfony 2.7, the corresponding section is removed.
@javiereguiluz
Copy link
Member

@z38 👍 nice catch! This feature was introduced in 2.8.

@wouterj wouterj merged commit 5fc86b2 into symfony:2.7 May 13, 2016
wouterj added a commit that referenced this pull request May 13, 2016
This PR was merged into the 2.7 branch.

Discussion
----------

[PhpUnitBridge] Remove section about clock mocking

As the feature is not present in Symfony 2.7, the corresponding section is removed. #6563 adds a `versionadded` directive to versions after 2.7.

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | 2.7
| Fixed tickets | -

Commits
-------

5fc86b2 [PhpUnitBridge] Remove section about clock mocking
wouterj added a commit that referenced this pull request May 13, 2016
@wouterj
Copy link
Member

wouterj commented May 13, 2016

Good job, thanks! I've merged both PRs and made sure everything is there in the 2.8 branch again.

xabbuh added a commit that referenced this pull request May 14, 2016
* 2.8:
  [#6566] fix indentation
  Update options_resolver.rst
  Fixing a typo - thanks to @tacman
  Fix build
  [#6564] Revert doc removal in 2.8
  Replace property_accessor by property_access
  Remove extra spaces in Nginx template
  [#6539] Some small improvements
  Documented the "autoescape" TwigBundle config option
  [PhpUnitBridge] Add versionadded directive to clock mocking section
  [PhpUnitBridge] Remove section about clock mocking
  fixing special shortcut syntax
  Add missed link to the external PSR-4 specification.
  Editing the Doctrine section to improve accuracy and readability
  Typo fix in the Serializer deserialization example
  drop AppBundle examples in components section
  Make ClockMock Tests\\ namespace matching less specific
  Improved "optional argument" documentation"
xabbuh added a commit that referenced this pull request May 14, 2016
* 3.0:
  [#6566] fix indentation
  Update options_resolver.rst
  Fixing a typo - thanks to @tacman
  Fix build
  [#6564] Revert doc removal in 2.8
  Replace property_accessor by property_access
  Remove extra spaces in Nginx template
  [#6539] Some small improvements
  Documented the "autoescape" TwigBundle config option
  [PhpUnitBridge] Add versionadded directive to clock mocking section
  [PhpUnitBridge] Remove section about clock mocking
  fixing special shortcut syntax
  Add missed link to the external PSR-4 specification.
  Editing the Doctrine section to improve accuracy and readability
  Typo fix in the Serializer deserialization example
  drop AppBundle examples in components section
  merge choice_translation_domain files
  remove 2.x versionadded directives
  Make ClockMock Tests\\ namespace matching less specific
  Improved "optional argument" documentation"
@z38 z38 deleted the fix-clockmock-27 branch May 15, 2016 08:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants