Code

[DRAFT, WIP] PSR-5: PHPDoc Standard#169

Code

Merged

michaelcullum merged 99 commits intophp-fig:masterphp-fig/fig-standards:masterfrom phpDocumentor:masterphpDocumentor/fig-standards:masterCopy head branch name to clipboardJul 9, 2016

+2,246

Commits

Commits on Aug 5, 2013

• Submit PHPDoc proposal and meta-document

  Show description for 796b9d9
  mvriel

  committed
  796b9d9

  Copy full SHA for 796b9d9

• textual changes from first pass review

  ashnazg

  committed
  1572a8b

  Copy full SHA for 1572a8b

• textual changes from second pass review

  ashnazg

  committed
  ad2a261

  Copy full SHA for ad2a261

• Merge pull request #1 from ashnazg/chuck-review

  Show description for 853f44b
  mvriel

  committed
  853f44b

  Copy full SHA for 853f44b

Commits on Aug 6, 2013

• Added Donald Gilbert as sponsor for phpdoc

  mvriel

  committed
  6d1451d

  Copy full SHA for 6d1451d

• Merge branch 'master' of github.com:phpDocumentor/fig-standards

  mvriel

  committed
  fc11367

  Copy full SHA for fc11367

Commits on Aug 13, 2013

• Fix indenting issues

  Seldaek

  committed
  27d90d3

  Copy full SHA for 27d90d3

• Merge pull request #8 from Seldaek/patch

  Show description for e5097b4
  mvriel

  committed
  e5097b4

  Copy full SHA for e5097b4

Commits on Aug 17, 2013

• Remove extraneous lines from null keyword example

  joncave

  committed
  5c56bd9

  Copy full SHA for 5c56bd9

• Don't use single type notation for mixed type arrays

  joncave

  committed
  99dad5c

  Copy full SHA for 99dad5c

• Merge pull request #11 from joncave/patch-1

  Show description for f8d5382
  mvriel

  committed
  f8d5382

  Copy full SHA for f8d5382

• Merge pull request #12 from joncave/patch-2

  Show description for cb518e8
  mvriel

  committed
  cb518e8

  Copy full SHA for cb518e8

Commits on Aug 20, 2013

• Fixing internal links to the tags

  Show description for 7b41a17
  JDGrimes

  committed
  7b41a17

  Copy full SHA for 7b41a17

• #6: Add Generics notation description and refactor ABNF

  mvriel

  committed
  87623ec

  Copy full SHA for 87623ec

• Merge branch 'master' of github.com:phpDocumentor/fig-standards

  mvriel

  committed
  2b4ff37

  Copy full SHA for 2b4ff37

• Merge pull request #13 from JDGrimes/patch-1

  Show description for c640add
  mvriel

  committed
  c640add

  Copy full SHA for c640add

• Merge branch 'master' of github.com:phpDocumentor/fig-standards

  mvriel

  committed
  b3c9f8a

  Copy full SHA for b3c9f8a

Commits on Aug 29, 2013

• Update PSR number to PSR-5

  mvriel

  committed
  9b232fb

  Copy full SHA for 9b232fb

Commits on Sep 4, 2013

• #16: Improve definition of DocComment and object

  mvriel

  committed
  761afeb

  Copy full SHA for 761afeb

• #16: Update Type ABNF according to the suggestion of @nikic

  Show description for a7c09ca
  mvriel

  committed
  a7c09ca

  Copy full SHA for a7c09ca

Commits on Sep 23, 2013

• Fix nested lists

  Show description for 1853628
  GaryJones

  committed
  1853628

  Copy full SHA for 1853628

• Fix typo

  GaryJones

  committed
  2d6149d

  Copy full SHA for 2d6149d

Commits on Sep 24, 2013

• Use File-Level, not Page-Level, for consistency

  Show description for dd20d56
  GaryJones

  committed
  dd20d56

  Copy full SHA for dd20d56

Commits on Oct 10, 2013

