[phpMyAdmin Git] [phpmyadmin/shapefile] acf680: Improve error handling in loading shape file

[Michal Čihař]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/shapefile
  Commit: acf6808c939078e137d43f0fb656f91fdf3ee6e9
      https://github.com/phpmyadmin/shapefile/commit/acf6808c939078e137d43f0fb656f91fdf3ee6e9
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/ShapeFile.php
    M src/ShapeRecord.php

  Log Message:
  -----------
  Improve error handling in loading shape file

We now detect errors from ShapeRecord and fail correctly.

This discovers bug in loading some test files, this needs to be fixed.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: d2976564e8499a2552a5e42faa510ca18ec62dff
      https://github.com/phpmyadmin/shapefile/commit/d2976564e8499a2552a5e42faa510ca18ec62dff
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M tests/ShapeFileTest.php

  Log Message:
  -----------
  First test for error before looking at the data

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 29f17ae043fb2ba5caf22eac6c77e1742760c26a
      https://github.com/phpmyadmin/shapefile/commit/29f17ae043fb2ba5caf22eac6c77e1742760c26a
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/ShapeFile.php

  Log Message:
  -----------
  Make bounding box public

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: 9bb56bc0b952ec2170db729e633553d99d1ec4e7
      https://github.com/phpmyadmin/shapefile/commit/9bb56bc0b952ec2170db729e633553d99d1ec4e7
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/ShapeRecord.php

  Log Message:
  -----------
  Simplify code

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: b333f7e7f4bc845b3969eeb2a1b7fc57f3e1ad8f
      https://github.com/phpmyadmin/shapefile/commit/b333f7e7f4bc845b3969eeb2a1b7fc57f3e1ad8f
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/ShapeRecord.php

  Log Message:
  -----------
  Remove not needed ftell/fseek calls

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: e49df1b49ee1c0696fd5581cb0c90d5f066d51de
      https://github.com/phpmyadmin/shapefile/commit/e49df1b49ee1c0696fd5581cb0c90d5f066d51de
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M src/ShapeRecord.php

  Log Message:
  -----------
  Allow to skip optional m elements

The m elements are optionals, so do not fail on loading files which do
not include them.

Signed-off-by: Michal Čihař <michal at cihar.com>


  Commit: e98ad19940d0e00d8248cdfea7cc9cddd4c2ecf6
      https://github.com/phpmyadmin/shapefile/commit/e98ad19940d0e00d8248cdfea7cc9cddd4c2ecf6
  Author: Michal Čihař <michal at cihar.com>
  Date:   2016-06-24 (Fri, 24 Jun 2016)

  Changed paths:
    M tests/ShapeFileTest.php

  Log Message:
  -----------
  Fix test expectation for fixed loader

Signed-off-by: Michal Čihař <michal at cihar.com>


Compare: https://github.com/phpmyadmin/shapefile/compare/f4ebe51324a4...e98ad19940d0