scoutman57

# Run `git difftool <directory/file>...` or `git mergetool <directory/file>...`
[merge]
	tool = phpstorm
[diff]
	tool = phpstorm
[difftool]
	prompt = false
[difftool "phpstorm"]
	cmd = /Applications/PhpStorm\\ EAP.app/Contents/MacOS/phpstorm diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
	trustExitCode = true

drm

<?php
/**
 * @author Gerard van Helden <drm@melp.nl>
 */

class FooBuilder {
    protected $properties = array();

    function add($property, $value) {
        $this->properties[$property][] = $value;