• Update @return tag exceptions for constructors, fixes #18

  Show description for 8556da6
  

  Alex Russell

  committed
  8556da6

  Copy full SHA for 8556da6

Commits on Oct 11, 2013

• Merge branch 'master' of https://github.com/php-fig/fig-standards

  mvriel

  committed
  9748de1

  Copy full SHA for 9748de1

• Reword PSR-4 to be more verbose and complete

  mvriel

  committed
  a0f9141

  Copy full SHA for a0f9141

• Change indentation to MD format

  mvriel

  committed
  0e75d8a

  Copy full SHA for 0e75d8a

• Fix numbering

  mvriel

  committed
  b26791d

  Copy full SHA for b26791d

Commits on Nov 1, 2013

• Merge pull request #31 from alexrussell/patch-1

  Show description for ff1ae19
  mvriel

  committed
  ff1ae19

  Copy full SHA for ff1ae19

• Merge pull request #29 from GaryJones/patch-5

  Show description for 1b68927
  mvriel

  committed
  1b68927

  Copy full SHA for 1b68927

Commits on Nov 2, 2013

• Merge pull request #25 from GaryJones/patch-2

  Show description for f717b2b
  mvriel

  committed
  f717b2b

  Copy full SHA for f717b2b

• Merge pull request #23 from GaryJones/patch-1

  Show description for 31d593c
  mvriel

  committed
  31d593c

  Copy full SHA for 31d593c

Commits on Nov 29, 2013

• Fixes #34: altered special exception for @return

  mvriel

  committed
  7b822dd

  Copy full SHA for 7b822dd

• #36 Addresses an ambiguous example

  mvriel

  committed
  c54bc1f

  Copy full SHA for c54bc1f

Commits on Dec 4, 2013

• Merge branch 'master' of https://github.com/php-fig/fig-standards

  Show description for 36e82be
  mvriel

  committed
  36e82be

  Copy full SHA for 36e82be

• Removed meta-information as that is already, or should be, in the meta-doc

  mvriel

  committed
  365d1a1

  Copy full SHA for 365d1a1

• Removed erroneous TOC entry

  mvriel

  committed
  1d6b650

  Copy full SHA for 1d6b650

• Refactored the @type definition according to recent discussions

  mvriel

  committed
  eac8337

  Copy full SHA for eac8337

• #36 Adjusted ABNF to allows line breaks in tag descriptions

  mvriel

  committed
  78c73ec

  Copy full SHA for 78c73ec

• #36 Clarified the structure of a tag by describing the parts and that a tag should start on a newline

  mvriel

  committed
  0f90737

  Copy full SHA for 0f90737

• Fix typo

  mvriel

  committed
  2e1b505

  Copy full SHA for 2e1b505

• Clarify that @var is not as much an alias of @type

  mvriel

  committed
  520e410

  Copy full SHA for 520e410

• #2 describe @see in more detail and add deprecation of @link

  mvriel

  committed
  1df2582

  Copy full SHA for 1df2582

Commits on Dec 7, 2013

• Add markdown as requirement for tag descriptions

  mvriel

  committed
  065e65b

  Copy full SHA for 065e65b

• Add markdown as requirement for tag descriptions

  mvriel

  committed
  44519fd

  Copy full SHA for 44519fd

Commits on Mar 25, 2014

• Merge branch 'master' of https://github.com/php-fig/fig-standards

  mvriel

  committed
  051d5f9

  Copy full SHA for 051d5f9

• Introduced Summary

  Show description for 8fe3d42
  mvriel

  committed
  8fe3d42

  Copy full SHA for 8fe3d42

• Fixes #3: Add Inline PHPDoc description

  mvriel

  committed
  db15c21

  Copy full SHA for db15c21

Commits on Mar 29, 2014

• consolidate the two FQSEN definitions;

  ashnazg

  committed
  cbf58ef

  Copy full SHA for cbf58ef

• 'annotation' is a defined term, so use 'name' here;

  ashnazg

  committed
  ed9e863

  Copy full SHA for ed9e863

Commits on May 18, 2014

