Christians Tagebuch GitHub merge button uglifies your history (19.8.2015, 05:32)

Others already have written lengths about it, but yesterday I saw it again in the code of PEAR's Mail_mime package: An ugly and unreadable git history, caused by simply using the GitHub "Merge pull request" button.

History written by the "Merge pull request" button

GitHub uses --no-ff to create merge commits. Those are unnecessary for most pull requests, especially those with a single commit.

Apart from that, it does not rebase the PR when merging, and it does not squash.

The result is what you see here - simply clicking "merge" on five simple pull requests:

*   7da2570 (HEAD, origin/master, origin/HEAD, master) Merge pull request #11 from alecpl/fix_20527 
|\  
| * e5be21c Get rid of @-operator, better variables naming 
| * ca1d161 Fix path to pinentry-cli.xml file on composer installs (Bug #20527) 
* |   39ee090 Merge pull request #13 from alecpl/fix_19914 
|\ \  
| * | 51ba6e1 Get rid of @-operator, better variables naming 
| * | 18ecf59 Fix issue where PinEntry could not find Console/CommandLine (Bug #19914) 
| |/  
* | 57ea8c3 adopt package.xml to test file renamings 
* |   7f83425 Merge pull request #12 from alecpl/fix_20512 
|\ \  
| * | c2965cb Fix converting HTML entities in debug output (Bug #20512) 
| |/  
* |   557ab17 Merge pull request #14 from alecpl/fix_17815 
|\ \  
| * \   bb42e1e Merge branch 'fix_17815' of github.com:alecpl/Crypt_GPG into fix_17815 
| |\ \  
| | * | 3abdafb Fix key import tests after adding 'fingerprints' item to the result 
| * | | 57ccba0 Fix key import tests after adding 'fingerprints' item to the result 
| |/ /  
| * | a6cbcd0 Return all fingerprintes from key import methods (Request #17815) 
| |/  
* |   e5ea0df Merge pull request #15 from alecpl/fix_typos 
|\ \  
| |/  
|/|   
| * 33e3c94 Fix typos in variable names 
|/  
* c340099 make tests run on travis-ci.org 

Pretty history

Compare this with the history of my JsonMapper repository, in which I always manually merge pull requests after rebasing and squashing them:

* 08e7e07 (tag: v0.6.1) Update changelog, prepare release 0.6.1 
* c27b7c4 Fix namespace error with setter type hints 
* d2ed3f3 (tag: v0.6.0) Update changelog; release 0.6.0 
* 5da7642 Add keywords to readme 
* f035a40 Prefer setter methods over directy property access 
* 6059b72 Change setter method name calculation for properties with _ underscores 
* 11bceb0 Issue #28: update README; test for underscores 
* 6d1de35 (tag: v0.5.0) Run tests on php7, too 
* 5d7befc Update changelog, prepare release of 0.5.0 
* af33d36 Check for "double" instead of "float" 
* 00a7b68 Fix CS 
* c830437 Support nullable types (int|null) 
* 7a294e3 Increase test coverage to 100% 

Other rants about the merge button


I'm looking for a new job. If you can recommend a company in Leipzig/Germany that's looking for a PHP developer, please drop me a mail.

Link
PEAR PEAR 1.10.0dev1 brings PHP 7 compatibility! (25.7.2015, 13:30)

We’ve released PEAR installer version 1.10.0dev1, which brings support for PHP 7 while dropping support for PHP 4 – 5.3.

See the announcement post @ cweiske.de for more information.

Link
Christians Tagebuch PEAR 1.10.0dev1 brings PHP 7 compatibility! (25.7.2015, 11:50)

The new PEAR installer release adds PHP 7 support while dropping support for PHP 4 - 5.3. It also fixes a nasty SSL issue that made it hard to use on PHP 5.6. With the update, strict warnings about static calls to a non-static PEAR::isError() are a thing of the past.

I've just published the first preview version: PEAR 1.10.0dev1.

You can upgrade your existing PEAR version with the following command:

$ pear upgrade PEAR-1.10.0dev1

Pre-release versions of go-pear.phar and install-pear-nozlib.phar can be temporarily be found at

Please report any bugs you find on the PEAR bug tracker or on the pear-dev mailing list.


I'm looking for a new job. If you can recommend a company in Leipzig/Germany that's looking for a PHP developer, please drop me a mail.

Link
PHP_CodeSniffer 2.2.0 released (21.1.2015, 22:57)

I've just released version 2.2.0 of PHP_CodeSniffer. This release brings the usual bug fixes but also quite a lot of sniff changes (the PHPCS and Squiz standards have changed as a result) and some important new features as well. Thanks to all the developers who directly contributed code to...

Link
PHP_CodeSniffer 2.0.0 released (5.12.2014, 02:51)

Nineteen months ago I started work on a project to allow PHP_CodeSniffer to fix the problems that it finds. Doing this required a lot of changes to the core classes a lot of iteration and refactoring of the fixing and testing code and an enormous amount of time and...

Link
PEAR Security Vulnerability Announcement (28.10.2014, 23:21)

A vulnerability in the HTML_AJAX package has been found which allows arbitrary remote code execution. All versions of the package from 0.4.0 up to and including release 0.5.6 are affected by this.

An new release of the package is available which fixes this issue. One is strongly encouraged to upgrade to it by using:

$ pear upgrade HTML_AJAX-0.5.7.

Link
Christians Tagebuch Recent PEAR package releases (22.7.2014, 21:12)

I wasn't idle since the release of PEAR 1.9.5 but did a bit of work on my PEAR packages.

Net_WebFinger version 0.4.0 now supports the final WebFinger RFC 7033. On pfefferle's request I made both Net_WebFinger and its dependency XML_XRD available on packagist and thus installable via composer: pear/net_webfinger and pear/xml_xrd

Some minutes ago I released version 0.4.0 of the OpenID package. It fixes 6 bugs and adds a new feature.


I'm looking for a new job. If you can recommend a company in Leipzig/Germany that's looking for a PHP developer, please drop me a mail.

Link
PEAR PEAR 1.9.5 is out (12.7.2014, 19:48)

The PEAR installer version 1.9.5 has been released today.

The new version – three years after the last stable 1.9.4 and 2 weeks after the preview – is a bugfix only release. 13 bugs have been fixed. Among them are the following:

  • #18466: Modifying paths during installation broken on Windows
  • #20203: PEAR channels on github user pages do not work
  • #20283: Report correct php.ini directive on xdebug installation (and every other zend_extension)

Our plan is to work on a new version 1.10 that is E_STRICT and E_DEPRECATED clean and ships a couple of new features.

Link
Christians Tagebuch PEAR 1.9.5 is out (12.7.2014, 18:39)

This article has originally been published on the PEAR blog:

PEAR 1.9.5 is out @ blog.pear.php.net .

The PEAR installer version 1.9.5 has been released today.

The new version – three years after the last stable 1.9.4 and 2 weeks after the preview – is a bugfix only release. 13 bugs have been fixed. Among them are the following:

  • #18466: Modifying paths during installation broken on Windows
  • #20203: PEAR channels on github user pages do not work
  • #20283: Report correct php.ini directive on xdebug installation

Our plan is to work on a new version 1.10 that is E_STRICT and E_DEPRECATED clean and ships a couple of new features.


I'm looking for a new job. If you can recommend a company in Leipzig/Germany that's looking for a PHP developer, please drop me a mail.

Link
Analysis of Coding Conventions (3.7.2014, 06:12)

Coding standards tend to vary between projects. Even projects that use the same written standard can vary in a number of ways as standards tend to leave a lot of room to apply your own coding style in various areas. To get a better idea of what coding styles...

Link
Links RSS 0.92   RDF 1.
Atom Feed  
PHP5 powered   PEAR
Link the Planet <a href="http://www.planet-pear.org/">Planet PEAR</a>