Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ollit70/php.tmbundle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: textmate/php.tmbundle
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 13 files changed
  • 2 contributors

Commits on Feb 12, 2016

  1. Use TM_DIRECTORY as default search directory 

    This is needed as the active file's directory is no longer the default working directory when running commands. Fixes textmate#69.
    @infininight
    infininight committed Feb 12, 2016
    Configuration menu
    Copy the full SHA
    3ed4837 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2016

  1. Reduce specificity of injection scope 

    This allows the PHP grammar to be included in languages that do not match the `text.html.php` scope.
    @infininight
    infininight committed Jun 30, 2016
    Configuration menu
    Copy the full SHA
    9cfcc6d View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2016

  1. Add <?php to firstLineMatch

    @infininight
    infininight committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    c3dd29e View commit details
    Browse the repository at this point in the history

  2. Allow <?php ?> snippet to work in any document 

    This works anywhere in a PHP document and only at the very start of any other document. Along with the recent firstLineMatch changes in TextMate this means using the snippet on the first line of an untitled document will automatically set the document language to PHP.

Due to this change the ⌃> shortcut has been removed.
    @infininight
    infininight committed Jul 3, 2016
    Configuration menu
    Copy the full SHA
    010cc1c View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2017

  1. Add note about increasing memory limit

    @infininight
    infininight committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    96417a3 View commit details
    Browse the repository at this point in the history

  2. Update support library paths

    @infininight
    infininight committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    5b90ca2 View commit details
    Browse the repository at this point in the history

  3. Update grammar, completions, etc. to PHP 7.1

    @infininight
    infininight committed Feb 24, 2017
    Configuration menu
    Copy the full SHA
    fd4947d View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2017

  1. Inject into the new source.js scopes

    @infininight
    infininight committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    1d91862 View commit details
    Browse the repository at this point in the history

  2. Ensure word boundaries in indentation rules

    @infininight
    infininight committed Apr 1, 2017
    Configuration menu
    Copy the full SHA
    ded6a6b View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2017

  1. Escape strings before passing through regex generator 

    This is needed due to `\` being used in some PHP identifiers.
    @infininight
    infininight committed Jul 16, 2017
    Configuration menu
    Copy the full SHA
    83298a0 View commit details
    Browse the repository at this point in the history

  2. Update grammar, completions, etc. to PHP 7.1.7 

    This also fixes some escaping issues with the last generation pass mentioned in textmate#78.
    @infininight
    infininight committed Jul 16, 2017
    Configuration menu
    Copy the full SHA
    4c7ff9a View commit details
    Browse the repository at this point in the history

  3. Fix typo in the comment

    @stof @infininight
    stof authored and infininight committed Jul 16, 2017
    Configuration menu
    Copy the full SHA
    4b5c247 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2018

  1. Split up long regex matches 

    This was tripping up the language grammar grammar causing the rest of the file to be mis-highlighted.
    @infininight
    infininight committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    23bd413 View commit details
    Browse the repository at this point in the history

  2. Allow matching class-names at end of a string 

    This allows using the match inside of a capture.
    @infininight
    infininight committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    d4a7aec View commit details
    Browse the repository at this point in the history

  3. Allow default values in type-hinted function parameters 

    Merges the various previous rules into a single rule allowing the same items in all cases. Some scoping has been updated to be in line with conventions.

Fixes textmate#75 and textmate#81.
    @infininight
    infininight committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    706c680 View commit details
    Browse the repository at this point in the history

  4. Match return types in function declarations 

    Before these were passed back to the basic grammar, now match the valid items specifically.
    @infininight
    infininight committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    8f05764 View commit details
    Browse the repository at this point in the history
Loading