• Change meaning of @deprecated version and add a second machine-readable version.

  sun

  committed
  a3dacae

  Copy full SHA for a3dacae

Commits on May 20, 2014

• Specify @deprecated versions as a range, delimited by a colon.

  sun

  committed
  f001ebe

  Copy full SHA for f001ebe

Commits on May 24, 2014

• Merge pull request #46 from ashnazg/nameNotAnnotation

  Show description for 4319c6c
  mvriel

  committed
  4319c6c

  Copy full SHA for 4319c6c

• Merge pull request #45 from ashnazg/dupeFQSEN

  Show description for 68bc885
  mvriel

  committed
  68bc885

  Copy full SHA for 68bc885

• Revised @deprecated tag description using explicit 'starting version' and 'ending version' terminology.

  sun

  committed
  604e15c

  Copy full SHA for 604e15c

• Revised @deprecated to clarify that the stated 'ending version' is exclusive.

  sun

  committed
  8e272d4

  Copy full SHA for 8e272d4

Commits on May 29, 2014

• Added description and some discussion on tag specializations

  

  Christopher Hoult

  committed
  f9fccfa

  Copy full SHA for f9fccfa

• Improved layout of tag specialization docs

  

  Christopher Hoult

  committed
  adc0241

  Copy full SHA for adc0241

Commits on Jun 6, 2014

• Merge pull request #51 from chrishoult/feature/tag-specialization-docs

  Show description for d44d6c7
  mvriel

  committed
  d44d6c7

  Copy full SHA for d44d6c7

• Fixed synposis + description of @license.

  sun

  committed
  40f9b13

  Copy full SHA for 40f9b13

Commits on Jul 15, 2014

• Add typedef tag

  Show description for 1d07566
  mvriel

  committed
  1d07566

  Copy full SHA for 1d07566

Commits on Aug 8, 2014

• Reverted @type to @var and changed compound @var notation to match PHPs

  Show description for 61c695c
  mvriel

  committed
  61c695c

  Copy full SHA for 61c695c

• Fixed chapter numbering

  mvriel

  committed
  a015038

  Copy full SHA for a015038

Commits on Aug 15, 2014

• Added a text explaining how to recognize the File-level DocBlock

  mvriel

  committed
  1d20343

  Copy full SHA for 1d20343

• Clarified the paragraph on File-level DocBlocks

  mvriel

  committed
  4f4b640

  Copy full SHA for 4f4b640

Commits on Nov 23, 2014

• Clean-up of all external hyperlinks.

  Show description for 8a6a2ff
  Fleshgrinder

  committed
  8a6a2ff

  Copy full SHA for 8a6a2ff

• Be more specific about static in PHPDoc vs. PHP

  Show description for ca1477e
  Fleshgrinder

  committed
  ca1477e

  Copy full SHA for ca1477e

• Formatting

  Show description for 30fdbb2
  Fleshgrinder

  committed
  30fdbb2

  Copy full SHA for 30fdbb2

Commits on Dec 9, 2014

• Merge branch 'master' of https://github.com/php-fig/fig-standards

  mvriel

  committed
  4f588d7

  Copy full SHA for 4f588d7

• Merge pull request #50 from sun/psr5-deprecated

  Show description for 5317d4f
  mvriel

  committed
  5317d4f

  Copy full SHA for 5317d4f

• Merge pull request #52 from sun/license

  Show description for eda5e92
  mvriel

  committed
  eda5e92

  Copy full SHA for eda5e92

• Post-process @license edit

  mvriel

  committed
  0633623

  Copy full SHA for 0633623

• Merge pull request #54 from phpDocumentor/features/typedef

  Show description for 143e8d8
  mvriel

  committed
  143e8d8

  Copy full SHA for 143e8d8

• Merge pull request #55 from phpDocumentor/features/type-to-var

  Show description for a63e95f
  mvriel

  committed
  a63e95f

  Copy full SHA for a63e95f

