322188 2013-07-10 11:14:02 +0000 PHP 5.3 heredoc and nowdoc syntax 2013-07-15 16:19:25 +0000 1 1 2 Applications kate syntax 3.10.90 Ubuntu Linux RESOLVED FIXED http://php.net/manual/en/language.types.string.php NOR wishlist --- 0 nx.devnull kwrite-bugs-null mikisabate http://commits.kde.org/kate/1e5b1971963b6239a69631e6ded21cf0ece91cae 4.12 0 oldest_to_newest 1382570 0 nx.devnull 2013-07-10 11:14:02 +0000 Since PHP 5.3, the opening heredoc identifier may optionally be enclosed in double quotes, and nowdoc is also supported (opening identifier enclosed in single quotes, variables are not expanded) Reproducible: Always 1382571 1 81043 nx.devnull 2013-07-10 11:15:38 +0000 Created attachment 81043 Test cases test file with all the special identifiers kate recognizes (EOHTML, EOCSS, EOJAVASCRIPT, EOMYSQL) in all three syntaxes (heredoc, heredoc with double quotes, nowdoc) 1382572 2 81044 nx.devnull 2013-07-10 11:17:37 +0000 Created attachment 81044 Patch 1383576 3 dhaumann 2013-07-15 15:47:32 +0000 Git commit 1e5b1971963b6239a69631e6ded21cf0ece91cae by Dominik Haumann. Committed on 15/07/2013 at 15:47. Pushed by dhaumann into branch 'master'. fix PHP 5.3 heredoc and nowdoc syntax Please other users/developers test this. I don't really know whether this patch is correct. FIXED-IN: 4.12 M +214 -0 examples/syntax/highlight.php M +37 -1 part/syntax/data/php.xml http://commits.kde.org/kate/1e5b1971963b6239a69631e6ded21cf0ece91cae 1383588 4 mikisabate 2013-07-15 16:19:25 +0000 (In reply to comment #3) > Git commit 1e5b1971963b6239a69631e6ded21cf0ece91cae by Dominik Haumann. > Committed on 15/07/2013 at 15:47. > Pushed by dhaumann into branch 'master'. > > fix PHP 5.3 heredoc and nowdoc syntax > > Please other users/developers test this. > I don't really know whether this patch is correct. > > FIXED-IN: 4.12 > > M +214 -0 examples/syntax/highlight.php > M +37 -1 part/syntax/data/php.xml > > http://commits.kde.org/kate/1e5b1971963b6239a69631e6ded21cf0ece91cae Works for me :) 81043 2013-07-10 11:15:38 +0000 2013-07-10 11:15:38 +0000 Test cases syntaxtest.php text/plain 1747 nx.devnull PD9waHAKCiR0ZXN0ID0gPDw8RU9UCgokZm9vIGJhcgoKRU9UCgokdGVzdCA9IDw8PCJFT1QiCgok Zm9vIGJhcgoKRU9UCgokdGVzdCA9IDw8PCdFT1QnCgokZm9vIGJhcgoKRU9UCgovL2h0bWwKJHRl c3QgPSA8PDxFT0hUTUwKCjx0YWc+JHRhZzwvdGFnPgo8JHRhZz4kZm9vPC8kdGFnPgoKRU9IVE1M CgokdGVzdCA9IDw8PCJFT0hUTUwiCgo8dGFnPiR0YWc8L3RhZz4KPCR0YWc+JGZvbzwvJHRhZz4K CkVPSFRNTAoKJHRlc3QgPSA8PDwnRU9IVE1MJwoKPHRhZz4kdGFnPC90YWc+CgpFT0hUTUwKCi8v Y3NzCiR0ZXN0ID0gPDw8RU9DU1MKCiRjbGFzcyB7CgkkZm9vOiAkYmFyCn0KLmNsYXNzIHsKCWNv bG9yOiAkY29sb3IKfQoKRU9DU1MKCiR0ZXN0ID0gPDw8IkVPQ1NTIgoKJGNsYXNzIHsKCSRmb286 ICRiYXIKfQouY2xhc3MgewoJY29sb3I6ICRjb2xvcgp9CgpFT0NTUwoKJHRlc3QgPSA8PDwnRU9D U1MnCgouY2xhc3MgewoJY29sb3I6ICRjb2xvcgp9CgpFT0NTUwoKLy9qYXZhc2NyaXB0CiR0ZXN0 ID0gPDw8RU9KQVZBU0NSSVBUCgp2YXIgZm9vID0gIiRmb28iOwpmdW5jdGlvbiAkYmFyKCkgewoJ JGJhejsKfQoKRU9KQVZBU0NSSVBUCgokdGVzdCA9IDw8PCJFT0pBVkFTQ1JJUFQiCgp2YXIgZm9v ID0gIiRmb28iOwpmdW5jdGlvbiAkYmFyKCkgewoJJGJhejsKfQoKRU9KQVZBU0NSSVBUCgokdGVz dCA9IDw8PCdFT0pBVkFTQ1JJUFQnCgp2YXIgZm9vID0gIiRmb28iOwpmdW5jdGlvbiAkYmFyKCkg ewoJJGJhejsKfQoKRU9KQVZBU0NSSVBUCgovL215c3FsCiR0ZXN0ID0gPDw8RU9NWVNRTAoKU0VM RUNUICRmb28gRlJPTSAkYmFyIFdIRVJFIGlkID0gJGJhejsKCkVPTVlTUUwKCiR0ZXN0ID0gPDw8 IkVPTVlTUUwiCgpTRUxFQ1QgJGZvbyBGUk9NICRiYXIgV0hFUkUgaWQgPSAkYmF6OwoKRU9NWVNR TAoKJHRlc3QgPSA8PDwnRU9NWVNRTCcKClNFTEVDVCAkZm9vIEZST00gJGJhciBXSEVSRSBpZCA9 ICRiYXo7CgpFT01ZU1FMCgovL25vIEVPCgovL2h0bWwKJHRlc3QgPSA8PDxIVE1MCgo8dGFnPiR0 YWc8L3RhZz4KCkhUTUwKCiR0ZXN0ID0gPDw8IkhUTUwiCgo8dGFnPiR0YWc8L3RhZz4KCkhUTUwK CiR0ZXN0ID0gPDw8J0hUTUwnCgo8dGFnPiR0YWc8L3RhZz4KCkhUTUwKCi8vY3NzCiR0ZXN0ID0g PDw8Q1NTCgouY2xhc3MgewoJY29sb3I6ICRjb2xvcgp9CgpDU1MKCiR0ZXN0ID0gPDw8IkNTUyIK Ci5jbGFzcyB7Cgljb2xvcjogJGNvbG9yCn0KCkNTUwoKJHRlc3QgPSA8PDwnQ1NTJwoKLmNsYXNz IHsKCWNvbG9yOiAkY29sb3IKfQoKQ1NTCgovL2phdmFzY3JpcHQKJHRlc3QgPSA8PDxKQVZBU0NS SVBUCgp2YXIgZm9vID0gIiRmb28iOwpmdW5jdGlvbiAkYmFyKCkgewoJJGJhejsKfQoKSkFWQVND UklQVAoKJHRlc3QgPSA8PDwiSkFWQVNDUklQVCIKCnZhciBmb28gPSAiJGZvbyI7CmZ1bmN0aW9u ICRiYXIoKSB7CgkkYmF6Owp9CgpKQVZBU0NSSVBUCgokdGVzdCA9IDw8PCdKQVZBU0NSSVBUJwoK dmFyIGZvbyA9ICIkZm9vIjsKZnVuY3Rpb24gJGJhcigpIHsKCSRiYXo7Cn0KCkpBVkFTQ1JJUFQK Ci8vbXlzcWwKJHRlc3QgPSA8PDxNWVNRTAoKU0VMRUNUICRmb28gRlJPTSAkYmFyIFdIRVJFIGlk ID0gJGJhejsKCk1ZU1FMCgokdGVzdCA9IDw8PCJNWVNRTCIKClNFTEVDVCAkZm9vIEZST00gJGJh ciBXSEVSRSBpZCA9ICRiYXo7CgpNWVNRTAoKJHRlc3QgPSA8PDwnTVlTUUwnCgpTRUxFQ1QgJGZv byBGUk9NICRiYXIgV0hFUkUgaWQgPSAkYmF6OwoKTVlTUUwKCg== 81044 2013-07-10 11:17:37 +0000 2013-07-10 11:17:37 +0000 Patch kate_php_heredoc_nowdoc.patch text/plain 4950 nx.devnull ZGlmZiAtdXcgYS9waHAueG1sIGIvcGhwLnhtbAotLS0gYS9waHAueG1sCTIwMTMtMDctMTAgMTM6 MDk6NDkuMzQ2MzE1OTYwICswMjAwCisrKyBiL3BocC54bWwJMjAxMy0wNy0xMCAxMzowOTo0NC42 MjYzMTYwMDMgKzAyMDAKQEAgLTU0NTUsMTEgKzU0NTUsMjEgQEAKICAgICAgICAgPERldGVjdENo YXIgYXR0cmlidXRlPSJTdHJpbmciIGNvbnRleHQ9ImRvdWJsZXF1b3Rlc3RyaW5nIiBjaGFyPSIm cXVvdDsiIC8+CiAgICAgICAgIDxEZXRlY3RDaGFyIGF0dHJpYnV0ZT0iU3RyaW5nIiBjb250ZXh0 PSJiYWNrcXVvdGVzdHJpbmciIGNoYXI9ImAiIC8+CiAgICAgICAgIDxEZXRlY3RDaGFyIGF0dHJp YnV0ZT0iU3RyaW5nIiBjb250ZXh0PSJzaW5nbGVxdW90ZXN0cmluZyIgY2hhcj0iJyIgLz4KKyAg ICAgICAgPFJlZ0V4cHIgYXR0cmlidXRlPSJCYWNrc2xhc2ggQ29kZSIgY29udGV4dD0iaHRtbGhl cmVkb2MiIFN0cmluZz0iJmx0OyZsdDsmbHQ7JnF1b3Q7KChFTyk/SFRNTCkmcXVvdDsiIGJlZ2lu UmVnaW9uPSJIZXJlZG9jIiAvPgorICAgICAgICA8UmVnRXhwciBhdHRyaWJ1dGU9IkJhY2tzbGFz aCBDb2RlIiBjb250ZXh0PSJjc3NoZXJlZG9jIiBTdHJpbmc9IiZsdDsmbHQ7Jmx0OyZxdW90Oygo RU8pP0NTUykmcXVvdDsiIGJlZ2luUmVnaW9uPSJIZXJlZG9jIiAvPgorICAgICAgICA8UmVnRXhw ciBhdHRyaWJ1dGU9IkJhY2tzbGFzaCBDb2RlIiBjb250ZXh0PSJqYXZhc2NyaXB0aGVyZWRvYyIg U3RyaW5nPSImbHQ7Jmx0OyZsdDsmcXVvdDsoKEVPKT9KQVZBU0NSSVBUKSZxdW90OyIgYmVnaW5S ZWdpb249IkhlcmVkb2MiIC8+CisgICAgICAgIDxSZWdFeHByIGF0dHJpYnV0ZT0iQmFja3NsYXNo IENvZGUiIGNvbnRleHQ9Im15c3FsaGVyZWRvYyIgU3RyaW5nPSImbHQ7Jmx0OyZsdDsmcXVvdDso KEVPKT9NWVNRTCkmcXVvdDsiIGJlZ2luUmVnaW9uPSJIZXJlZG9jIiAvPgorICAgICAgICA8UmVn RXhwciBhdHRyaWJ1dGU9IkJhY2tzbGFzaCBDb2RlIiBjb250ZXh0PSJoZXJlZG9jIiBTdHJpbmc9 IiZsdDsmbHQ7Jmx0OyZxdW90OyhbQS1aYS16X11bQS1aYS16MC05X10qKSZxdW90OyIgYmVnaW5S ZWdpb249IkhlcmVkb2MiIC8+CiAgICAgICAgIDxSZWdFeHByIGF0dHJpYnV0ZT0iQmFja3NsYXNo IENvZGUiIGNvbnRleHQ9Imh0bWxoZXJlZG9jIiBTdHJpbmc9IiZsdDsmbHQ7Jmx0OygoRU8pP0hU TUwpXGIiIGJlZ2luUmVnaW9uPSJIZXJlZG9jIiAvPgogICAgICAgICA8UmVnRXhwciBhdHRyaWJ1 dGU9IkJhY2tzbGFzaCBDb2RlIiBjb250ZXh0PSJjc3NoZXJlZG9jIiBTdHJpbmc9IiZsdDsmbHQ7 Jmx0OygoRU8pP0NTUylcYiIgYmVnaW5SZWdpb249IkhlcmVkb2MiIC8+CiAgICAgICAgIDxSZWdF eHByIGF0dHJpYnV0ZT0iQmFja3NsYXNoIENvZGUiIGNvbnRleHQ9ImphdmFzY3JpcHRoZXJlZG9j IiBTdHJpbmc9IiZsdDsmbHQ7Jmx0OygoRU8pP0pBVkFTQ1JJUFQpXGIiIGJlZ2luUmVnaW9uPSJI ZXJlZG9jIiAvPgogICAgICAgICA8UmVnRXhwciBhdHRyaWJ1dGU9IkJhY2tzbGFzaCBDb2RlIiBj b250ZXh0PSJteXNxbGhlcmVkb2MiIFN0cmluZz0iJmx0OyZsdDsmbHQ7KChFTyk/TVlTUUwpXGIi IGJlZ2luUmVnaW9uPSJIZXJlZG9jIiAvPgogICAgICAgICA8UmVnRXhwciBhdHRyaWJ1dGU9IkJh Y2tzbGFzaCBDb2RlIiBjb250ZXh0PSJoZXJlZG9jIiBTdHJpbmc9IiZsdDsmbHQ7Jmx0OyhbQS1a YS16X11bQS1aYS16MC05X10qKSIgYmVnaW5SZWdpb249IkhlcmVkb2MiIC8+CisgICAgICAgIDxS ZWdFeHByIGF0dHJpYnV0ZT0iQmFja3NsYXNoIENvZGUiIGNvbnRleHQ9Imh0bWxub3dkb2MiIFN0 cmluZz0iJmx0OyZsdDsmbHQ7JygoRU8pP0hUTUwpJyIgYmVnaW5SZWdpb249Ik5vd2RvYyIgLz4K KyAgICAgICAgPFJlZ0V4cHIgYXR0cmlidXRlPSJCYWNrc2xhc2ggQ29kZSIgY29udGV4dD0iY3Nz bm93ZG9jIiBTdHJpbmc9IiZsdDsmbHQ7Jmx0OycoKEVPKT9DU1MpJyIgYmVnaW5SZWdpb249Ik5v d2RvYyIgLz4KKyAgICAgICAgPFJlZ0V4cHIgYXR0cmlidXRlPSJCYWNrc2xhc2ggQ29kZSIgY29u dGV4dD0iamF2YXNjcmlwdG5vd2RvYyIgU3RyaW5nPSImbHQ7Jmx0OyZsdDsnKChFTyk/SkFWQVND UklQVCknIiBiZWdpblJlZ2lvbj0iTm93ZG9jIiAvPgorICAgICAgICA8UmVnRXhwciBhdHRyaWJ1 dGU9IkJhY2tzbGFzaCBDb2RlIiBjb250ZXh0PSJteXNxbG5vd2RvYyIgU3RyaW5nPSImbHQ7Jmx0 OyZsdDsnKChFTyk/TVlTUUwpJyIgYmVnaW5SZWdpb249Ik5vd2RvYyIgLz4KKyAgICAgICAgPFJl Z0V4cHIgYXR0cmlidXRlPSJCYWNrc2xhc2ggQ29kZSIgY29udGV4dD0ibm93ZG9jIiBTdHJpbmc9 IiZsdDsmbHQ7Jmx0OycoW0EtWmEtel9dW0EtWmEtejAtOV9dKiknIiBiZWdpblJlZ2lvbj0iTm93 ZG9jIiAvPgogICAgICAgICA8a2V5d29yZCBhdHRyaWJ1dGU9IlNwZWNpYWwgVmFyaWFibGUiIGNv bnRleHQ9IiNzdGF5IiBTdHJpbmc9InNwZWNpYWwtdmFyaWFibGVzIi8+CiAgICAgICAgIDxSZWdF eHByIGF0dHJpYnV0ZT0iVmFyaWFibGUiIGNvbnRleHQ9IiNzdGF5IiBTdHJpbmc9IlwkK1thLXpB LVpfXHg3Zi1ceGZmXVthLXpBLVowLTlfXHg3Zi1ceGZmXSoiIC8+CiAgICAgICAgIDxSZWdFeHBy IGF0dHJpYnV0ZT0iU3RyaW5nIiBjb250ZXh0PSIjc3RheSIgU3RyaW5nPSJbMDEyMzQ1Njc4OV0q XC5cLlwuWzAxMjM0NTY3ODldKiIgLz4KQEAgLTU1NTEsNiArNTU2MSwzMiBAQAogICAgICAgICA8 UmVnRXhwciBhdHRyaWJ1dGU9IlZhcmlhYmxlIiBjb250ZXh0PSIjc3RheSIgU3RyaW5nPSJcJFx7 W2EtekEtWl9ceDdmLVx4ZmZdW2EtekEtWjAtOV9ceDdmLVx4ZmZdKihcW1thLXpBLVowLTlfXSpc XSkqXH0iIC8+CiAgICAgICAgIDxSZWdFeHByIGF0dHJpYnV0ZT0iVmFyaWFibGUiIGNvbnRleHQ9 IiNzdGF5IiBTdHJpbmc9Ilx7XCRbYS16QS1aX1x4N2YtXHhmZl1bYS16QS1aMC05X1x4N2YtXHhm Zl0qKFxbKFswLTldKnwmcXVvdDtbYS16QS1aX10qJnF1b3Q7KXwnW2EtekEtWl9dKid8XF0pKigt Jmd0O1thLXpBLVpfXHg3Zi1ceGZmXVthLXpBLVowLTlfXHg3Zi1ceGZmXSooXFtbYS16QS1aMC05 X10qXF0pKihcWyhbMC05XSp8JnF1b3Q7W2EtekEtWl9dKiZxdW90Oyl8J1thLXpBLVpfXSonfFxd KSopKlx9IiAvPgogICAgICAgPC9jb250ZXh0PgorICAgICAgPGNvbnRleHQgbmFtZT0iaHRtbG5v d2RvYyIgYXR0cmlidXRlPSJOb3JtYWwgVGV4dCIgbGluZUVuZENvbnRleHQ9IiNzdGF5IiBkeW5h bWljPSJ0cnVlIj4KKyAgICAgICAgPFJlZ0V4cHIgYXR0cmlidXRlPSJCYWNrc2xhc2ggQ29kZSIg Y29udGV4dD0iI3BvcCIgU3RyaW5nPSJeJTE7PyQiIGR5bmFtaWM9InRydWUiIGVuZFJlZ2lvbj0i SGVyZWRvYyIgLz4KKyAgICAgICAgPEluY2x1ZGVSdWxlcyBjb250ZXh0PSJjb21tb25ub3dkb2Mi IC8+CisgICAgICAgIDxJbmNsdWRlUnVsZXMgY29udGV4dD0iIyNIVE1MIiAvPgorICAgICAgPC9j b250ZXh0PgorICAgICAgPGNvbnRleHQgbmFtZT0iY3Nzbm93ZG9jIiBhdHRyaWJ1dGU9Ik5vcm1h bCBUZXh0IiBsaW5lRW5kQ29udGV4dD0iI3N0YXkiIGR5bmFtaWM9InRydWUiPgorICAgICAgICA8 UmVnRXhwciBhdHRyaWJ1dGU9IkJhY2tzbGFzaCBDb2RlIiBjb250ZXh0PSIjcG9wIiBTdHJpbmc9 Il4lMTs/JCIgZHluYW1pYz0idHJ1ZSIgZW5kUmVnaW9uPSJIZXJlZG9jIiAvPgorICAgICAgICA8 SW5jbHVkZVJ1bGVzIGNvbnRleHQ9ImNvbW1vbm5vd2RvYyIgLz4KKyAgICAgICAgPEluY2x1ZGVS dWxlcyBjb250ZXh0PSIjI0NTUyIgLz4KKyAgICAgIDwvY29udGV4dD4KKyAgICAgIDxjb250ZXh0 IG5hbWU9Im15c3Fsbm93ZG9jIiBhdHRyaWJ1dGU9Ik5vcm1hbCBUZXh0IiBsaW5lRW5kQ29udGV4 dD0iI3N0YXkiIGR5bmFtaWM9InRydWUiPgorICAgICAgICA8UmVnRXhwciBhdHRyaWJ1dGU9IkJh Y2tzbGFzaCBDb2RlIiBjb250ZXh0PSIjcG9wIiBTdHJpbmc9Il4lMTs/JCIgZHluYW1pYz0idHJ1 ZSIgZW5kUmVnaW9uPSJIZXJlZG9jIiAvPgorICAgICAgICA8SW5jbHVkZVJ1bGVzIGNvbnRleHQ9 ImNvbW1vbm5vd2RvYyIgLz4KKyAgICAgICAgPEluY2x1ZGVSdWxlcyBjb250ZXh0PSIjI1NRTCAo TXlTUUwpIiAvPgorICAgICAgPC9jb250ZXh0PgorICAgICAgPGNvbnRleHQgbmFtZT0iamF2YXNj cmlwdG5vd2RvYyIgYXR0cmlidXRlPSJOb3JtYWwgVGV4dCIgbGluZUVuZENvbnRleHQ9IiNzdGF5 IiBkeW5hbWljPSJ0cnVlIj4KKyAgICAgICAgPFJlZ0V4cHIgYXR0cmlidXRlPSJCYWNrc2xhc2gg Q29kZSIgY29udGV4dD0iI3BvcCIgU3RyaW5nPSJeJTE7PyQiIGR5bmFtaWM9InRydWUiIGVuZFJl Z2lvbj0iSGVyZWRvYyIgLz4KKyAgICAgICAgPEluY2x1ZGVSdWxlcyBjb250ZXh0PSJjb21tb25u b3dkb2MiIC8+CisgICAgICAgIDxJbmNsdWRlUnVsZXMgY29udGV4dD0iIyNKYXZhU2NyaXB0IiAv PgorICAgICAgPC9jb250ZXh0PgorICAgICAgPGNvbnRleHQgbmFtZT0ibm93ZG9jIiBhdHRyaWJ1 dGU9IlN0cmluZyIgbGluZUVuZENvbnRleHQ9IiNzdGF5IiBkeW5hbWljPSJ0cnVlIj4KKyAgICAg ICAgPFJlZ0V4cHIgYXR0cmlidXRlPSJCYWNrc2xhc2ggQ29kZSIgY29udGV4dD0iI3BvcCIgU3Ry aW5nPSJeJTE7PyQiIGR5bmFtaWM9InRydWUiIGVuZFJlZ2lvbj0iSGVyZWRvYyIgLz4KKyAgICAg ICAgPEluY2x1ZGVSdWxlcyBjb250ZXh0PSJjb21tb25ub3dkb2MiIC8+CisgICAgICA8L2NvbnRl eHQ+CisgICAgICA8Y29udGV4dCBuYW1lPSJjb21tb25ub3dkb2MiIGF0dHJpYnV0ZT0iU3RyaW5n IiBsaW5lRW5kQ29udGV4dD0iI3N0YXkiPgorICAgICAgPC9jb250ZXh0PgogICAgIDwvY29udGV4 dHM+CiAgICAgPGl0ZW1EYXRhcz4KICAgICAgIDxpdGVtRGF0YSBuYW1lPSJOb3JtYWwgVGV4dCIg ZGVmU3R5bGVOdW09ImRzTm9ybWFsIiBzcGVsbENoZWNraW5nPSJmYWxzZSIgLz4K