• Merge pull request #66 from Fleshgrinder/master

  Show description for 04b3e73
  mvriel

  committed
  04b3e73

  Copy full SHA for 04b3e73

• Add paragraph with summary to clearly indicate no explicit recommendation for a markup language

  mvriel

  committed
  f650a15

  Copy full SHA for f650a15

Commits on Dec 17, 2014

• #68: Add clause that an empty line is allowed between a DocBlock and element

  mvriel

  committed
  6861e37

  Copy full SHA for 6861e37

Commits on Feb 19, 2015

• phpdoc.md - make TOC clickable

  

  Tomáš Votruba

  committed
  46e4e4e

  Copy full SHA for 46e4e4e

Commits on Mar 3, 2015

• Merge pull request #70 from TomasVotruba/patch-1

  Show description for b3f503f
  mvriel

  committed
  b3f503f

  Copy full SHA for b3f503f

Commits on Mar 4, 2015

• Remove Style recommendation

  mvriel

  committed
  e287633

  Copy full SHA for e287633

Commits on Mar 6, 2015

• Fix small typo in @SInCE example

  Show description for 0379e00
  

  Nils Rückmann

  committed
  0379e00

  Copy full SHA for 0379e00

Commits on Mar 25, 2015

• Fixed scalar types

  GrahamCampbell

  committed
  5f209f9

  Copy full SHA for 5f209f9

• "is it NOT" to "it is NOT"

  Show description for 38222fe
  Rarst

  committed
  38222fe

  Copy full SHA for 38222fe

Commits on Mar 26, 2015

• Merge pull request #74 from Rarst/patch-1

  Show description for b293909
  mvriel

  committed
  b293909

  Copy full SHA for b293909

• Merge pull request #73 from GrahamCampbell/patch-1

  Show description for 5b68085
  mvriel

  committed
  5b68085

  Copy full SHA for 5b68085

• Fixed an unclosed docblock

  GrahamCampbell

  committed
  d6b9e48

  Copy full SHA for d6b9e48

• Fixed a typo

  GrahamCampbell

  committed
  eca33f8

  Copy full SHA for eca33f8

• Merge pull request #75 from GrahamForks/patch-1

  Show description for 2726c89
  mvriel

  committed
  2726c89

  Copy full SHA for 2726c89

Commits on May 2, 2015

• fix @Version example

  Show description for d486bad
  Wes0617

  committed
  d486bad

  Copy full SHA for d486bad

Commits on Jun 5, 2015

• Merge branch 'master' of git://github.com/php-fig/fig-standards

  mvriel

  committed
  b55176c

  Copy full SHA for b55176c

Commits on Jul 20, 2015

• Update phpdoc.md

  gerardroche

  committed
  63af227

  Copy full SHA for 63af227

Commits on Aug 14, 2015

• Merge pull request #71 from nueckman/patch-1

  Show description for da00906
  mvriel

  committed
  da00906

  Copy full SHA for da00906

• Merge pull request #78 from WesNetmo/master

  Show description for d27159e
  mvriel

  committed
  d27159e

  Copy full SHA for d27159e

• Merge pull request #84 from gerardroche/patch-1

  Show description for 8abaef4
  mvriel

  committed
  8abaef4

  Copy full SHA for 8abaef4

• Merge branch 'master' of git://github.com/php-fig/fig-standards

  mvriel

  committed
  e8ae204

  Copy full SHA for e8ae204

• Merge branch 'master' of github.com:phpDocumentor/fig-standards

  mvriel

  committed
  695b38a

  Copy full SHA for 695b38a

Commits on Dec 10, 2015

• Removed contentious sections and other various updates

  mvriel

  committed
  3b425d1

  Copy full SHA for 3b425d1

Commits on Feb 24, 2016

• Fix typo in table of contents

  Show description for ead19fb
  spiegelm

  committed
  ead19fb

  Copy full SHA for ead19fb

Commits on Feb 26, 2016

• Merge pull request #126 from spiegelm/patch-1

  Show description for b994d85
  mvriel

  committed
  b994d85

  Copy full SHA for b994d85